fix: non-independent unit tests because static state (#1670)

operator-framework · Dec 21, 2022 · 53a553e · 53a553e
1 parent f2feb4d
commit 53a553e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java b/...javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java
@@ -147,6 +147,12 @@ public static void registerConverter(Class<? extends DependentResource> 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<? extends DependentResource> annotatedClass;

diff --git a/...est/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java b/...est/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 clearStaticState() {
+    DependentResourceConfigurationResolver.clear();
+  }
+
   @Test
   void overridingNSShouldPreserveUntouchedDependents() {
     var configuration = createConfiguration(new NamedDependentReconciler());