From c45a74c1d6d55347edd878575d2fc698664bdb64 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 20 Dec 2022 15:05:07 +0100 Subject: [PATCH 1/2] fix: non-independent unit tests because static state --- .../dependent/DependentResourceConfigurationResolver.java | 6 ++++++ .../api/config/ControllerConfigurationOverriderTest.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java index 9a143fc57c..ebe8b2ad0e 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java @@ -147,6 +147,12 @@ public static void registerConverter(Class dependen knownConverters.put(converterClass, converter); } + /** To support independent unit tests */ + public static void clear() { + converters.clear(); + knownConverters.clear(); + } + private static class ConfiguredClassPair { private final Configured configured; private final Class annotatedClass; diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java index 98c071e942..57abbc05fb 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java @@ -3,6 +3,7 @@ import java.util.Optional; import java.util.Set; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -30,6 +31,12 @@ class ControllerConfigurationOverriderTest { private final BaseConfigurationService configurationService = new BaseConfigurationService(); + + @BeforeEach + void clearState() { + DependentResourceConfigurationResolver.clear(); + } + @Test void overridingNSShouldPreserveUntouchedDependents() { var configuration = createConfiguration(new NamedDependentReconciler()); From f120a6d6aeae58178ea502e26ad99c7729761666 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 20 Dec 2022 15:07:56 +0100 Subject: [PATCH 2/2] naming --- .../api/config/ControllerConfigurationOverriderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java index 57abbc05fb..7626d8bfd0 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java @@ -33,7 +33,7 @@ class ControllerConfigurationOverriderTest { @BeforeEach - void clearState() { + void clearStaticState() { DependentResourceConfigurationResolver.clear(); }