integration test improvements

Author: adam-sandor

operator-framework/src/test/java/com/github/containersolutions/operator/ConcurrencyIT.java

@@ -15,6 +15,7 @@
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static com.github.containersolutions.operator.IntegrationTestSupport.TEST_NAMESPACE;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +45,7 @@ public void cleanup() {
     @Test
     public void manyResourcesGetCreatedUpdatedAndDeleted() {
         integrationTest.teardownIfSuccess(() -> {
-            log.info("Adding new resources.");
+            log.info("Creating {} new resources", NUMBER_OF_RESOURCES_CREATED);
             for (int i = 0; i < NUMBER_OF_RESOURCES_CREATED; i++) {
                 TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i));
                 integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).create(tcr);
@@ -59,7 +60,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
                         assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED);
                     });
 
-            log.info("Updating resources.");
+            log.info("Updating {} resources", NUMBER_OF_RESOURCES_UPDATED);
             // update some resources
             for (int i = 0; i < NUMBER_OF_RESOURCES_UPDATED; i++) {
                 TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i));
@@ -69,7 +70,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
             // sleep to make some variability to the test, so some updates are not executed before delete
             Thread.sleep(300);
 
-            log.info("Deleting resources.");
+            log.info("Deleting {} resources", NUMBER_OF_RESOURCES_DELETED);
             for (int i = 0; i < NUMBER_OF_RESOURCES_DELETED; i++) {
                 TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i));
                 integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).delete(tcr);
@@ -81,7 +82,9 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
                                 .inNamespace(TEST_NAMESPACE)
                                 .withLabel("managedBy", TestCustomResourceController.class.getSimpleName())
                                 .list().getItems();
-                        assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
+                        //reducing configmaps to names only - better for debugging
+                        List<String> itemDescs = items.stream().map(configMap -> configMap.getMetadata().getName()).collect(Collectors.toList());
+                        assertThat(itemDescs).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
 
                         List<TestCustomResource> crs = integrationTest.getCrOperations()
                                 .inNamespace(TEST_NAMESPACE)

operator-framework/src/test/java/com/github/containersolutions/operator/IntegrationTestSupport.java

@@ -46,7 +46,6 @@ public void initialize(KubernetesClient k8sClient, ResourceController controller
         Class doneableClass = getCustomResourceDoneableClass(controller);
         Class customResourceClass = getCustomResourceClass(controller);
         crOperations = k8sClient.customResources(crd, customResourceClass, CustomResourceList.class, doneableClass);
-        crOperations.inNamespace(TEST_NAMESPACE).delete(crOperations.list().getItems());
 
         if (k8sClient.namespaces().withName(TEST_NAMESPACE).get() == null) {
             k8sClient.namespaces().create(new NamespaceBuilder()
@@ -68,6 +67,7 @@ public void cleanup() {
 
         //we depend on the actual operator from the startup to handle the finalizers and clean up
         //resources from previous test runs
+        crOperations.inNamespace(TEST_NAMESPACE).delete(crOperations.list().getItems());
 
         await("all CRs cleaned up").atMost(60, TimeUnit.SECONDS)
                 .untilAsserted(() -> {

operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java

@@ -28,7 +28,7 @@ public class TestCustomResourceController implements ResourceController<TestCust
 
     private final KubernetesClient kubernetesClient;
     private final boolean updateStatus;
-    private AtomicInteger numberOfExecutions = new AtomicInteger(0);
+    private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
     public TestCustomResourceController(KubernetesClient kubernetesClient) {
         this(kubernetesClient, true);
@@ -41,10 +41,15 @@ public TestCustomResourceController(KubernetesClient kubernetesClient, boolean u
 
     @Override
     public boolean deleteResource(TestCustomResource resource, Context<TestCustomResource> context) {
-        kubernetesClient.configMaps().inNamespace(resource.getMetadata().getNamespace())
+        Boolean delete = kubernetesClient.configMaps().inNamespace(resource.getMetadata().getNamespace())
                 .withName(resource.getSpec().getConfigMapName()).delete();
-        log.info("Deleting config map with name: {} for resource: {}", resource.getSpec().getConfigMapName(), resource.getMetadata().getName());
-        return true;
+        if (Boolean.TRUE.equals(delete)) {
+            log.info("Deleted ConfigMap {} for resource: {}", resource.getSpec().getConfigMapName(), resource.getMetadata().getName());
+            return true;
+        } else {
+            log.error("Failed to delete ConfigMap {} for resource: {}", resource.getSpec().getConfigMapName(), resource.getMetadata().getName());
+            return false;
+        }
     }
 
     @Override