From 64c29941b93001d229d22d5408c17ce0877e0513 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 14 Feb 2025 16:15:37 +0100
Subject: [PATCH] Fixed tests
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
dbrepo-metadata-service/metrics.md | 4 ++++
.../at/tuwien/mvc/PrometheusEndpointMvcTest.java | 3 +--
.../java/at/tuwien/service/UserServiceUnitTest.java | 12 ++++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/dbrepo-metadata-service/metrics.md b/dbrepo-metadata-service/metrics.md
index ea32f40dfa..2c244804b9 100644
--- a/dbrepo-metadata-service/metrics.md
+++ b/dbrepo-metadata-service/metrics.md
@@ -55,6 +55,10 @@
| `dbrepo_tables_find` | Find table |
| `dbrepo_tables_findall` | List tables |
| `dbrepo_tables_refresh` | Update database table schemas |
+| `dbrepo_user_create` | Create user |
+| `dbrepo_user_find` | Get user |
+| `dbrepo_user_modify` | Update user |
+| `dbrepo_users_list` | List users |
| `dbrepo_view_create` | Create view |
| `dbrepo_view_delete` | Delete view |
| `dbrepo_view_find` | Get view |
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index 8f7594634b..7611a0a8b5 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -588,8 +588,7 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
}
/* test */
- for (String metric : List.of("dbrepo_users_list", "dbrepo_user_find", "dbrepo_user_modify",
- "dbrepo_user_password_modify")) {
+ for (String metric : List.of("dbrepo_users_list", "dbrepo_user_find", "dbrepo_user_modify")) {
assertThat(registry)
.hasObservationWithNameEqualTo(metric);
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index 2744900d67..c610f3ee95 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -1,8 +1,10 @@
package at.tuwien.service;
+import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AuthServiceException;
import at.tuwien.exception.UserNotFoundException;
+import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
import at.tuwien.test.AbstractUnitTest;
import org.junit.jupiter.api.BeforeEach;
@@ -15,11 +17,11 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.List;
import java.util.Optional;
+import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
@ExtendWith(SpringExtension.class)
@SpringBootTest
@@ -28,6 +30,9 @@ public class UserServiceUnitTest extends AbstractUnitTest {
@MockBean
private UserRepository userRepository;
+ @MockBean
+ private KeycloakGateway keycloakGateway;
+
@Autowired
private UserService userService;
@@ -82,6 +87,9 @@ public class UserServiceUnitTest extends AbstractUnitTest {
.thenReturn(Optional.of(USER_1));
when(userRepository.save(any(User.class)))
.thenReturn(USER_1);
+ doNothing()
+ .when(keycloakGateway)
+ .updateUser(any(UUID.class), any(UserUpdateDto.class));
/* test */
final User response = userService.modify(USER_1, USER_1_UPDATE_DTO);
--
GitLab