inetgration tests

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

Author: csviri

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

@@ -1,46 +1,36 @@
 package io.javaoperatorsdk.operator;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentManagedCustomResource;
 import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentManagedReconciler;
-import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentManagedSpec;
-import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.ConfigMapGenericKubernetesDependent;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentSpec;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-
-public class GenericKubernetesDependentManagedIT {
+public class GenericKubernetesDependentManagedIT
+    extends GenericKubernetesDependentTestBase<GenericKubernetesDependentManagedCustomResource> {
 
   public static final String INITIAL_DATA = "Initial data";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new GenericKubernetesDependentManagedReconciler())
           .build();
 
-  @Test
-  void testReconcile() {
-    operator.create(testResource());
-
-    await().untilAsserted(() -> {
-      var cm = operator.get(ConfigMap.class, "test1");
-      assertThat(cm).isNotNull();
-      assertThat(cm.getData()).containsEntry(ConfigMapGenericKubernetesDependent.KEY, INITIAL_DATA);
-    });
+  @Override
+  public LocallyRunOperatorExtension extension() {
+    return extension;
   }
 
-  GenericKubernetesDependentManagedCustomResource testResource() {
+  @Override
+  GenericKubernetesDependentManagedCustomResource testResource(String name, String data) {
     var resource = new GenericKubernetesDependentManagedCustomResource();
     resource.setMetadata(new ObjectMetaBuilder()
-        .withName("test1")
+        .withName(name)
         .build());
-    resource.setSpec(new GenericKubernetesDependentManagedSpec());
+    resource.setSpec(new GenericKubernetesDependentSpec());
     resource.getSpec().setValue(INITIAL_DATA);
     return resource;
   }

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

@@ -1,80 +1,35 @@
 package io.javaoperatorsdk.operator;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
-import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
-import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.ConfigMapGenericKubernetesDependent;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentSpec;
 import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.GenericKubernetesDependentStandaloneCustomResource;
 import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.GenericKubernetesDependentStandaloneReconciler;
-import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.GenericKubernetesDependentStandaloneSpec;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-
-public class GenericKubernetesDependentStandaloneIT {
-
-  public static final String INITIAL_DATA = "Initial data";
+public class GenericKubernetesDependentStandaloneIT
+    extends GenericKubernetesDependentTestBase<GenericKubernetesDependentStandaloneCustomResource> {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new GenericKubernetesDependentStandaloneReconciler())
           .build();
 
-  @Test
-  void testReconcile() {
-    operator.create(testResource());
-
-    await().untilAsserted(() -> {
-      var cm = operator.get(ConfigMap.class, "test1");
-      assertThat(cm).isNotNull();
-      assertThat(cm.getData()).containsEntry(ConfigMapGenericKubernetesDependent.KEY, INITIAL_DATA);
-    });
+  @Override
+  public LocallyRunOperatorExtension extension() {
+    return extension;
   }
 
-  GenericKubernetesDependentStandaloneCustomResource testResource() {
+  @Override
+  GenericKubernetesDependentStandaloneCustomResource testResource(String name, String data) {
     var resource = new GenericKubernetesDependentStandaloneCustomResource();
     resource.setMetadata(new ObjectMetaBuilder()
-        .withName("test1")
+        .withName(name)
         .build());
-    resource.setSpec(new GenericKubernetesDependentStandaloneSpec());
+    resource.setSpec(new GenericKubernetesDependentSpec());
     resource.getSpec().setValue(INITIAL_DATA);
-
     return resource;
   }
-
-  // @Test
-  void testInformer() {
-    GenericKubernetesResource res = new GenericKubernetesResource();
-    res.setApiVersion("v1");
-    res.setKind("ConfigMap");
-
-    try (var client = new KubernetesClientBuilder().build()) {
-      client.genericKubernetesResources("v1", "ConfigMap").inAnyNamespace().inform()
-          .addEventHandler(new ResourceEventHandler<>() {
-            @Override
-            public void onAdd(GenericKubernetesResource genericKubernetesResource) {
-              System.out.println(genericKubernetesResource);
-            }
-
-            @Override
-            public void onUpdate(GenericKubernetesResource genericKubernetesResource,
-                GenericKubernetesResource t1) {
-              System.out.println(genericKubernetesResource);
-            }
-
-            @Override
-            public void onDelete(GenericKubernetesResource genericKubernetesResource, boolean b) {
-              System.out.println(genericKubernetesResource);
-            }
-          });
-    }
-  }
-
 }

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

@@ -0,0 +1,50 @@
+package io.javaoperatorsdk.operator;
+
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentSpec;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentstandalone.ConfigMapGenericKubernetesDependent;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public abstract class GenericKubernetesDependentTestBase<R extends CustomResource<GenericKubernetesDependentSpec, Void>> {
+
+  public static final String INITIAL_DATA = "Initial data";
+  public static final String CHANGED_DATA = "Changed data";
+  public static final String TEST_RESOURCE_NAME = "test1";
+
+  @Test
+  void testReconciliation() {
+    var resource = extension().create(testResource(TEST_RESOURCE_NAME, INITIAL_DATA));
+
+    await().untilAsserted(() -> {
+      var cm = extension().get(ConfigMap.class, TEST_RESOURCE_NAME);
+      assertThat(cm).isNotNull();
+      assertThat(cm.getData()).containsEntry(ConfigMapGenericKubernetesDependent.KEY, INITIAL_DATA);
+    });
+
+    resource.getSpec().setValue(CHANGED_DATA);
+    resource = extension().replace(resource);
+
+    await().untilAsserted(() -> {
+      var cm = extension().get(ConfigMap.class, TEST_RESOURCE_NAME);
+      assertThat(cm.getData()).containsEntry(ConfigMapGenericKubernetesDependent.KEY, CHANGED_DATA);
+    });
+
+    extension().delete(resource);
+
+    await().untilAsserted(() -> {
+      var cm = extension().get(ConfigMap.class, TEST_RESOURCE_NAME);
+      assertThat(cm).isNull();
+    });
+  }
+
+  public abstract LocallyRunOperatorExtension extension();
+
+  abstract R testResource(String name, String data);
+
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedCustomResource.java

@@ -10,6 +10,6 @@
 @Version("v1")
 @ShortNames("gkdm")
 public class GenericKubernetesDependentManagedCustomResource
-    extends CustomResource<GenericKubernetesDependentManagedSpec, Void>
+    extends CustomResource<GenericKubernetesDependentSpec, Void>
     implements Namespaced {
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedSpec.java renamed to operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentresourcemanaged/GenericKubernetesDependentSpec.java

@@ -1,14 +1,14 @@
 package io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged;
 
-public class GenericKubernetesDependentManagedSpec {
+public class GenericKubernetesDependentSpec {
 
   private String value;
 
   public String getValue() {
     return value;
   }
 
-  public GenericKubernetesDependentManagedSpec setValue(String value) {
+  public GenericKubernetesDependentSpec setValue(String value) {
     this.value = value;
     return this;
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneCustomResource.java

@@ -5,11 +5,12 @@
 import io.fabric8.kubernetes.model.annotation.Group;
 import io.fabric8.kubernetes.model.annotation.ShortNames;
 import io.fabric8.kubernetes.model.annotation.Version;
+import io.javaoperatorsdk.operator.sample.generickubernetesdependentresourcemanaged.GenericKubernetesDependentSpec;
 
 @Group("sample.javaoperatorsdk")
 @Version("v1")
 @ShortNames("gkd")
 public class GenericKubernetesDependentStandaloneCustomResource
-    extends CustomResource<GenericKubernetesDependentStandaloneSpec, Void>
+    extends CustomResource<GenericKubernetesDependentSpec, Void>
     implements Namespaced {
 }