improved test

Author: csviri

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

@@ -13,28 +13,38 @@
 
 class PerResourcePollingEventSourceIT {
 
+  public static final String NAME_1 = "name1";
+  public static final String NAME_2 = "name2";
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new PerResourcePollingEventSourceTestReconciler())
           .build();
 
+  /**
+   * This is kinda some test to verify that the implementation of PerResourcePollingEventSource
+   * works with the underling mechanisms in event source manager and other parts of the system.
+   **/
   @Test
-  void managedDependentsAreReconciledInOrder() {
-    operator.create(PerResourceEventSourceCustomResource.class, resource());
+  void fetchedAndReconciledMultipleTimes() {
+    operator.create(PerResourceEventSourceCustomResource.class, resource(NAME_1));
+    operator.create(PerResourceEventSourceCustomResource.class, resource(NAME_2));
 
     var reconciler =
         operator.getReconcilerOfType(PerResourcePollingEventSourceTestReconciler.class);
     await().untilAsserted(() -> {
-      assertThat(reconciler.getNumberOfExecutions()).isGreaterThan(2);
-      assertThat(reconciler.getNumberOfFetchExecution()).isGreaterThan(2);
+      assertThat(reconciler.getNumberOfExecutions(NAME_1)).isGreaterThan(2);
+      assertThat(reconciler.getNumberOfFetchExecution(NAME_1)).isGreaterThan(2);
+      assertThat(reconciler.getNumberOfExecutions(NAME_2)).isGreaterThan(2);
+      assertThat(reconciler.getNumberOfFetchExecution(NAME_2)).isGreaterThan(2);
     });
   }
 
-  private PerResourceEventSourceCustomResource resource() {
+  private PerResourceEventSourceCustomResource resource(String name) {
     var res = new PerResourceEventSourceCustomResource();
     res.setMetadata(new ObjectMetaBuilder()
-        .withName("test1")
+        .withName(name)
         .build());
     return res;
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java

@@ -3,7 +3,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ConcurrentHashMap;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.*;
@@ -18,8 +18,8 @@ public class PerResourcePollingEventSourceTestReconciler
     KubernetesClientAware {
 
   public static final int POLL_PERIOD = 100;
-  private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
-  private final AtomicInteger numberOfFetchExecutions = new AtomicInteger(0);
+  private final Map<String, Integer> numberOfExecutions = new ConcurrentHashMap<>();
+  private final Map<String, Integer> numberOfFetchExecutions = new ConcurrentHashMap<>();
 
   private KubernetesClient client;
   private PerResourcePollingEventSource<String, PerResourceEventSourceCustomResource> eventSource;
@@ -28,16 +28,18 @@ public class PerResourcePollingEventSourceTestReconciler
   public UpdateControl<PerResourceEventSourceCustomResource> reconcile(
       PerResourceEventSourceCustomResource resource,
       Context<PerResourceEventSourceCustomResource> context) throws Exception {
-    numberOfExecutions.addAndGet(1);
+    numberOfExecutions.putIfAbsent(resource.getMetadata().getName(), 0);
+    numberOfExecutions.compute(resource.getMetadata().getName(), (s, v) -> v + 1);
     return UpdateControl.noUpdate();
   }
 
   @Override
   public Map<String, EventSource> prepareEventSources(
       EventSourceContext<PerResourceEventSourceCustomResource> context) {
     this.eventSource =
-        new PerResourcePollingEventSource<>(primaryResource -> {
-          numberOfFetchExecutions.addAndGet(1);
+        new PerResourcePollingEventSource<>(resource -> {
+          numberOfFetchExecutions.putIfAbsent(resource.getMetadata().getName(), 0);
+          numberOfFetchExecutions.compute(resource.getMetadata().getName(), (s, v) -> v + 1);
           return Set.of(UUID.randomUUID().toString());
         },
             context.getPrimaryCache(), POLL_PERIOD, String.class);
@@ -54,12 +56,12 @@ public void setKubernetesClient(KubernetesClient kubernetesClient) {
     this.client = kubernetesClient;
   }
 
-  public int getNumberOfExecutions() {
-    return numberOfExecutions.get();
+  public int getNumberOfExecutions(String name) {
+    return numberOfExecutions.get(name);
   }
 
-  public int getNumberOfFetchExecution() {
-    return numberOfFetchExecutions.get();
+  public int getNumberOfFetchExecution(String name) {
+    return numberOfFetchExecutions.get(name);
   }
 
 }