From ed32646eff97f9835680ee64c9d1b094e432b742 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sat, 26 Aug 2023 11:24:50 +0200
Subject: [PATCH] OZG-3961 OZG-4286 fix mvn test execution
---
.../operator/keycloak/user/KeycloakUserMapperTest.java | 2 +-
.../keycloak/user/KeycloakUserRemoteServiceTest.java | 2 +-
.../operator/keycloak/user/KeycloakUserServiceTest.java | 4 ++--
.../keycloak/user/OzgKeycloakUserSpecTestFactory.java | 5 +----
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
index 45798f9..bfc36ce 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
@@ -208,7 +208,7 @@ class KeycloakUserMapperTest {
var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
- assertThat(keycloakUser.getFirstName()).isEqualTo(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getFirstName());
+ assertThat(keycloakUser.getFirstName()).isEqualTo(KeycloakUserSpecUserTestFactory.FIRSTNAME);
}
@Test
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
index c3011f8..144aa0b 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
@@ -517,7 +517,7 @@ class KeycloakUserRemoteServiceTest {
void shouldClarifyUserName() {
userRemoteService.getUserSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
- verify(userRemoteService).clarifyName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername().toLowerCase());
+ verify(userRemoteService).clarifyName(KeycloakUserSpecUserTestFactory.USERNAME.toLowerCase());
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
index a574e8b..4bef759 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
@@ -129,7 +129,7 @@ class KeycloakUserServiceTest {
@Test
void shouldCreateUserIfNotExists() {
- when(remoteService.getUserByName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername(), TEST_NAMESPACE))
+ when(remoteService.getUserByName(KeycloakUserSpecUserTestFactory.USERNAME, TEST_NAMESPACE))
.thenReturn(Optional.empty());
when(userMapper.map(any())).thenReturn(Mockito.mock(UserRepresentation.class));
@@ -141,7 +141,7 @@ class KeycloakUserServiceTest {
@Test
void shouldUpdateUserIfExists() {
var userRepresentation = Mockito.mock(UserRepresentation.class);
- when(remoteService.getUserByName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername(), TEST_NAMESPACE))
+ when(remoteService.getUserByName(KeycloakUserSpecUserTestFactory.USERNAME, TEST_NAMESPACE))
.thenReturn(Optional.of(userRepresentation));
when(userMapper.update(eq(userRepresentation), any())).thenReturn(userRepresentation);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
index 43cf869..853f7db 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
@@ -23,19 +23,16 @@
*/
package de.ozgcloud.operator.keycloak.user;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.OzgKeycloakUserSpecBuilder;
public class OzgKeycloakUserSpecTestFactory {
- public static final KeycloakUserSpecUser KEYCLOAK_USER = KeycloakUserSpecUserTestFactory.create();
-
public static OzgKeycloakUserSpec create() {
return createBuilder().build();
}
public static OzgKeycloakUserSpecBuilder createBuilder() {
return OzgKeycloakUserSpec.builder()
- .keycloakUser(KEYCLOAK_USER);
+ .keycloakUser(KeycloakUserSpecUserTestFactory.create());
}
}
--
GitLab