From 3285fa6ff7329af6d0ac36dfa35b210f38b95f11 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 4 Jan 2024 13:15:39 +0100 Subject: [PATCH] OZG-4453 fix test --- .../de/ozgcloud/operator/ElasticsearchReconciler.java | 1 - .../operator/ElasticsearchReconcilerTest.java | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java index af58241..4874388 100644 --- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java +++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java @@ -1,6 +1,5 @@ package de.ozgcloud.operator; -import java.util.Base64; import java.util.logging.Level; import org.apache.commons.collections.MapUtils; diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java index 5c708e5..d75e012 100644 --- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java +++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchReconcilerTest.java @@ -4,9 +4,6 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import java.util.Base64; -import java.util.Map; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -15,12 +12,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import com.thedeanda.lorem.LoremIpsum; - import de.ozgcloud.operator.common.kubernetes.NamespaceTestFactory; import de.ozgcloud.operator.common.kubernetes.SecretTestFactory; import io.fabric8.kubernetes.api.model.Secret; -import io.fabric8.kubernetes.api.model.SecretBuilder; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; import lombok.SneakyThrows; @@ -42,8 +36,7 @@ class ElasticsearchReconcilerTest { private final OzgCloudElasticsearchCustomResource resource = ElasticsearchCustomResourceTestFactory.create(); - private final static String PASSWORD = new String(Base64.getEncoder().encode("dummyPassword".getBytes())); - private final static String DECODED_PASSWORD = new String(Base64.getDecoder().decode(PASSWORD)); + private final static String PASSWORD = "dummyPassword"; private final Secret secret = SecretTestFactory.createBuilder().addToData(OzgCloudElasticsearchSecretHelper.CREDENTIAL_SECRET_PASSWORD_FIELD, PASSWORD).build(); @DisplayName("process flow") @@ -83,7 +76,7 @@ class ElasticsearchReconcilerTest { void shouldCallCreateSecurityUserIfMissing() { reconcile(); - verify(service).createSecurityUserIfMissing(NamespaceTestFactory.NAMESPACE, DECODED_PASSWORD); + verify(service).createSecurityUserIfMissing(NamespaceTestFactory.NAMESPACE, PASSWORD); } @SneakyThrows -- GitLab