integration test

Author: csviri

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

@@ -3,19 +3,75 @@
 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.externalstate.ExternalStateCustomResource;
 import io.javaoperatorsdk.operator.sample.externalstate.ExternalStateReconciler;
+import io.javaoperatorsdk.operator.sample.externalstate.ExternalStateSpec;
+import io.javaoperatorsdk.operator.support.ExternalIDGenServiceMock;
+
+import static io.javaoperatorsdk.operator.sample.externalstate.ExternalStateReconciler.ID_KEY;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 class ExternalStateIT {
 
+  private static final String TEST_RESOURCE_NAME = "test1";
+
+  public static final String INITIAL_TEST_DATA = "initialTestData";
+  public static final String UPDATED_DATA = "updatedData";
+
+  private ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(ExternalStateReconciler.class)
           .build();
 
   @Test
   public void reconcilesResourceWithPersistentState() {
+    var resource = operator.create(testResource());
+    assertResourcesCreated(resource, INITIAL_TEST_DATA);
+
+    resource.getSpec().setData(UPDATED_DATA);
+    operator.replace(resource);
+    assertResourcesCreated(resource, UPDATED_DATA);
 
+    operator.delete(resource);
+    assertResourcesDeleted(resource);
   }
 
+  private void assertResourcesDeleted(ExternalStateCustomResource resource) {
+    await().untilAsserted(() -> {
+      var cm = operator.get(ConfigMap.class, resource.getMetadata().getName());
+      var resources = externalService.listResources();
+      assertThat(cm).isNull();
+      assertThat(resources).isEmpty();
+    });
+  }
+
+  private void assertResourcesCreated(ExternalStateCustomResource resource,
+      String initialTestData) {
+    await().untilAsserted(() -> {
+      var cm = operator.get(ConfigMap.class, resource.getMetadata().getName());
+      var resources = externalService.listResources();
+      assertThat(resources).hasSize(1);
+      var extRes = externalService.listResources().get(0);
+      assertThat(extRes.getData()).isEqualTo(initialTestData);
+      assertThat(cm).isNotNull();
+      assertThat(cm.getData().get(ID_KEY)).isEqualTo(extRes.getId());
+    });
+  }
+
+  private ExternalStateCustomResource testResource() {
+    var res = new ExternalStateCustomResource();
+    res.setMetadata(new ObjectMetaBuilder()
+        .withName(TEST_RESOURCE_NAME)
+        .build());
+
+    res.setSpec(new ExternalStateSpec());
+    res.getSpec().setData(INITIAL_TEST_DATA);
+    return res;
+  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateReconciler.java

@@ -85,6 +85,10 @@ private void createExternalResource(ExternalStateCustomResource resource) {
   @Override
   public DeleteControl cleanup(ExternalStateCustomResource resource,
       Context<ExternalStateCustomResource> context) {
+    var externalResource = context.getSecondaryResource(ExternalResource.class);
+    externalResource.ifPresent(er -> {
+      externalService.delete(er.getId());
+    });
     client.configMaps().inNamespace(resource.getMetadata().getNamespace())
         .withName(resource.getMetadata().getName()).delete();
     return DeleteControl.defaultDelete();
@@ -103,7 +107,10 @@ public Map<String, EventSource> prepareEventSources(
     configMapEventSource.setEventSourcePriority(EventSourceStartPriority.RESOURCE_STATE_LOADER);
 
     externalResourceEventSource = new PerResourcePollingEventSource<>(primaryResource -> {
-      var configMap = configMapEventSource.getSecondaryResource(primaryResource).orElseThrow();
+      var configMap = configMapEventSource.getSecondaryResource(primaryResource).orElse(null);
+      if (configMap == null) {
+        return Collections.emptySet();
+      }
       var id = configMap.getData().get(ID_KEY);
       var externalResource = externalService.read(id);
       return externalResource.map(er -> Set.of(er)).orElse(Collections.emptySet());

operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalIDGenServiceMock.java

@@ -14,8 +14,9 @@ public ExternalResource create(ExternalResource externalResource) {
       throw new IllegalArgumentException("ID provided for external resource");
     }
     String id = UUID.randomUUID().toString();
-    resourceMap.put(id, new ExternalResource(id, externalResource.getData()));
-    return externalResource;
+    var newResource = new ExternalResource(id, externalResource.getData());
+    resourceMap.put(id, newResource);
+    return newResource;
   }
 
   public Optional<ExternalResource> read(String id) {