diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java index 14d7daf22670bfa26ba362f4749a36c70e974f75..40cf850be49713dd656ff2d04a69c7d58be4c9ed 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java @@ -43,7 +43,7 @@ class KeycloakRealmService { private final KeycloakGenericRemoteService keycloakGenericRemoteService; - void createRealm(OzgCloudKeycloakRealmSpec realm, String realmName) { + void createRealm(OzgCloudKeycloakRealmSpec realm, String realmName) { Optional.of(realm) .map(mapper::map) .map(realmRepresentation -> addRealmName(realmRepresentation, realmName)) @@ -69,7 +69,6 @@ class KeycloakRealmService { } - // addOrUpdateRealmRoles(spec, existingRealm.getRealm()); } RealmRepresentation addRealmName(RealmRepresentation realm, String realmName) { diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java index f267eb445be95bf647917c9b9762bd3cd15697c7..53e1ceb43786d4d931dbf1e1f011e527c2d7990b 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java @@ -73,8 +73,6 @@ class KeycloakRealmReconcilerTest { assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK); } - - } @DisplayName("Reconciler Cleanup") diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteServiceTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteServiceTest.java index a8d6cbaeaed8cc71f1f8af633146df2a673c345d..3c0bc0491639216714a5515e6677f2a87ea7cb0e 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteServiceTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmRemoteServiceTest.java @@ -77,7 +77,6 @@ class KeycloakRealmRemoteServiceTest { void shouldDeleteRealm() { when(keycloak.realm(REALM_NAME)).thenReturn(realmResource); - remoteService.deleteRealm(REALM_NAME); verify(realmResource).remove(); diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java index c0f0f3ca66d019a0d4263de9cb163516c269c699..278a8b27e4b86c3249cfe2291be6504b08947eac 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java @@ -32,22 +32,17 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService; -import de.ozgcloud.operator.keycloak.client.ClientRepresentationTestFactory; -import de.ozgcloud.operator.keycloak.client.OzgCloudKeycloakClientSpecTestFactory; - class KeycloakRealmServiceTest { private static final OzgCloudKeycloakRealmSpec REALM = OzgCloudKeycloakRealmSpecTestFactory.create(); private static final String REALM_NAME = "TestRealmName"; - private static final String TEST_NAMESPACE = "TestNamespace"; @Spy @InjectMocks @@ -65,15 +60,12 @@ class KeycloakRealmServiceTest { @Mock private KeycloakGenericRemoteService keycloakGenericRemoteService; - - - @Nested class TestCreanOrUpdateRealm { @Test void shouldCallCreateRealmMethodIfNotExists() { - + when(keycloakGenericRemoteService.getRealmRepresentation(REALM_NAME)).thenReturn(Optional.empty()); service.createOrUpdateRealm(REALM, REALM_NAME); @@ -92,7 +84,6 @@ class KeycloakRealmServiceTest { } } - @DisplayName("Update Realm") @Nested class TestUpdateRealm { @@ -118,8 +109,7 @@ class KeycloakRealmServiceTest { } } - - + @Nested class TestCreateRealm {