fix test

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAIT.java

@@ -17,38 +17,64 @@
 
 class PatchResourceAndStatusNoSSAIT {
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false))
           .withReconciler(PatchResourceAndStatusNoSSAReconciler.class)
           .build();
 
   @Test
   void updatesSubResourceStatus() {
+    extension
+        .getReconcilerOfType(PatchResourceAndStatusNoSSAReconciler.class)
+        .setRemoveAnnotation(false);
     PatchResourceAndStatusNoSSACustomResource resource = createTestCustomResource("1");
-    operator.create(resource);
+    extension.create(resource);
 
     awaitStatusUpdated(resource.getMetadata().getName());
     // wait for sure, there are no more events
     TestUtils.waitXms(300);
 
     PatchResourceAndStatusNoSSACustomResource customResource =
-        operator.get(
+        extension.get(
             PatchResourceAndStatusNoSSACustomResource.class, resource.getMetadata().getName());
 
-    assertThat(TestUtils.getNumberOfExecutions(operator)).isEqualTo(1);
+    assertThat(TestUtils.getNumberOfExecutions(extension)).isEqualTo(1);
     assertThat(customResource.getStatus().getState())
         .isEqualTo(PatchResourceAndStatusNoSSAStatus.State.SUCCESS);
     assertThat(customResource.getMetadata().getAnnotations().get(TEST_ANNOTATION)).isNotNull();
   }
 
+  @Test
+  void removeAnnotationCorrectlyUpdatesStatus() {
+    extension
+        .getReconcilerOfType(PatchResourceAndStatusNoSSAReconciler.class)
+        .setRemoveAnnotation(true);
+    PatchResourceAndStatusNoSSACustomResource resource = createTestCustomResource("1");
+    resource.getMetadata().setAnnotations(Map.of(TEST_ANNOTATION, TEST_ANNOTATION_VALUE));
+    extension.create(resource);
+
+    awaitStatusUpdated(resource.getMetadata().getName());
+    // wait for sure, there are no more events
+    TestUtils.waitXms(300);
+
+    PatchResourceAndStatusNoSSACustomResource customResource =
+        extension.get(
+            PatchResourceAndStatusNoSSACustomResource.class, resource.getMetadata().getName());
+
+    assertThat(TestUtils.getNumberOfExecutions(extension)).isEqualTo(1);
+    assertThat(customResource.getStatus().getState())
+        .isEqualTo(PatchResourceAndStatusNoSSAStatus.State.SUCCESS);
+    assertThat(customResource.getMetadata().getAnnotations().get(TEST_ANNOTATION)).isNull();
+  }
+
   void awaitStatusUpdated(String name) {
     await("cr status updated")
         .atMost(5, TimeUnit.SECONDS)
         .untilAsserted(
             () -> {
               PatchResourceAndStatusNoSSACustomResource cr =
-                  operator.get(PatchResourceAndStatusNoSSACustomResource.class, name);
+                  extension.get(PatchResourceAndStatusNoSSACustomResource.class, name);
               assertThat(cr).isNotNull();
               assertThat(cr.getStatus()).isNotNull();
               assertThat(cr.getStatus().getState())
@@ -60,7 +86,6 @@ public PatchResourceAndStatusNoSSACustomResource createTestCustomResource(String
     PatchResourceAndStatusNoSSACustomResource resource =
         new PatchResourceAndStatusNoSSACustomResource();
     resource.setMetadata(new ObjectMetaBuilder().withName("doubleupdateresource-" + id).build());
-    resource.getMetadata().setAnnotations(Map.of(TEST_ANNOTATION, TEST_ANNOTATION_VALUE));
     resource.setSpec(new PatchResourceAndStatusNoSSASpec());
     resource.getSpec().setValue(id);
     return resource;

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAReconciler.java

@@ -1,5 +1,6 @@
 package io.javaoperatorsdk.operator.baseapi.patchresourceandstatusnossa;
 
+import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.slf4j.Logger;
@@ -21,6 +22,8 @@ public class PatchResourceAndStatusNoSSAReconciler
   public static final String TEST_ANNOTATION_VALUE = "TestAnnotationValue";
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
+  private volatile boolean removeAnnotation = false;
+
   @Override
   public UpdateControl<PatchResourceAndStatusNoSSACustomResource> reconcile(
       PatchResourceAndStatusNoSSACustomResource resource,
@@ -29,7 +32,12 @@ public UpdateControl<PatchResourceAndStatusNoSSACustomResource> reconcile(
 
     log.info("Value: " + resource.getSpec().getValue());
 
-    resource.getMetadata().getAnnotations().remove(TEST_ANNOTATION);
+    if (removeAnnotation) {
+      resource.getMetadata().getAnnotations().remove(TEST_ANNOTATION);
+    } else {
+      resource.getMetadata().setAnnotations(new HashMap<>());
+      resource.getMetadata().getAnnotations().put(TEST_ANNOTATION, TEST_ANNOTATION_VALUE);
+    }
     ensureStatusExists(resource);
     resource.getStatus().setState(PatchResourceAndStatusNoSSAStatus.State.SUCCESS);
 
@@ -47,4 +55,8 @@ private void ensureStatusExists(PatchResourceAndStatusNoSSACustomResource resour
   public int getNumberOfExecutions() {
     return numberOfExecutions.get();
   }
+
+  public void setRemoveAnnotation(boolean removeAnnotation) {
+    this.removeAnnotation = removeAnnotation;
+  }
 }