additional unit tests

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ReconcileUtils.java

@@ -467,7 +467,13 @@ public static <P extends HasMetadata> P removeFinalizer(
           r.removeFinalizer(finalizerName);
           return r;
         },
-        r -> r != null && r.hasFinalizer(finalizerName));
+        r -> {
+          if (r == null) {
+            log.warn("Cannot remove finalizer since resource not exists.");
+            return false;
+          }
+          return r.hasFinalizer(finalizerName);
+        });
   }
 
   /**

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/ReconcileUtilsTest.java

@@ -183,6 +183,88 @@ private HasMetadata createResourceWithVersion(String resourceVersion) {
         .build();
   }
 
+  @Test
+  void addsFinalizer() {
+    var resource = TestUtils.testCustomResource1();
+    resource.getMetadata().setResourceVersion("1");
+
+    when(context.getPrimaryResource()).thenReturn(resource);
+
+    // Mock successful finalizer addition
+    when(controllerEventSource.eventFilteringUpdateAndCacheResource(
+            any(), any(UnaryOperator.class)))
+        .thenAnswer(
+            invocation -> {
+              var res = TestUtils.testCustomResource1();
+              res.getMetadata().setResourceVersion("2");
+              res.addFinalizer(FINALIZER_NAME);
+              return res;
+            });
+
+    var result = ReconcileUtils.addFinalizer(context, FINALIZER_NAME);
+
+    assertThat(result).isNotNull();
+    assertThat(result.hasFinalizer(FINALIZER_NAME)).isTrue();
+    assertThat(result.getMetadata().getResourceVersion()).isEqualTo("2");
+    verify(controllerEventSource, times(1))
+        .eventFilteringUpdateAndCacheResource(any(), any(UnaryOperator.class));
+  }
+
+  @Test
+  void addsFinalizerWithSSA() {
+    var resource = TestUtils.testCustomResource1();
+    resource.getMetadata().setResourceVersion("1");
+
+    when(context.getPrimaryResource()).thenReturn(resource);
+
+    // Mock successful SSA finalizer addition
+    when(controllerEventSource.eventFilteringUpdateAndCacheResource(
+            any(), any(UnaryOperator.class)))
+        .thenAnswer(
+            invocation -> {
+              var res = TestUtils.testCustomResource1();
+              res.getMetadata().setResourceVersion("2");
+              res.addFinalizer(FINALIZER_NAME);
+              return res;
+            });
+
+    var result = ReconcileUtils.addFinalizerWithSSA(context, FINALIZER_NAME);
+
+    assertThat(result).isNotNull();
+    assertThat(result.hasFinalizer(FINALIZER_NAME)).isTrue();
+    assertThat(result.getMetadata().getResourceVersion()).isEqualTo("2");
+    verify(controllerEventSource, times(1))
+        .eventFilteringUpdateAndCacheResource(any(), any(UnaryOperator.class));
+  }
+
+  @Test
+  void removesFinalizer() {
+    var resource = TestUtils.testCustomResource1();
+    resource.getMetadata().setResourceVersion("1");
+    resource.addFinalizer(FINALIZER_NAME);
+
+    when(context.getPrimaryResource()).thenReturn(resource);
+
+    // Mock successful finalizer removal
+    when(controllerEventSource.eventFilteringUpdateAndCacheResource(
+            any(), any(UnaryOperator.class)))
+        .thenAnswer(
+            invocation -> {
+              var res = TestUtils.testCustomResource1();
+              res.getMetadata().setResourceVersion("2");
+              // finalizer is removed, so don't add it
+              return res;
+            });
+
+    var result = ReconcileUtils.removeFinalizer(context, FINALIZER_NAME);
+
+    assertThat(result).isNotNull();
+    assertThat(result.hasFinalizer(FINALIZER_NAME)).isFalse();
+    assertThat(result.getMetadata().getResourceVersion()).isEqualTo("2");
+    verify(controllerEventSource, times(1))
+        .eventFilteringUpdateAndCacheResource(any(), any(UnaryOperator.class));
+  }
+
   @Test
   void retriesAddingFinalizerWithoutSSA() {
     var resource = TestUtils.testCustomResource1();