From d4693dcefdc9fc574086c521dc61d07bca17bb06 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 13:38:21 +0100
Subject: [PATCH] OZG-4624 java classes
---
.../client/KeycloakClientMapperTest.java | 88 +++++++++----------
...KeycloakClientPreconditionServiceTest.java | 8 +-
.../client/KeycloakClientReconcilerTest.java | 10 +--
.../client/KeycloakClientServiceTest.java | 18 ++--
.../keycloak/client/KeycloakLivelTest.java | 4 +-
...kClientSpecProtocolMapperTestFactory.java} | 2 +-
...zgCloudKeycloakClientSpecTestFactory.java} | 6 +-
...CloudKeycloakClientStatusTestFactory.java} | 4 +-
...=> OzgCloudKeycloakClientTestFactory.java} | 6 +-
.../client/RoleRepresentationTestFactory.java | 2 +-
.../group/GroupRepresentationTestFactory.java | 2 +-
.../group/KeycloakGroupMapperTest.java | 10 +--
.../KeycloakGroupPreconditionServiceTest.java | 8 +-
.../group/KeycloakGroupReconcilerTest.java | 10 +--
.../group/KeycloakGroupRemoteServiceTest.java | 6 +-
.../group/KeycloakGroupServiceTest.java | 14 +--
...eycloakGroupSpecAttributeTestFactory.java} | 2 +-
...OzgCloudKeycloakGroupSpecTestFactory.java} | 6 +-
... => OzgCloudKeycloakGroupTestFactory.java} | 4 +-
.../realm/KeycloakRealmMapperTest.java | 16 ++--
.../realm/KeycloakRealmReconcilerTest.java | 18 ++--
.../realm/KeycloakRealmServiceTest.java | 2 +-
...OzgCloudKeycloakRealmSpecTestFactory.java} | 4 +-
...gCloudKeycloakRealmStatusTestFactory.java} | 4 +-
... => OzgCloudKeycloakRealmTestFactory.java} | 6 +-
.../keycloak/user/KeycloakUserMapperTest.java | 12 +--
.../KeycloakUserPreconditionServiceTest.java | 28 +++---
.../user/KeycloakUserReconcilerTest.java | 18 ++--
.../user/KeycloakUserServiceTest.java | 18 ++--
... OzgCloudKeycloakUserSpecTestFactory.java} | 6 +-
...zgCloudKeycloakUserStatusTestFactory.java} | 6 +-
...a => OzgCloudKeycloakUserTestFactory.java} | 6 +-
.../keycloak/user/UserSecretServiceTest.java | 8 +-
33 files changed, 181 insertions(+), 181 deletions(-)
rename src/test/java/de/ozgcloud/operator/keycloak/client/{OzgKeycloakClientSpecProtocolMapperTestFactory.java => OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java} (96%)
rename src/test/java/de/ozgcloud/operator/keycloak/client/{OzgKeycloakClientSpecTestFactory.java => OzgCloudKeycloakClientSpecTestFactory.java} (90%)
rename src/test/java/de/ozgcloud/operator/keycloak/client/{OzgKeycloakClientStatusTestFactory.java => OzgCloudKeycloakClientStatusTestFactory.java} (87%)
rename src/test/java/de/ozgcloud/operator/keycloak/client/{OzgKeycloakClientTestFactory.java => OzgCloudKeycloakClientTestFactory.java} (83%)
rename src/test/java/de/ozgcloud/operator/keycloak/group/{OzgKeycloakGroupSpecAttributeTestFactory.java => OzgCloudKeycloakGroupSpecAttributeTestFactory.java} (95%)
rename src/test/java/de/ozgcloud/operator/keycloak/group/{OzgKeycloakGroupSpecTestFactory.java => OzgCloudKeycloakGroupSpecTestFactory.java} (84%)
rename src/test/java/de/ozgcloud/operator/keycloak/group/{OzgKeycloakGroupTestFactory.java => OzgCloudKeycloakGroupTestFactory.java} (92%)
rename src/test/java/de/ozgcloud/operator/keycloak/realm/{OzgKeycloakRealmSpecTestFactory.java => OzgCloudKeycloakRealmSpecTestFactory.java} (90%)
rename src/test/java/de/ozgcloud/operator/keycloak/realm/{OzgKeycloakRealmStatusTestFactory.java => OzgCloudKeycloakRealmStatusTestFactory.java} (88%)
rename src/test/java/de/ozgcloud/operator/keycloak/realm/{OzgKeycloakRealmTestFactory.java => OzgCloudKeycloakRealmTestFactory.java} (88%)
rename src/test/java/de/ozgcloud/operator/keycloak/user/{OzgKeycloakUserSpecTestFactory.java => OzgCloudKeycloakUserSpecTestFactory.java} (89%)
rename src/test/java/de/ozgcloud/operator/keycloak/user/{OzgKeycloakUserStatusTestFactory.java => OzgCloudKeycloakUserStatusTestFactory.java} (88%)
rename src/test/java/de/ozgcloud/operator/keycloak/user/{OzgKeycloakUserTestFactory.java => OzgCloudKeycloakUserTestFactory.java} (88%)
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java
index e368d98..9ddecb7 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java
@@ -41,77 +41,77 @@ class KeycloakClientMapperTest {
@Test
void shouldMapClientId() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getClientId()).isEqualTo(OzgKeycloakClientSpecTestFactory.CLIENT_ID);
+ assertThat(client.getClientId()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.CLIENT_ID);
}
@Test
void shouldMapBaseUrl() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getBaseUrl()).isEqualTo(OzgKeycloakClientSpecTestFactory.BASE_URL);
+ assertThat(client.getBaseUrl()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.BASE_URL);
}
@Test
void shouldMapRedirectUris() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getRedirectUris()).isEqualTo(OzgKeycloakClientSpecTestFactory.REDIRECT_URLS);
+ assertThat(client.getRedirectUris()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.REDIRECT_URLS);
}
@Test
void shouldMapWebOrigins() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getWebOrigins()).isEqualTo(OzgKeycloakClientSpecTestFactory.WEB_ORIGINS);
+ assertThat(client.getWebOrigins()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.WEB_ORIGINS);
}
@Test
void testProtocol() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.getProtocol()).isEqualTo(KeycloakClientMapper.PROTOCOL);
}
@Test
void testImplicitFlowEnabled() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isImplicitFlowEnabled()).isTrue();
}
@Test
void testDirectAccessGrantsEnabled() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isDirectAccessGrantsEnabled()).isTrue();
}
@Test
void testStandardFlowEnabled() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isStandardFlowEnabled()).isTrue();
}
@Test
void testPublicClientEnabled() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isPublicClient()).isTrue();
}
@Test
void testBearerOnlyEnabled() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isBearerOnly()).isFalse();
}
@Test
void testPostLogoutRedirectUri() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.getAttributes())
.containsEntry(KeycloakClientMapper.ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS,
@@ -124,77 +124,77 @@ class KeycloakClientMapperTest {
@Test
void shouldMapClientId() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getClientId()).isEqualTo(OzgKeycloakClientSpecTestFactory.CLIENT_ID);
+ assertThat(client.getClientId()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.CLIENT_ID);
}
@Test
void shouldMapBaseUrl() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getBaseUrl()).isEqualTo(OzgKeycloakClientSpecTestFactory.BASE_URL);
+ assertThat(client.getBaseUrl()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.BASE_URL);
}
@Test
void shouldMapRedirectUris() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getRedirectUris()).isEqualTo(OzgKeycloakClientSpecTestFactory.REDIRECT_URLS);
+ assertThat(client.getRedirectUris()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.REDIRECT_URLS);
}
@Test
void shouldMapWebOrigins() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
- assertThat(client.getWebOrigins()).isEqualTo(OzgKeycloakClientSpecTestFactory.WEB_ORIGINS);
+ assertThat(client.getWebOrigins()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.WEB_ORIGINS);
}
@Test
void testProtocol() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.getProtocol()).isEqualTo(KeycloakClientMapper.PROTOCOL);
}
@Test
void testImplicitFlowEnabled() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isImplicitFlowEnabled()).isTrue();
}
@Test
void testDirectAccessGrantsEnabled() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isDirectAccessGrantsEnabled()).isTrue();
}
@Test
void testStandardFlowEnabled() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isStandardFlowEnabled()).isTrue();
}
@Test
void testPublicClientEnabled() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isPublicClient()).isTrue();
}
@Test
void testBearerOnlyEnabled() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.isBearerOnly()).isFalse();
}
@Test
void testPostLogoutRedirectUri() {
- var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.getAttributes())
.containsEntry(KeycloakClientMapper.ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS,
@@ -207,9 +207,9 @@ class KeycloakClientMapperTest {
@Test
void shouldMapClientName() {
- var role = mapper.mapRole(OzgKeycloakClientSpecTestFactory.ROLE1);
+ var role = mapper.mapRole(OzgCloudKeycloakClientSpecTestFactory.ROLE1);
- assertThat(role.getName()).isEqualTo(OzgKeycloakClientSpecTestFactory.ROLE_NAME_1);
+ assertThat(role.getName()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.ROLE_NAME_1);
}
}
@@ -218,9 +218,9 @@ class KeycloakClientMapperTest {
@Test
void shouldUpdateClientName() {
- var role = mapper.updateRole(RoleRepresentationTestFactory.create(), OzgKeycloakClientSpecTestFactory.ROLE2);
+ var role = mapper.updateRole(RoleRepresentationTestFactory.create(), OzgCloudKeycloakClientSpecTestFactory.ROLE2);
- assertThat(role.getName()).isEqualTo(OzgKeycloakClientSpecTestFactory.ROLE_NAME_2);
+ assertThat(role.getName()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.ROLE_NAME_2);
}
}
@@ -232,46 +232,46 @@ class KeycloakClientMapperTest {
@Test
void shouldMapProtocolMapper() {
- var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+ var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
assertThat(client.getProtocolMappers()).isNotEmpty();
}
@Test
void shouldMapName() {
- var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+ var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
- assertThat(protocolMapper.getName()).isEqualTo(OzgKeycloakClientSpecProtocolMapperTestFactory.NAME);
+ assertThat(protocolMapper.getName()).isEqualTo(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.NAME);
}
@Test
void shouldMapProtocol() {
- var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+ var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
- assertThat(protocolMapper.getProtocol()).isEqualTo(OzgKeycloakClientSpecProtocolMapperTestFactory.PROTOCOL);
+ assertThat(protocolMapper.getProtocol()).isEqualTo(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.PROTOCOL);
}
@Test
void shouldMapType() {
- var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+ var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
- assertThat(protocolMapper.getProtocolMapper()).isEqualTo(OzgKeycloakClientSpecProtocolMapperTestFactory.TYPE);
+ assertThat(protocolMapper.getProtocolMapper()).isEqualTo(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.TYPE);
}
@Test
void shouldMapConfig() {
- var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+ var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
- assertThat(protocolMapper.getConfig()).containsEntry(OzgKeycloakClientSpecProtocolMapperTestFactory.CONFIG_KEY_1,
- OzgKeycloakClientSpecProtocolMapperTestFactory.CONFIG_VALUE_1);
+ assertThat(protocolMapper.getConfig()).containsEntry(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.CONFIG_KEY_1,
+ OzgCloudKeycloakClientSpecProtocolMapperTestFactory.CONFIG_VALUE_1);
}
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java
index 2571c2f..72ecf4b 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java
@@ -51,16 +51,16 @@ class KeycloakClientPreconditionServiceTest {
void shouldCallRealmExists() {
when(genericRemoteService.realmExists(any())).thenReturn(false);
- service.getReconcilePreconditionErrors(OzgKeycloakClientTestFactory.create());
+ service.getReconcilePreconditionErrors(OzgCloudKeycloakClientTestFactory.create());
- verify(genericRemoteService).realmExists(OzgKeycloakClientTestFactory.METADATA_NAMESPACE);
+ verify(genericRemoteService).realmExists(OzgCloudKeycloakClientTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldReturnErrorIfRealmNotExists() {
doReturn(false).when(genericRemoteService).realmExists(anyString());
- var response = service.getReconcilePreconditionErrors(OzgKeycloakClientTestFactory.create());
+ var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakClientTestFactory.create());
assertThat(response).isPresent();
}
@@ -69,7 +69,7 @@ class KeycloakClientPreconditionServiceTest {
void shouldReturnEmptyIfRealmExists() {
doReturn(true).when(genericRemoteService).realmExists(anyString());
- var response = service.getReconcilePreconditionErrors(OzgKeycloakClientTestFactory.create());
+ var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakClientTestFactory.create());
assertThat(response).isEmpty();
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
index 097ca21..de5fdb9 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
@@ -56,23 +56,23 @@ class KeycloakClientReconcilerTest {
@Test
void shouldCallServiceAddClient() {
- OzgCloudKeycloakClient client = OzgKeycloakClientTestFactory.create();
+ OzgCloudKeycloakClient client = OzgCloudKeycloakClientTestFactory.create();
reconciler.reconcile(client, null);
- verify(service).createOrUpdateClient(client.getSpec(), OzgKeycloakClientTestFactory.METADATA_NAMESPACE);
+ verify(service).createOrUpdateClient(client.getSpec(), OzgCloudKeycloakClientTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldReturnUpdateStatus() {
- var response = reconciler.reconcile(OzgKeycloakClientTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
assertThat(response.getResource()).isNotNull();
}
@Test
void shouldSetStatusOk() {
- var response = reconciler.reconcile(OzgKeycloakClientTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
}
@@ -81,7 +81,7 @@ class KeycloakClientReconcilerTest {
void shouldReturnInProgressStatusIfPreconditionsNotMet() {
when(preconditionService.getReconcilePreconditionErrors(any())).thenReturn(Optional.of(ERROR_MESSAGE));
- var response = reconciler.reconcile(OzgKeycloakClientTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java
index 93f7fc6..e1e399d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.operator.keycloak.client;
-import static de.ozgcloud.operator.keycloak.client.OzgKeycloakClientSpecTestFactory.*;
+import static de.ozgcloud.operator.keycloak.client.OzgCloudKeycloakClientSpecTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -67,7 +67,7 @@ class KeycloakClientServiceTest {
@Test
void shouldCallCreateClientMethod() {
- var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+ var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
doNothing().when(service).createClient(clientSpec, TEST_NAMESPACE);
service.createOrUpdateClient(clientSpec, TEST_NAMESPACE);
@@ -77,10 +77,10 @@ class KeycloakClientServiceTest {
@Test
void shouldCallUpdateClientMethod() {
- var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+ var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
var clientRepresentation = ClientRepresentationTestFactory.create();
doNothing().when(service).updateClient(clientRepresentation, clientSpec, TEST_NAMESPACE);
- when(keycloakGenericRemoteService.getByClientId(OzgKeycloakClientSpecTestFactory.CLIENT_ID, TEST_NAMESPACE))
+ when(keycloakGenericRemoteService.getByClientId(OzgCloudKeycloakClientSpecTestFactory.CLIENT_ID, TEST_NAMESPACE))
.thenReturn(Optional.of(clientRepresentation));
service.createOrUpdateClient(clientSpec, TEST_NAMESPACE);
@@ -93,7 +93,7 @@ class KeycloakClientServiceTest {
@Nested
class TestCreateClient {
- private final OzgCloudKeycloakClientSpec client = OzgKeycloakClientSpecTestFactory.create();
+ private final OzgCloudKeycloakClientSpec client = OzgCloudKeycloakClientSpecTestFactory.create();
private final ClientRepresentation clientRepresentation = ClientRepresentationTestFactory.create();
@BeforeEach
@@ -233,7 +233,7 @@ class KeycloakClientServiceTest {
class TestUpdateClient {
private final ClientRepresentation clientRepresentation = ClientRepresentationTestFactory.create();
- private final OzgCloudKeycloakClientSpec client = OzgKeycloakClientSpecTestFactory.create();
+ private final OzgCloudKeycloakClientSpec client = OzgCloudKeycloakClientSpecTestFactory.create();
@BeforeEach
void init() {
@@ -276,7 +276,7 @@ class KeycloakClientServiceTest {
@Test
void shouldCallRemoteServiceGetRole() {
- service.addOrUpdateClientRoles(OzgKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
+ service.addOrUpdateClientRoles(OzgCloudKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
verify(keycloakGenericRemoteService).getClientRole(ROLE_NAME_1, REAL_CLIENT_ID,
TEST_NAMESPACE);
@@ -289,7 +289,7 @@ class KeycloakClientServiceTest {
var roleRepresentation = RoleRepresentationTestFactory.create();
when(mapper.mapRole(any())).thenReturn(roleRepresentation);
- service.addOrUpdateClientRoles(OzgKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
+ service.addOrUpdateClientRoles(OzgCloudKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
verify(remoteService).addClientRole(roleRepresentation, REAL_CLIENT_ID, TEST_NAMESPACE);
}
@@ -301,7 +301,7 @@ class KeycloakClientServiceTest {
TEST_NAMESPACE)).thenReturn(Optional.of(roleRepresentation));
when(mapper.updateRole(any(), any())).thenReturn(roleRepresentation);
- service.addOrUpdateClientRoles(OzgKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
+ service.addOrUpdateClientRoles(OzgCloudKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
verify(remoteService).updateClientRole(roleRepresentation, REAL_CLIENT_ID, TEST_NAMESPACE);
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
index 65177ad..620798e 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
@@ -69,11 +69,11 @@ class KeycloakLivelTest {
@SuppressWarnings("unused")
private RoleRepresentation createRoles() {
- return mapper.mapRole(OzgKeycloakClientSpecTestFactory.ROLE1);
+ return mapper.mapRole(OzgCloudKeycloakClientSpecTestFactory.ROLE1);
}
private ClientRepresentation createClient() {
- OzgCloudKeycloakClientSpec client = OzgKeycloakClientSpecTestFactory.createBuilder()
+ OzgCloudKeycloakClientSpec client = OzgCloudKeycloakClientSpecTestFactory.createBuilder()
.clientId("testclient")
.build();
return mapper.map(client);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecProtocolMapperTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java
similarity index 96%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecProtocolMapperTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java
index cfa57db..f5f9d2e 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecProtocolMapperTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.client;
import java.util.Map;
-public class OzgKeycloakClientSpecProtocolMapperTestFactory {
+public class OzgCloudKeycloakClientSpecProtocolMapperTestFactory {
public static final String NAME = "ProtocolMapperName";
public static final String PROTOCOL = "TestProcotol";
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecTestFactory.java
similarity index 90%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecTestFactory.java
index 325a10d..a7fbfb7 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecTestFactory.java
@@ -27,7 +27,7 @@ import java.util.List;
import de.ozgcloud.operator.keycloak.client.OzgCloudKeycloakClientSpec.ClientRole;
-public class OzgKeycloakClientSpecTestFactory {
+public class OzgCloudKeycloakClientSpecTestFactory {
public static final String CLIENT_ID = "ClientName";
public static final String BASE_URL = "https://BaseUrl.local";
@@ -42,13 +42,13 @@ public class OzgKeycloakClientSpecTestFactory {
public static final ClientRole ROLE2 = ClientRole.builder().name(ROLE_NAME_2).build();
public static final List<ClientRole> ROLES = List.of(ROLE1);
- public static final OzgCloudKeycloakClientSpec.ProtocolMapper PROTOCOL_MAPPER_1 = OzgKeycloakClientSpecProtocolMapperTestFactory.create();
+ public static final OzgCloudKeycloakClientSpec.ProtocolMapper PROTOCOL_MAPPER_1 = OzgCloudKeycloakClientSpecProtocolMapperTestFactory.create();
public static final OzgCloudKeycloakClientSpec create() {
return createBuilder().build();
}
- public static final OzgCloudKeycloakClientSpec.OzgKeycloakClientSpecBuilder createBuilder() {
+ public static final OzgCloudKeycloakClientSpec.OzgCloudKeycloakClientSpecBuilder createBuilder() {
return OzgCloudKeycloakClientSpec.builder()
.clientId(CLIENT_ID)
.baseUrl(BASE_URL)
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatusTestFactory.java
similarity index 87%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatusTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatusTestFactory.java
index f406e80..f1ba9d6 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatusTestFactory.java
@@ -23,13 +23,13 @@
*/
package de.ozgcloud.operator.keycloak.client;
-public class OzgKeycloakClientStatusTestFactory {
+public class OzgCloudKeycloakClientStatusTestFactory {
public static final OzgCloudKeycloakClientStatus create() {
return createBuilder().build();
}
- public static final OzgCloudKeycloakClientStatus.OzgKeycloakClientStatusBuilder createBuilder() {
+ public static final OzgCloudKeycloakClientStatus.OzgCloudKeycloakClientStatusBuilder createBuilder() {
return OzgCloudKeycloakClientStatus.builder();
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientTestFactory.java
similarity index 83%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientTestFactory.java
index cf400c4..0cae318 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientTestFactory.java
@@ -23,10 +23,10 @@
*/
package de.ozgcloud.operator.keycloak.client;
-public class OzgKeycloakClientTestFactory {
+public class OzgCloudKeycloakClientTestFactory {
- public final static OzgCloudKeycloakClientSpec SPEC = OzgKeycloakClientSpecTestFactory.create();
- public final static OzgCloudKeycloakClientStatus STATUS = OzgKeycloakClientStatusTestFactory.create();
+ public final static OzgCloudKeycloakClientSpec SPEC = OzgCloudKeycloakClientSpecTestFactory.create();
+ public final static OzgCloudKeycloakClientStatus STATUS = OzgCloudKeycloakClientStatusTestFactory.create();
public static final String METADATA_NAMESPACE = "TestNamespace";
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java
index 1068319..c0e70f6 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java
@@ -29,7 +29,7 @@ public class RoleRepresentationTestFactory {
public static RoleRepresentation create() {
var role = new RoleRepresentation();
- role.setName(OzgKeycloakClientSpecTestFactory.ROLE_NAME_1);
+ role.setName(OzgCloudKeycloakClientSpecTestFactory.ROLE_NAME_1);
return role;
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java
index c6a41f2..abd1f84 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java
@@ -29,7 +29,7 @@ public class GroupRepresentationTestFactory {
public static GroupRepresentation create() {
var group = new GroupRepresentation();
- group.setName(OzgKeycloakGroupSpecTestFactory.NAME);
+ group.setName(OzgCloudKeycloakGroupSpecTestFactory.NAME);
return group;
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java
index 5129815..27b838f 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java
@@ -42,18 +42,18 @@ class KeycloakGroupMapperTest {
@Test
void shouldMapName() {
- var group = mapper.map(OzgKeycloakGroupSpecTestFactory.create());
+ var group = mapper.map(OzgCloudKeycloakGroupSpecTestFactory.create());
- assertThat(group.getName()).isEqualTo(OzgKeycloakGroupSpecTestFactory.NAME);
+ assertThat(group.getName()).isEqualTo(OzgCloudKeycloakGroupSpecTestFactory.NAME);
}
@Test
void shouldMapGroupAttributes() {
- var group = mapper.map(OzgKeycloakGroupSpecTestFactory.create());
+ var group = mapper.map(OzgCloudKeycloakGroupSpecTestFactory.create());
assertThat(group.getAttributes())
- .hasFieldOrPropertyWithValue(OzgKeycloakGroupSpecAttributeTestFactory.NAME,
- List.of(OzgKeycloakGroupSpecAttributeTestFactory.VALUE));
+ .hasFieldOrPropertyWithValue(OzgCloudKeycloakGroupSpecAttributeTestFactory.NAME,
+ List.of(OzgCloudKeycloakGroupSpecAttributeTestFactory.VALUE));
}
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java
index f108288..748b9e1 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java
@@ -51,16 +51,16 @@ class KeycloakGroupPreconditionServiceTest {
void shouldCallRealmExists() {
when(genericRemoteService.realmExists(any())).thenReturn(false);
- service.getReconcilePreconditionErrors(OzgKeycloakGroupTestFactory.create());
+ service.getReconcilePreconditionErrors(OzgCloudKeycloakGroupTestFactory.create());
- verify(genericRemoteService).realmExists(OzgKeycloakGroupTestFactory.METADATA_NAMESPACE);
+ verify(genericRemoteService).realmExists(OzgCloudKeycloakGroupTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldReturnErrorIfRealmNotExists() {
doReturn(false).when(genericRemoteService).realmExists(anyString());
- var response = service.getReconcilePreconditionErrors(OzgKeycloakGroupTestFactory.create());
+ var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakGroupTestFactory.create());
assertThat(response).isPresent();
}
@@ -69,7 +69,7 @@ class KeycloakGroupPreconditionServiceTest {
void shouldReturnEmptyIfRealmExists() {
doReturn(true).when(genericRemoteService).realmExists(anyString());
- var response = service.getReconcilePreconditionErrors(OzgKeycloakGroupTestFactory.create());
+ var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakGroupTestFactory.create());
assertThat(response).isEmpty();
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
index 7c8905c..e7c4ef0 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
@@ -56,23 +56,23 @@ class KeycloakGroupReconcilerTest {
@Test
void shouldCallServiceAddGroup() {
- OzgCloudKeycloakGroup group = OzgKeycloakGroupTestFactory.create();
+ OzgCloudKeycloakGroup group = OzgCloudKeycloakGroupTestFactory.create();
reconciler.reconcile(group, null);
- verify(service).createGroup(group.getSpec(), OzgKeycloakGroupTestFactory.METADATA_NAMESPACE);
+ verify(service).createGroup(group.getSpec(), OzgCloudKeycloakGroupTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldReturnUpdateStatus() {
- var response = reconciler.reconcile(OzgKeycloakGroupTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
assertThat(response.getResource()).isNotNull();
}
@Test
void shouldSetStatusOk() {
- var response = reconciler.reconcile(OzgKeycloakGroupTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
}
@@ -81,7 +81,7 @@ class KeycloakGroupReconcilerTest {
void shouldReturnInProgressStatusIfPreconditionsNotMet() {
when(preconditionService.getReconcilePreconditionErrors(any())).thenReturn(Optional.of(ERROR_MESSAGE));
- var response = reconciler.reconcile(OzgKeycloakGroupTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java
index c7598a8..1303467 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java
@@ -74,9 +74,9 @@ class KeycloakGroupRemoteServiceTest {
@Test
void shouldReturnExistingGroup() {
- when(groupRepresentation.getName()).thenReturn(OzgKeycloakGroupSpecTestFactory.NAME);
+ when(groupRepresentation.getName()).thenReturn(OzgCloudKeycloakGroupSpecTestFactory.NAME);
- var rsp = service.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM);
+ var rsp = service.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM);
assertThat(rsp).isPresent();
}
@@ -85,7 +85,7 @@ class KeycloakGroupRemoteServiceTest {
void shouldReturnEmptyOnMissingGroup() {
when(groupsResource.groups()).thenReturn(Collections.emptyList());
- var rsp = service.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM);
+ var rsp = service.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM);
assertThat(rsp).isEmpty();
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java
index 4a2ca34..1bc024a 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java
@@ -57,14 +57,14 @@ class KeycloakGroupServiceTest {
var groupRepresentation = GroupRepresentationTestFactory.create();
when(mapper.map(any())).thenReturn(groupRepresentation);
- service.createGroup(OzgKeycloakGroupSpecTestFactory.create(), REALM);
+ service.createGroup(OzgCloudKeycloakGroupSpecTestFactory.create(), REALM);
- verify(remoteService).getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM);
+ verify(remoteService).getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM);
}
@Test
void shouldCallMapper() {
- var group = OzgKeycloakGroupSpecTestFactory.create();
+ var group = OzgCloudKeycloakGroupSpecTestFactory.create();
service.createGroup(group, REALM);
verify(mapper).map(group);
@@ -72,9 +72,9 @@ class KeycloakGroupServiceTest {
@Test
void shouldCreateGroupIfNotExists() {
- var ozgGroup = OzgKeycloakGroupSpecTestFactory.create();
+ var ozgGroup = OzgCloudKeycloakGroupSpecTestFactory.create();
var groupRepresentation = GroupRepresentationTestFactory.create();
- when(remoteService.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.empty());
+ when(remoteService.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.empty());
when(mapper.map(ozgGroup)).thenReturn(groupRepresentation);
service.createGroup(ozgGroup, REALM);
@@ -84,8 +84,8 @@ class KeycloakGroupServiceTest {
@Test
void shouldNotCreateGroupIfAlreadyExists() {
- var ozgGroup = OzgKeycloakGroupSpecTestFactory.create();
- when(remoteService.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.of(mock(GroupRepresentation.class)));
+ var ozgGroup = OzgCloudKeycloakGroupSpecTestFactory.create();
+ when(remoteService.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.of(mock(GroupRepresentation.class)));
when(mapper.map(ozgGroup)).thenReturn(GroupRepresentationTestFactory.create());
service.createGroup(ozgGroup, REALM);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecAttributeTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecAttributeTestFactory.java
similarity index 95%
rename from src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecAttributeTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecAttributeTestFactory.java
index d33a2c7..2e5558e 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecAttributeTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecAttributeTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.operator.keycloak.group;
-public class OzgKeycloakGroupSpecAttributeTestFactory {
+public class OzgCloudKeycloakGroupSpecAttributeTestFactory {
public static final String NAME = "AttributeName";
public static final String VALUE = "AttributeValue";
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecTestFactory.java
similarity index 84%
rename from src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecTestFactory.java
index d9354fd..7181383 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecTestFactory.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.group;
import java.util.List;
-public class OzgKeycloakGroupSpecTestFactory {
+public class OzgCloudKeycloakGroupSpecTestFactory {
public static final String NAME = "GroupName";
@@ -33,9 +33,9 @@ public class OzgKeycloakGroupSpecTestFactory {
return createBuilder().build();
}
- public static OzgCloudKeycloakGroupSpec.OzgKeycloakGroupSpecBuilder createBuilder() {
+ public static OzgCloudKeycloakGroupSpec.OzgCloudKeycloakGroupSpecBuilder createBuilder() {
return OzgCloudKeycloakGroupSpec.builder()
.name(NAME)
- .attributes(List.of(OzgKeycloakGroupSpecAttributeTestFactory.create()));
+ .attributes(List.of(OzgCloudKeycloakGroupSpecAttributeTestFactory.create()));
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupTestFactory.java
similarity index 92%
rename from src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupTestFactory.java
index 4b93174..08601b0 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupTestFactory.java
@@ -23,13 +23,13 @@
*/
package de.ozgcloud.operator.keycloak.group;
-public class OzgKeycloakGroupTestFactory {
+public class OzgCloudKeycloakGroupTestFactory {
public static final String METADATA_NAMESPACE = "TestNameSpace";
public static OzgCloudKeycloakGroup create() {
var group = new OzgCloudKeycloakGroup();
- group.setSpec(OzgKeycloakGroupSpecTestFactory.create());
+ group.setSpec(OzgCloudKeycloakGroupSpecTestFactory.create());
group.setStatus(OzgCloudKeycloakGroupStatus.builder().build());
group.getMetadata().setNamespace(METADATA_NAMESPACE);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
index 1d5acfe..92de723 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
@@ -36,49 +36,49 @@ class KeycloakRealmMapperTest {
@Test
void shouldMapDisplayName() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
- assertThat(mapped.getDisplayName()).isEqualTo(OzgKeycloakRealmSpecTestFactory.DISPLAY_NAME);
+ assertThat(mapped.getDisplayName()).isEqualTo(OzgCloudKeycloakRealmSpecTestFactory.DISPLAY_NAME);
}
@Test
void shouldBeEnabled() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
assertThat(mapped.isEnabled()).isTrue();
}
@Test
void shouldBeResetPasswordAllowed() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
assertThat(mapped.isResetPasswordAllowed()).isTrue();
}
@Test
void shouldBeSupportedLocaleDe() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
assertThat(mapped.getSupportedLocales()).containsExactly("de");
}
@Test
void shouldBeDefaultLocaleDe() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
assertThat(mapped.getDefaultLocale()).isEqualTo("de");
}
@Test
void shouldBeInternationalizationEnabled() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
assertThat(mapped.isInternationalizationEnabled()).isTrue();
}
@Test
void checkPasswordPolicy() {
- var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+ var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
assertThat(mapped.getPasswordPolicy()).isEqualTo("upperCase(1) and lowerCase(1) and length(8) and notUsername");
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
index a3cd94a..39cfc6d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
@@ -51,23 +51,23 @@ class KeycloakRealmReconcilerTest {
@Test
void shouldCallServiceAddRealm() {
- OzgCloudKeycloakRealm realm = OzgKeycloakRealmTestFactory.create();
+ OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create();
reconciler.reconcile(realm, null);
- verify(service).createRealm(realm.getSpec(), OzgKeycloakRealmTestFactory.METADATA_NAMESPACE);
+ verify(service).createRealm(realm.getSpec(), OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldReturnUpdateStatus() {
- var response = reconciler.reconcile(OzgKeycloakRealmTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
assertThat(response.getResource()).isNotNull();
}
@Test
void shouldSetStatusOk() {
- var response = reconciler.reconcile(OzgKeycloakRealmTestFactory.create(), null);
+ var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
}
@@ -81,14 +81,14 @@ class KeycloakRealmReconcilerTest {
@Nested
class TestWithKeepAfterDelete {
- private final OzgCloudKeycloakRealmSpec realmSpec = OzgKeycloakRealmSpecTestFactory.createBuilder().keepAfterDelete(true).build();
- private final OzgCloudKeycloakRealm realm = OzgKeycloakRealmTestFactory.create(realmSpec);
+ private final OzgCloudKeycloakRealmSpec realmSpec = OzgCloudKeycloakRealmSpecTestFactory.createBuilder().keepAfterDelete(true).build();
+ private final OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create(realmSpec);
@Test
void shouldNotCallService() {
reconciler.cleanup(realm, null);
- verify(service, never()).deleteRealm(OzgKeycloakRealmTestFactory.METADATA_NAMESPACE);
+ verify(service, never()).deleteRealm(OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
}
@Test
@@ -101,11 +101,11 @@ class KeycloakRealmReconcilerTest {
@Test
void shouldCallServiceDelete() {
- var realm = OzgKeycloakRealmTestFactory.create();
+ var realm = OzgCloudKeycloakRealmTestFactory.create();
reconciler.cleanup(realm);
- verify(service).deleteRealm(OzgKeycloakRealmTestFactory.METADATA_NAMESPACE);
+ verify(service).deleteRealm(OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
}
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
index a74a8bd..529dd38 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
@@ -38,7 +38,7 @@ import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService;
class KeycloakRealmServiceTest {
- private static final OzgCloudKeycloakRealmSpec REALM = OzgKeycloakRealmSpecTestFactory.create();
+ private static final OzgCloudKeycloakRealmSpec REALM = OzgCloudKeycloakRealmSpecTestFactory.create();
private static final String REALM_NAME = "TestRealmName";
@Spy
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
similarity index 90%
rename from src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
index 24a8bd5..fe23573 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.operator.keycloak.realm;
-public class OzgKeycloakRealmSpecTestFactory {
+public class OzgCloudKeycloakRealmSpecTestFactory {
public final static String DISPLAY_NAME = "TestDisplayName";
public final static boolean KEEP_AFTER_DELETE = false;
@@ -32,7 +32,7 @@ public class OzgKeycloakRealmSpecTestFactory {
return createBuilder().build();
}
- public static OzgCloudKeycloakRealmSpec.OzgKeycloakRealmSpecBuilder createBuilder() {
+ public static OzgCloudKeycloakRealmSpec.OzgCloudKeycloakRealmSpecBuilder createBuilder() {
return OzgCloudKeycloakRealmSpec.builder()
.keepAfterDelete(KEEP_AFTER_DELETE)
.displayName(DISPLAY_NAME);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatusTestFactory.java
similarity index 88%
rename from src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatusTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatusTestFactory.java
index 854bb98..d8a8e54 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatusTestFactory.java
@@ -23,13 +23,13 @@
*/
package de.ozgcloud.operator.keycloak.realm;
-public class OzgKeycloakRealmStatusTestFactory {
+public class OzgCloudKeycloakRealmStatusTestFactory {
public static OzgCloudKeycloakRealmStatus create() {
return createBuilder().build();
}
- public static OzgCloudKeycloakRealmStatus.OzgKeycloakRealmStatusBuilder createBuilder() {
+ public static OzgCloudKeycloakRealmStatus.OzgCloudKeycloakRealmStatusBuilder createBuilder() {
return OzgCloudKeycloakRealmStatus.builder();
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmTestFactory.java
similarity index 88%
rename from src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmTestFactory.java
index d63754a..2c2f7ed 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmTestFactory.java
@@ -23,12 +23,12 @@
*/
package de.ozgcloud.operator.keycloak.realm;
-public class OzgKeycloakRealmTestFactory {
+public class OzgCloudKeycloakRealmTestFactory {
public static final String METADATA_NAMESPACE = "TestNamespace";
public static OzgCloudKeycloakRealm create() {
- return createWithSpec(OzgKeycloakRealmSpecTestFactory.create());
+ return createWithSpec(OzgCloudKeycloakRealmSpecTestFactory.create());
}
public static OzgCloudKeycloakRealm create(OzgCloudKeycloakRealmSpec spec) {
@@ -38,7 +38,7 @@ public class OzgKeycloakRealmTestFactory {
private static OzgCloudKeycloakRealm createWithSpec(OzgCloudKeycloakRealmSpec spec) {
var realm = new OzgCloudKeycloakRealm();
realm.setSpec(spec);
- realm.setStatus(OzgKeycloakRealmStatusTestFactory.create());
+ realm.setStatus(OzgCloudKeycloakRealmStatusTestFactory.create());
realm.getMetadata().setNamespace(METADATA_NAMESPACE);
return realm;
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 3a41294..713371f 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
@@ -134,7 +134,7 @@ class KeycloakUserMapperTest {
}
private UserRepresentation map() {
- return mapper.map(OzgKeycloakUserSpecTestFactory.create());
+ return mapper.map(OzgCloudKeycloakUserSpecTestFactory.create());
}
}
@@ -144,7 +144,7 @@ class KeycloakUserMapperTest {
@Test
void shouldHaveSize() {
- var clientRoles = OzgKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
+ var clientRoles = OzgCloudKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
var mappedRoles = mapper.mapClientRoles(clientRoles);
@@ -153,7 +153,7 @@ class KeycloakUserMapperTest {
@Test
void shouldContainsKey() {
- var clientRoles = OzgKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
+ var clientRoles = OzgCloudKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
var mappedRoles = mapper.mapClientRoles(clientRoles);
@@ -162,7 +162,7 @@ class KeycloakUserMapperTest {
@Test
void shouldContainsRoleList() {
- var clientRoles = OzgKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
+ var clientRoles = OzgCloudKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
var mappedRoles = mapper.mapClientRoles(clientRoles);
@@ -206,7 +206,7 @@ class KeycloakUserMapperTest {
var userRepresentation = UserRepresentationTestFactory.create();
userRepresentation.setFirstName(FIRSTNAME2);
- var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
+ var keycloakUser = mapper.update(userRepresentation, OzgCloudKeycloakUserSpecTestFactory.create());
assertThat(keycloakUser.getFirstName()).isEqualTo(KeycloakUserSpecUserTestFactory.FIRSTNAME);
}
@@ -216,7 +216,7 @@ class KeycloakUserMapperTest {
var userRepresentation = UserRepresentationTestFactory.create();
userRepresentation.setId(USERID);
- var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
+ var keycloakUser = mapper.update(userRepresentation, OzgCloudKeycloakUserSpecTestFactory.create());
assertThat(keycloakUser.getId()).isEqualTo(USERID);
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java
index bc85485..f8088d5 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java
@@ -65,16 +65,16 @@ class KeycloakUserPreconditionServiceTest {
@Test
void shouldCallRealmExiststest() {
- service.getPreconditionErrors(OzgKeycloakUserTestFactory.create());
+ service.getPreconditionErrors(OzgCloudKeycloakUserTestFactory.create());
- verify(keycloakGenericRemoteService).realmExists(OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+ verify(keycloakGenericRemoteService).realmExists(OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldReturnErrorIfRealmNotExists() {
doReturn(false).when(keycloakGenericRemoteService).realmExists(anyString());
- var response = service.getPreconditionErrors(OzgKeycloakUserTestFactory.create());
+ var response = service.getPreconditionErrors(OzgCloudKeycloakUserTestFactory.create());
assertThat(response).isPresent();
}
@@ -85,7 +85,7 @@ class KeycloakUserPreconditionServiceTest {
doReturn(Optional.empty()).when(service).clientsExists(any(), any());
doReturn(Optional.empty()).when(service).groupsExists(any(), any());
- var response = service.getPreconditionErrors(OzgKeycloakUserTestFactory.create());
+ var response = service.getPreconditionErrors(OzgCloudKeycloakUserTestFactory.create());
assertThat(response).isEmpty();
}
@@ -94,22 +94,22 @@ class KeycloakUserPreconditionServiceTest {
void shouldCheckIfKeycloakClientExists() {
doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString());
doReturn(Optional.empty()).when(service).clientsExists(any(), any());
- var user = OzgKeycloakUserTestFactory.create();
+ var user = OzgCloudKeycloakUserTestFactory.create();
service.getPreconditionErrors(user);
- verify(service).clientsExists(eq(user), eq(OzgKeycloakUserTestFactory.METADATA_NAMESPACE));
+ verify(service).clientsExists(eq(user), eq(OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE));
}
@Test
void shouldCheckIfGroupsExists() {
doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString());
doReturn(Optional.empty()).when(service).clientsExists(any(), any());
- var user = OzgKeycloakUserTestFactory.create();
+ var user = OzgCloudKeycloakUserTestFactory.create();
service.getPreconditionErrors(user);
- verify(service).groupsExists(eq(user), eq(OzgKeycloakUserTestFactory.METADATA_NAMESPACE));
+ verify(service).groupsExists(eq(user), eq(OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE));
}
}
@@ -120,7 +120,7 @@ class KeycloakUserPreconditionServiceTest {
void shouldRespondMissingRealm() {
when(keycloakGenericRemoteService.getByClientId(any(), any())).thenReturn(Optional.empty());
- var rsp = service.clientsExists(OzgKeycloakUserTestFactory.create(), null);
+ var rsp = service.clientsExists(OzgCloudKeycloakUserTestFactory.create(), null);
assertThat(rsp).isPresent();
}
@@ -129,7 +129,7 @@ class KeycloakUserPreconditionServiceTest {
void shouldReturnClientExists() {
when(keycloakGenericRemoteService.getByClientId(any(), any())).thenReturn(Optional.of(mock(ClientRepresentation.class)));
- var rsp = service.clientsExists(OzgKeycloakUserTestFactory.create(), null);
+ var rsp = service.clientsExists(OzgCloudKeycloakUserTestFactory.create(), null);
assertThat(rsp).isEmpty();
}
@@ -138,7 +138,7 @@ class KeycloakUserPreconditionServiceTest {
@Nested
class TestGroupsExists {
- private static final OzgCloudKeycloakUser user = OzgKeycloakUserTestFactory.create();
+ private static final OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
@BeforeEach
void init() {
@@ -148,7 +148,7 @@ class KeycloakUserPreconditionServiceTest {
@Test
void shouldReturnMissingGroup() {
- when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(false);
+ when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(false);
var rsp = service.getPreconditionErrors(user);
@@ -157,8 +157,8 @@ class KeycloakUserPreconditionServiceTest {
@Test
void shouldReturnGroupExists() {
- when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
- when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2, OzgKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
+ when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
+ when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
var rsp = service.getPreconditionErrors(user);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
index 17b25f0..32da676 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
@@ -63,16 +63,16 @@ class KeycloakUserReconcilerTest {
@Test
void shouldCallServiceAddUser() {
- OzgCloudKeycloakUser user = OzgKeycloakUserTestFactory.create();
+ OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
reconciler.reconcile(user, null);
- verify(service).createOrUpdateUser(user.getSpec(), OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+ verify(service).createOrUpdateUser(user.getSpec(), OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
}
@Test
void shouldUpdateStatus() {
- OzgCloudKeycloakUser user = OzgKeycloakUserTestFactory.create();
+ OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
reconciler.reconcile(user, null);
@@ -87,7 +87,7 @@ class KeycloakUserReconcilerTest {
@Test
void shouldSetPreconcitionErrorMessage() {
when(preconditionService.getPreconditionErrors(any())).thenReturn(Optional.of(ERROR_MESSAGE));
- OzgCloudKeycloakUser user = OzgKeycloakUserTestFactory.create();
+ OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
reconciler.reconcile(user, null);
@@ -105,15 +105,15 @@ class KeycloakUserReconcilerTest {
class TestWithKeepAfterDelete {
private final KeycloakUserSpecUser keycloakUser = KeycloakUserSpecUserTestFactory.createBuiler().build();
- private final OzgCloudKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.createBuilder().keepAfterDelete(true)
+ private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.createBuilder().keepAfterDelete(true)
.keycloakUser(keycloakUser).build();
- private final OzgCloudKeycloakUser user = OzgKeycloakUserTestFactory.create(userSpec);
+ private final OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create(userSpec);
@Test
void shouldNotCallService() {
reconciler.cleanup(user, null);
- verify(service, never()).deleteUser(userSpec, OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+ verify(service, never()).deleteUser(userSpec, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
}
@Test
@@ -126,11 +126,11 @@ class KeycloakUserReconcilerTest {
@Test
void shouldCallServiceDelete() {
- var user = OzgKeycloakUserTestFactory.create();
+ var user = OzgCloudKeycloakUserTestFactory.create();
reconciler.cleanup(user);
- verify(service).deleteUser(user.getSpec(), OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+ verify(service).deleteUser(user.getSpec(), OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
}
}
}
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 dd604ba..eaf20bc 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
@@ -72,7 +72,7 @@ class KeycloakUserServiceTest {
@Captor
private ArgumentCaptor<OzgCloudKeycloakUserSpec> ozgKeycloakUserSpecCaptor;
- private final OzgCloudKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.create();
+ private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
@DisplayName("user has no password")
@Nested
@@ -92,7 +92,7 @@ class KeycloakUserServiceTest {
@Test
void shouldUpdateUserPassword() {
- var userWithoutPassword = OzgKeycloakUserSpecTestFactory.createBuilder()
+ var userWithoutPassword = OzgCloudKeycloakUserSpecTestFactory.createBuilder()
.keycloakUser(KeycloakUserSpecUserTestFactory.createBuiler().password(StringUtils.EMPTY).build()).build();
when(userSecretService.getPasswordFromSecret(any())).thenReturn(KeycloakUserSpecUserTestFactory.PASSWORD);
@@ -149,7 +149,7 @@ class KeycloakUserServiceTest {
.thenReturn(Optional.empty());
when(userMapper.map(any())).thenReturn(Mockito.mock(UserRepresentation.class));
- service.createOrUpdateUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+ service.createOrUpdateUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
verify(remoteService).createUser(any(UserRepresentation.class), eq(TEST_NAMESPACE));
}
@@ -161,7 +161,7 @@ class KeycloakUserServiceTest {
.thenReturn(Optional.of(userRepresentation));
when(userMapper.update(eq(userRepresentation), any())).thenReturn(userRepresentation);
- service.createOrUpdateUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+ service.createOrUpdateUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
verify(remoteService).updateUser(userRepresentation, TEST_NAMESPACE);
}
@@ -173,7 +173,7 @@ class KeycloakUserServiceTest {
@Test
void testUserHasNoPasswordTrue() {
- OzgCloudKeycloakUserSpec user = OzgKeycloakUserSpecTestFactory.create();
+ OzgCloudKeycloakUserSpec user = OzgCloudKeycloakUserSpecTestFactory.create();
boolean userHasNoPassword = service.userHasNoPassword(user, TEST_NAMESPACE);
@@ -190,7 +190,7 @@ class KeycloakUserServiceTest {
}
private OzgCloudKeycloakUserSpec createUserWithoutPassword() {
- return OzgKeycloakUserSpecTestFactory.createBuilder()
+ return OzgCloudKeycloakUserSpecTestFactory.createBuilder()
.keycloakUser(KeycloakUserSpecUserTestFactory.createBuiler()
.password(null).build())
.build();
@@ -203,7 +203,7 @@ class KeycloakUserServiceTest {
@Test
void shouldCallUserMapper() {
- var testUser = OzgKeycloakUserSpecTestFactory.create();
+ var testUser = OzgCloudKeycloakUserSpecTestFactory.create();
service.deleteUser(testUser, TEST_NAMESPACE);
@@ -216,7 +216,7 @@ class KeycloakUserServiceTest {
var userRepresentation = UserRepresentationTestFactory.create();
when(userMapper.map(any())).thenReturn(userRepresentation);
- service.deleteUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+ service.deleteUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
verify(remoteService).getUserByName(userRepresentation.getUsername(), TEST_NAMESPACE);
}
@@ -229,7 +229,7 @@ class KeycloakUserServiceTest {
when(remoteService.getUserByName(UserRepresentationTestFactory.USERNAME, TEST_NAMESPACE)).thenReturn(Optional.of(userRepresentation));
userRepresentation.setId(TEST_USERID);
- service.deleteUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+ service.deleteUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
verify(remoteService).deleteUser(TEST_USERID, TEST_NAMESPACE);
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpecTestFactory.java
similarity index 89%
rename from src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpecTestFactory.java
index 31d2e6d..a76206d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpecTestFactory.java
@@ -23,15 +23,15 @@
*/
package de.ozgcloud.operator.keycloak.user;
-import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.OzgKeycloakUserSpecBuilder;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.OzgCloudKeycloakUserSpecBuilder;
-public class OzgKeycloakUserSpecTestFactory {
+public class OzgCloudKeycloakUserSpecTestFactory {
public static OzgCloudKeycloakUserSpec create() {
return createBuilder().build();
}
- public static OzgKeycloakUserSpecBuilder createBuilder() {
+ public static OzgCloudKeycloakUserSpecBuilder createBuilder() {
return OzgCloudKeycloakUserSpec.builder()
.keycloakUser(KeycloakUserSpecUserTestFactory.create());
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatusTestFactory.java
similarity index 88%
rename from src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatusTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatusTestFactory.java
index 83aaefc..30022f2 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatusTestFactory.java
@@ -23,15 +23,15 @@
*/
package de.ozgcloud.operator.keycloak.user;
-import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserStatus.OzgKeycloakUserStatusBuilder;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserStatus.OzgCloudKeycloakUserStatusBuilder;
-class OzgKeycloakUserStatusTestFactory {
+class OzgCloudKeycloakUserStatusTestFactory {
public static OzgCloudKeycloakUserStatus create() {
return createBuiler().build();
}
- private static OzgKeycloakUserStatusBuilder createBuiler() {
+ private static OzgCloudKeycloakUserStatusBuilder createBuiler() {
return OzgCloudKeycloakUserStatus.builder();
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserTestFactory.java
similarity index 88%
rename from src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserTestFactory.java
index 1194c2c..02a3df0 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserTestFactory.java
@@ -23,12 +23,12 @@
*/
package de.ozgcloud.operator.keycloak.user;
-class OzgKeycloakUserTestFactory {
+class OzgCloudKeycloakUserTestFactory {
public static final String METADATA_NAMESPACE = "TestNamespace";
public static OzgCloudKeycloakUser create() {
- return createWithSpec(OzgKeycloakUserSpecTestFactory.create());
+ return createWithSpec(OzgCloudKeycloakUserSpecTestFactory.create());
}
public static OzgCloudKeycloakUser create(OzgCloudKeycloakUserSpec spec) {
@@ -38,7 +38,7 @@ class OzgKeycloakUserTestFactory {
private static OzgCloudKeycloakUser createWithSpec(OzgCloudKeycloakUserSpec spec) {
var keycloakUser = new OzgCloudKeycloakUser();
keycloakUser.setSpec(spec);
- keycloakUser.setStatus(OzgKeycloakUserStatusTestFactory.create());
+ keycloakUser.setStatus(OzgCloudKeycloakUserStatusTestFactory.create());
keycloakUser.getMetadata().setNamespace(METADATA_NAMESPACE);
return keycloakUser;
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java
index 7141897..8e2d864 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java
@@ -36,7 +36,7 @@ class UserSecretServiceTest {
@Nested
class TestCreateSecret {
- private final OzgCloudKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.create();
+ private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
@Mock
private Resource<Secret> secretResource;
@@ -113,7 +113,7 @@ class UserSecretServiceTest {
@Nested
class TestGetUserSecret {
- private final OzgCloudKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.create();
+ private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
private final static String CONVERTED_NAME = "SecretConformName";
@@ -155,7 +155,7 @@ class UserSecretServiceTest {
void shouldReturnExistingSecret() {
when(secretResource.get()).thenReturn(secret);
- Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
+ Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgCloudKeycloakUserSpecTestFactory.create(), NAMESPACE);
assertThat(secretResponse).isSameAs(secret);
}
@@ -165,7 +165,7 @@ class UserSecretServiceTest {
when(secretResource.get()).thenReturn(null);
doReturn(secret).when(userSecretService).create(any(OzgCloudKeycloakUserSpec.class), eq(NAMESPACE));
- Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
+ Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgCloudKeycloakUserSpecTestFactory.create(), NAMESPACE);
assertThat(secretResponse).isSameAs(secret);
}
--
GitLab