test: reset ExternalIDGenServiceMock between tests to fix flaky external-state ITs

Signed-off-by: Dennis-Mircea Ciupitu <dennis.mircea.ciupitu@gmail.com>

Author: Dennis-Mircea

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateTestBase.java

@@ -15,6 +15,7 @@
  */
 package io.javaoperatorsdk.operator.dependent.externalstate;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -35,6 +36,11 @@ public abstract class ExternalStateTestBase {
 
   private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
 
+  @BeforeEach
+  void resetExternalService() {
+    externalService.reset();
+  }
+
   @Test
   public void reconcilesResourceWithPersistentState() {
     var resource = extension().create(testResource());

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java

@@ -17,6 +17,7 @@
 
 import java.time.Duration;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -49,6 +50,11 @@ class ExternalStateBulkIT {
 
   private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
 
+  @BeforeEach
+  void resetExternalService() {
+    externalService.reset();
+  }
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()

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

@@ -50,6 +50,14 @@ public List<ExternalResource> listResources() {
     return new ArrayList<>(resourceMap.values());
   }
 
+  /**
+   * Clears the internal state. Intended to be called between tests so that state from one test
+   * does not leak into the next via this JVM-lifetime singleton.
+   */
+  public void reset() {
+    resourceMap.clear();
+  }
+
   public static ExternalIDGenServiceMock getInstance() {
     return serviceMock;
   }