tests

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java

@@ -64,10 +64,10 @@ public Controller(Reconciler<P> reconciler,
     this.metrics = Optional.ofNullable(ConfigurationServiceProvider.instance().getMetrics())
         .orElse(Metrics.NOOP);
     contextInitializer = reconciler instanceof ContextInitializer;
-    eventSourceManager = new EventSourceManager<>(this);
     isCleaner = reconciler instanceof Cleaner;
     managedWorkflow =
         ManagedWorkflow.workflowFor(kubernetesClient, configuration.getDependentResources());
+    eventSourceManager = new EventSourceManager<>(this);
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java

@@ -36,9 +36,11 @@ public ControllerResourceEventSource(Controller<T> controller) {
     super(controller.getCRClient(), controller.getConfiguration());
     this.controller = controller;
 
-    BiPredicate<T, T> internalOnUpdateFilter = onUpdateFinalizerNeededAndApplied(controller)
-        .or(onUpdateGenerationAware(controller.getConfiguration().isGenerationAware()))
-        .or(onUpdateMarkedForDeletion());
+    BiPredicate<T, T> internalOnUpdateFilter =
+        (BiPredicate<T, T>) onUpdateFinalizerNeededAndApplied(controller.useFinalizer(),
+            controller.getConfiguration().getFinalizerName())
+            .or(onUpdateGenerationAware(controller.getConfiguration().isGenerationAware()))
+            .or(onUpdateMarkedForDeletion());
 
     legacyFilters = controller.getConfiguration().getEventFilter();
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFilters.java

@@ -3,11 +3,10 @@
 import java.util.function.BiPredicate;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.Controller;
 
 public class InternalEventFilters {
 
-  // todo unit tests
+  private InternalEventFilters() {}
 
   static <T extends HasMetadata> BiPredicate<T, T> onUpdateMarkedForDeletion() {
     return (newResource, oldResource) -> newResource.isMarkedForDeletion();
@@ -26,12 +25,12 @@ static <T extends HasMetadata> BiPredicate<T, T> onUpdateGenerationAware(
   }
 
   static <T extends HasMetadata> BiPredicate<T, T> onUpdateFinalizerNeededAndApplied(
-      Controller<T> controller) {
+      boolean useFinalizer,
+      String finalizerName) {
     return (newResource, oldResource) -> {
-      if (controller.useFinalizer()) {
-        final var finalizer = controller.getConfiguration().getFinalizerName();
-        boolean oldFinalizer = oldResource.hasFinalizer(finalizer);
-        boolean newFinalizer = newResource.hasFinalizer(finalizer);
+      if (useFinalizer) {
+        boolean oldFinalizer = oldResource.hasFinalizer(finalizerName);
+        boolean newFinalizer = newResource.hasFinalizer(finalizerName);
         // accepts event if old did not have finalizer, since it was just added, so the event needs
         // to
         // be published.
@@ -41,5 +40,4 @@ static <T extends HasMetadata> BiPredicate<T, T> onUpdateFinalizerNeededAndAppli
       }
     };
   }
-
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/TestUtils.java

@@ -49,8 +49,9 @@ public static TestCustomResource testCustomResource(ResourceID id) {
     return resource;
   }
 
-  public static void markForDeletion(HasMetadata customResource) {
+  public static <T extends HasMetadata> T markForDeletion(T customResource) {
     customResource.getMetadata().setDeletionTimestamp("2019-8-10");
+    return customResource;
   }
 
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/InternalEventFiltersTest.java

@@ -0,0 +1,60 @@
+package io.javaoperatorsdk.operator.processing.event.source.controller;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.javaoperatorsdk.operator.TestUtils;
+
+import static io.javaoperatorsdk.operator.TestUtils.markForDeletion;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+class InternalEventFiltersTest {
+
+  public static final String FINALIZER = "finalizer";
+
+  @Test
+  void onUpdateMarkedForDeletion() {
+    var res = markForDeletion(TestUtils.testCustomResource());
+    assertThat(InternalEventFilters.onUpdateMarkedForDeletion().test(res, res)).isTrue();
+  }
+
+  @Test
+  void generationAware() {
+    var res = TestUtils.testCustomResource1();
+    var res2 = TestUtils.testCustomResource1();
+    res2.getMetadata().setGeneration(2L);
+
+    assertThat(InternalEventFilters.onUpdateGenerationAware(true).test(res2, res)).isTrue();
+    assertThat(InternalEventFilters.onUpdateGenerationAware(true).test(res, res)).isFalse();
+    assertThat(InternalEventFilters.onUpdateGenerationAware(false).test(res, res)).isTrue();
+  }
+
+  @Test
+  void finalizerCheckedIfConfigured() {
+    assertThat(InternalEventFilters.onUpdateFinalizerNeededAndApplied(true, FINALIZER)
+        .test(TestUtils.testCustomResource1(), TestUtils.testCustomResource1())).isTrue();
+
+    var res = TestUtils.testCustomResource1();
+    res.getMetadata().setFinalizers(List.of(FINALIZER));
+
+    assertThat(InternalEventFilters.onUpdateFinalizerNeededAndApplied(true, FINALIZER)
+        .test(res, res)).isFalse();
+  }
+
+  @Test
+  void acceptsIfFinalizerWasJustAdded() {
+    var res = TestUtils.testCustomResource1();
+    res.getMetadata().setFinalizers(List.of(FINALIZER));
+
+    assertThat(InternalEventFilters.onUpdateFinalizerNeededAndApplied(true, "finalizer")
+        .test(res, TestUtils.testCustomResource1())).isTrue();
+  }
+
+  @Test
+  void dontAcceptIfFinalizerNotUsed() {
+    assertThat(InternalEventFilters.onUpdateFinalizerNeededAndApplied(false, FINALIZER)
+        .test(TestUtils.testCustomResource1(), TestUtils.testCustomResource1())).isFalse();
+  }
+}