Add /finalizer to the tests

Author: Soroosh Sarabadani

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

@@ -21,7 +21,6 @@
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class ControllerExecutionIT {
 
-    private final static Logger log = LoggerFactory.getLogger(ControllerExecutionIT.class);
     public static final String TEST_CUSTOM_RESOURCE_NAME = "test-custom-resource";
     private IntegrationTestSupport integrationTestSupport = new IntegrationTestSupport();
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java

@@ -14,11 +14,11 @@
 
 class ControllerUtilsTest {
 
-    public static final String CUSTOM_FINALIZER_NAME = "a.customer.finalizer";
+    public static final String CUSTOM_FINALIZER_NAME = "a.custom/finalizer";
 
     @Test
     public void returnsValuesFromControllerAnnotationFinalizer() {
-        Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getFinalizer(new TestCustomResourceController(null)));
+        Assertions.assertEquals(TestCustomResourceController.CRD_NAME + "/finalizer", ControllerUtils.getFinalizer(new TestCustomResourceController(null)));
         assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController(null)));
         Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null)));
         assertFalse(ControllerUtils.getGenerationEventProcessing(new TestCustomResourceController(null)));

operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

@@ -104,7 +104,7 @@ public SubResourceTestCustomResource createTestCustomResource(String id) {
         resource.setMetadata(new ObjectMetaBuilder()
                 .withName("subresource-" + id)
                 .withNamespace(TEST_NAMESPACE)
-                .withFinalizers(SubResourceTestCustomResourceController.CRD_NAME)
+                .withFinalizers(SubResourceTestCustomResourceController.FINALIZER_NAME)
                 .build());
         resource.setKind("SubresourceSample");
         resource.setSpec(new SubResourceTestCustomResourceSpec());

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java

@@ -25,6 +25,7 @@ public class TestCustomResourceController implements ResourceController<TestCust
     private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);
 
     public static final String CRD_NAME = "customservices.sample.javaoperatorsdk";
+    public static final String FINALIZER_NAME = CRD_NAME + "/finalizer";
 
     private final KubernetesClient kubernetesClient;
     private final boolean updateStatus;
@@ -55,7 +56,7 @@ public boolean deleteResource(TestCustomResource resource, Context<TestCustomRes
     public UpdateControl<TestCustomResource> createOrUpdateResource(TestCustomResource resource,
                                                                     Context<TestCustomResource> context) {
         numberOfExecutions.addAndGet(1);
-        if (!resource.getMetadata().getFinalizers().contains(CRD_NAME)) {
+        if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
             throw new IllegalStateException("Finalizer is not present.");
         }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java

@@ -18,6 +18,7 @@ public class SubResourceTestCustomResourceController implements ResourceControll
         TestExecutionInfoProvider {
 
     public static final String CRD_NAME = "subresourcesample.sample.javaoperatorsdk";
+    public static final String FINALIZER_NAME = CRD_NAME + "/finalizer";
     private static final Logger log = LoggerFactory.getLogger(SubResourceTestCustomResourceController.class);
     private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
@@ -30,7 +31,7 @@ public boolean deleteResource(SubResourceTestCustomResource resource, Context<Su
     public UpdateControl<SubResourceTestCustomResource> createOrUpdateResource(SubResourceTestCustomResource resource,
                                                                                Context<SubResourceTestCustomResource> context) {
         numberOfExecutions.addAndGet(1);
-        if (!resource.getMetadata().getFinalizers().contains(CRD_NAME)) {
+        if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
             throw new IllegalStateException("Finalizer is not present.");
         }
         log.info("Value: " + resource.getSpec().getValue());