From 027c71163d9ae177640b7a90e9b30799d6c05e86 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 6 Oct 2022 16:47:13 +0200 Subject: [PATCH] =?UTF-8?q?OZG-2626=20Tests=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/de/itvsh/kop/user/UserService.java | 3 ++- .../de/itvsh/kop/user/UserServiceTest.java | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java b/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java index 1cc57966..7c83d831 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java +++ b/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java @@ -11,6 +11,7 @@ import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; @ApplicationScoped public class UserService { + static final String UUID_PATTERN = "-"; @Inject UserRepository repository; @@ -45,7 +46,7 @@ public class UserService { } public User findById(String id) { - if (id.contains("-")) { + if (id.contains(UUID_PATTERN)) { // TODO wenn user migriert wurden wieder entfernen. return repository.findByExternalId(id).orElseThrow(() -> new ResourceNotFoundException(User.class, id)); } diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java b/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java index 9b683fdc..79d93d23 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java +++ b/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java @@ -5,6 +5,7 @@ import static org.mockito.Mockito.*; import java.time.Instant; import java.util.Optional; +import java.util.UUID; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -23,6 +24,28 @@ class UserServiceTest { @Mock KeycloakUserRemoteService keycloakRemoteService; + @DisplayName("Find") + @Nested + class TestFind { + @Test + void shouldCallFindById() { + when(repository.findById(anyString())).thenReturn(Optional.of(UserTestFactory.create())); + + service.findById("xxx"); + + verify(repository).findById(anyString()); + } + + @Test + void shouldCallFindByExternalId() { + when(repository.findByExternalId(any())).thenReturn(Optional.of(UserTestFactory.create())); + + service.findById(UUID.randomUUID().toString()); + + verify(repository).findByExternalId(anyString()); + } + } + @DisplayName("Save") @Nested class TestSave { -- GitLab