test

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

Author: csviri

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

@@ -1,8 +1,11 @@
 package io.javaoperatorsdk.operator.api.reconciler;
 
+import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubeapitest.junit.EnableKubeAPIServer;
+import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -19,27 +22,55 @@ class PrimaryUpdateAndCacheUtilsIntegrationTest {
 
   @Test
   void testFinalizerAddAndRemoval() {
-    var cm =
-        client
-            .resource(
-                new ConfigMapBuilder()
-                    .withMetadata(
-                        new ObjectMetaBuilder()
-                            .withName(TEST_RESOURCE_NAME)
-                            .withNamespace(DEFAULT_NS)
-                            .build())
-                    .build())
-            .create();
-
+    var cm = createConfigMap();
     PrimaryUpdateAndCacheUtils.addFinalizer(client, cm, FINALIZER);
 
-    cm = client.configMaps().inNamespace(DEFAULT_NS).withName(TEST_RESOURCE_NAME).get();
+    cm = getTestConfigMap();
     assertThat(cm.getMetadata().getFinalizers()).containsExactly(FINALIZER);
 
     PrimaryUpdateAndCacheUtils.removeFinalizer(client, cm, FINALIZER);
 
-    cm = client.configMaps().inNamespace(DEFAULT_NS).withName(TEST_RESOURCE_NAME).get();
+    cm = getTestConfigMap();
     assertThat(cm.getMetadata().getFinalizers()).isEmpty();
     client.resource(cm).delete();
   }
+
+  private static ConfigMap getTestConfigMap() {
+    return client.configMaps().inNamespace(DEFAULT_NS).withName(TEST_RESOURCE_NAME).get();
+  }
+
+  @Test
+  void testFinalizerAddRetryOnOptimisticLockFailure() {
+    var cm = createConfigMap();
+    // update resource, so it has a new version on the server
+    cm.setData(Map.of("k", "v"));
+    client.resource(cm).update();
+
+    PrimaryUpdateAndCacheUtils.addFinalizer(client, cm, FINALIZER);
+
+    cm = getTestConfigMap();
+    assertThat(cm.getMetadata().getFinalizers()).containsExactly(FINALIZER);
+
+    cm.setData(Map.of("k2", "v2"));
+    client.resource(cm).update();
+
+    PrimaryUpdateAndCacheUtils.removeFinalizer(client, cm, FINALIZER);
+    cm = getTestConfigMap();
+    assertThat(cm.getMetadata().getFinalizers()).isEmpty();
+
+    client.resource(cm).delete();
+  }
+
+  private static ConfigMap createConfigMap() {
+    return client
+        .resource(
+            new ConfigMapBuilder()
+                .withMetadata(
+                    new ObjectMetaBuilder()
+                        .withName(TEST_RESOURCE_NAME)
+                        .withNamespace(DEFAULT_NS)
+                        .build())
+                .build())
+        .create();
+  }
 }