refactor: rename ResourceConfigurationTest -> InformerConfigurationTest

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java

@@ -241,6 +241,8 @@ public InformerConfiguration<R> buildForController() {
           || inheritsNamespacesFromController(namespaces)) {
         namespaces = Constants.DEFAULT_NAMESPACES_SET;
       }
+      // to avoid potential NPE
+      followControllerNamespacesOnChange = false;
       return InformerConfiguration.this;
     }
 

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

@@ -77,12 +77,11 @@ void overridingNSShouldPreserveUntouchedDependents() {
     assertEquals(stringConfig, resourceConfig);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"rawtypes"})
   private KubernetesDependentResourceConfig extractFirstDependentKubernetesResourceConfig(
       io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> configuration) {
-    var conf = (KubernetesDependentResourceConfig) extractDependentKubernetesResourceConfig(
+    return (KubernetesDependentResourceConfig) extractDependentKubernetesResourceConfig(
         configuration, 0);
-    return conf;
   }
 
   private io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> createConfiguration(
@@ -219,7 +218,6 @@ void shouldBePossibleToForceDependentToWatchAllNamespaces() {
   }
 
   @Test
-  @SuppressWarnings("unchecked")
   void overridingNamespacesShouldBePropagatedToDependentsWithDefaultConfig() {
     var configuration = createConfiguration(new OneDepReconciler());
     // retrieve the config for the first (and unique) dependent

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ResourceConfigurationTest.java renamed to operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/InformerConfigurationTest.java

@@ -3,19 +3,14 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class ResourceConfigurationTest {
-
-  public static final ResourceConfiguration<HasMetadata> DEFAULT =
-      () -> InformerConfiguration.builder().buildForInformerEventSource();
+class InformerConfigurationTest {
 
   @Test
   void allNamespacesWatched() {
@@ -51,14 +46,20 @@ void currentNamespaceWatched() {
 
   @Test
   void nullLabelSelectorByDefault() {
-    assertNull(DEFAULT.getInformerConfig().getLabelSelector());
+    final var informerConfig = InformerConfiguration.builder().buildForInformerEventSource();
+    assertNull(informerConfig.getLabelSelector());
+  }
+
+  @Test
+  void shouldWatchAllNamespacesByDefaultForControllers() {
+    final var informerConfig = InformerConfiguration.builder().buildForController();
+    assertTrue(informerConfig.watchAllNamespaces());
   }
 
-  // todo: fix me
-  @Disabled
   @Test
-  void shouldWatchAllNamespacesByDefault() {
-    assertTrue(DEFAULT.getInformerConfig().watchAllNamespaces());
+  void shouldFollowControllerNamespacesByDefaultForInformerEventSource() {
+    final var informerConfig = InformerConfiguration.builder().buildForInformerEventSource();
+    assertTrue(informerConfig.isFollowControllerNamespacesOnChange());
   }
 
   @Test