Skip to content

Commit 773213c

Browse files
committed
fix: non-independent unit tests because static state
1 parent 1287756 commit 773213c

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ public static void registerConverter(Class<? extends DependentResource> dependen
147147
knownConverters.put(converterClass, converter);
148148
}
149149

150+
/** To support independent unit tests */
151+
public static void clear() {
152+
converters.clear();
153+
knownConverters.clear();
154+
}
155+
150156
private static class ConfiguredClassPair {
151157
private final Configured configured;
152158
private final Class<? extends DependentResource> annotatedClass;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.Optional;
44
import java.util.Set;
55

6+
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;
78

89
import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -30,6 +31,12 @@
3031
class ControllerConfigurationOverriderTest {
3132
private final BaseConfigurationService configurationService = new BaseConfigurationService();
3233

34+
35+
@BeforeEach
36+
void clearState() {
37+
DependentResourceConfigurationResolver.clear();
38+
}
39+
3340
@Test
3441
void overridingNSShouldPreserveUntouchedDependents() {
3542
var configuration = createConfiguration(new NamedDependentReconciler());

0 commit comments

Comments
 (0)