Skip to content
Snippets Groups Projects
Commit ed32646e authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3961 OZG-4286 fix mvn test execution

parent fe74dd4e
No related branches found
No related tags found
No related merge requests found
...@@ -208,7 +208,7 @@ class KeycloakUserMapperTest { ...@@ -208,7 +208,7 @@ class KeycloakUserMapperTest {
var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create()); var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
assertThat(keycloakUser.getFirstName()).isEqualTo(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getFirstName()); assertThat(keycloakUser.getFirstName()).isEqualTo(KeycloakUserSpecUserTestFactory.FIRSTNAME);
} }
@Test @Test
......
...@@ -517,7 +517,7 @@ class KeycloakUserRemoteServiceTest { ...@@ -517,7 +517,7 @@ class KeycloakUserRemoteServiceTest {
void shouldClarifyUserName() { void shouldClarifyUserName() {
userRemoteService.getUserSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE); userRemoteService.getUserSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
verify(userRemoteService).clarifyName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername().toLowerCase()); verify(userRemoteService).clarifyName(KeycloakUserSpecUserTestFactory.USERNAME.toLowerCase());
} }
} }
......
...@@ -129,7 +129,7 @@ class KeycloakUserServiceTest { ...@@ -129,7 +129,7 @@ class KeycloakUserServiceTest {
@Test @Test
void shouldCreateUserIfNotExists() { void shouldCreateUserIfNotExists() {
when(remoteService.getUserByName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername(), TEST_NAMESPACE)) when(remoteService.getUserByName(KeycloakUserSpecUserTestFactory.USERNAME, TEST_NAMESPACE))
.thenReturn(Optional.empty()); .thenReturn(Optional.empty());
when(userMapper.map(any())).thenReturn(Mockito.mock(UserRepresentation.class)); when(userMapper.map(any())).thenReturn(Mockito.mock(UserRepresentation.class));
...@@ -141,7 +141,7 @@ class KeycloakUserServiceTest { ...@@ -141,7 +141,7 @@ class KeycloakUserServiceTest {
@Test @Test
void shouldUpdateUserIfExists() { void shouldUpdateUserIfExists() {
var userRepresentation = Mockito.mock(UserRepresentation.class); 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)); .thenReturn(Optional.of(userRepresentation));
when(userMapper.update(eq(userRepresentation), any())).thenReturn(userRepresentation); when(userMapper.update(eq(userRepresentation), any())).thenReturn(userRepresentation);
......
...@@ -23,19 +23,16 @@ ...@@ -23,19 +23,16 @@
*/ */
package de.ozgcloud.operator.keycloak.user; package de.ozgcloud.operator.keycloak.user;
import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.OzgKeycloakUserSpecBuilder; import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.OzgKeycloakUserSpecBuilder;
public class OzgKeycloakUserSpecTestFactory { public class OzgKeycloakUserSpecTestFactory {
public static final KeycloakUserSpecUser KEYCLOAK_USER = KeycloakUserSpecUserTestFactory.create();
public static OzgKeycloakUserSpec create() { public static OzgKeycloakUserSpec create() {
return createBuilder().build(); return createBuilder().build();
} }
public static OzgKeycloakUserSpecBuilder createBuilder() { public static OzgKeycloakUserSpecBuilder createBuilder() {
return OzgKeycloakUserSpec.builder() return OzgKeycloakUserSpec.builder()
.keycloakUser(KEYCLOAK_USER); .keycloakUser(KeycloakUserSpecUserTestFactory.create());
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment