controller unit test

Author: csviri

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

@@ -44,10 +44,10 @@ public ControllerResourceEventSource(Controller<T> controller) {
 
     // by default the on add should be processed in all cases regarding internal filters
     controller.getConfiguration().onAddFilter().ifPresent(this::setOnAddFilter);
-
     controller.getConfiguration().onUpdateFilter()
         .ifPresentOrElse(filter -> setOnUpdateFilter(filter.and(internalOnUpdateFilter)),
             () -> setOnUpdateFilter(internalOnUpdateFilter));
+    controller.getConfiguration().genericFilter().ifPresent(this::setGenericFilter);
   }
 
   @Override

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

@@ -115,7 +115,8 @@ void filtersOutEventsOnAddAndUpdate() {
     Predicate<TestCustomResource> onAddPredicate = (res) -> false;
     BiPredicate<TestCustomResource, TestCustomResource> onUpdatePredicate = (res, res2) -> false;
     source =
-        new ControllerResourceEventSource<>(new TestController(onAddPredicate, onUpdatePredicate));
+        new ControllerResourceEventSource<>(
+            new TestController(onAddPredicate, onUpdatePredicate, null));
     setUpSource(source);
 
     source.eventReceived(ResourceAction.ADDED, cr, null);
@@ -124,20 +125,36 @@ void filtersOutEventsOnAddAndUpdate() {
     verify(eventHandler, never()).handleEvent(any());
   }
 
+  @Test
+  void genericFilterFiltersOutAddUpdateAndDeleteEvents() {
+    TestCustomResource cr = TestUtils.testCustomResource();
+
+    source =
+        new ControllerResourceEventSource<>(new TestController(null, null, res -> false));
+    setUpSource(source);
+
+    source.eventReceived(ResourceAction.ADDED, cr, null);
+    source.eventReceived(ResourceAction.UPDATED, cr, cr);
+    source.eventReceived(ResourceAction.DELETED, cr, cr);
+
+    verify(eventHandler, never()).handleEvent(any());
+  }
+
   @SuppressWarnings("unchecked")
   private static class TestController extends Controller<TestCustomResource> {
 
     private final EventSourceManager<TestCustomResource> eventSourceManager =
         mock(EventSourceManager.class);
 
     public TestController(Predicate<TestCustomResource> onAddFilter,
-        BiPredicate<TestCustomResource, TestCustomResource> onUpdateFilter) {
-      super(null, new TestConfiguration(true, onAddFilter, onUpdateFilter),
+        BiPredicate<TestCustomResource, TestCustomResource> onUpdateFilter,
+        Predicate<TestCustomResource> genericFilter) {
+      super(null, new TestConfiguration(true, onAddFilter, onUpdateFilter, genericFilter),
           MockKubernetesClient.client(TestCustomResource.class));
     }
 
     public TestController(boolean generationAware) {
-      super(null, new TestConfiguration(generationAware, null, null),
+      super(null, new TestConfiguration(generationAware, null, null, null),
           MockKubernetesClient.client(TestCustomResource.class));
     }
 
@@ -156,7 +173,8 @@ private static class TestConfiguration extends
       DefaultControllerConfiguration<TestCustomResource> {
 
     public TestConfiguration(boolean generationAware, Predicate<TestCustomResource> onAddFilter,
-        BiPredicate<TestCustomResource, TestCustomResource> onUpdateFilter) {
+        BiPredicate<TestCustomResource, TestCustomResource> onUpdateFilter,
+        Predicate<TestCustomResource> genericFilter) {
       super(
           null,
           null,
@@ -169,7 +187,7 @@ public TestConfiguration(boolean generationAware, Predicate<TestCustomResource>
           null,
           TestCustomResource.class,
           null,
-          onAddFilter, onUpdateFilter, null, null);
+          onAddFilter, onUpdateFilter, genericFilter, null);
     }
   }
 }