fixed unit test

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ExecutorServiceManager.java

@@ -29,7 +29,7 @@ private ExecutorServiceManager(ExecutorService executor, ExecutorService workflo
 
   }
 
-  public static void init() {
+  public static synchronized void init() {
     if (instance == null) {
       final var configuration = ConfigurationServiceProvider.instance();
       final var executorService = configuration.getExecutorService();
@@ -45,6 +45,13 @@ public static void init() {
     }
   }
 
+  /** For testing purposes only */
+  public static synchronized void reset() {
+    instance().doStop(Duration.ZERO);
+    instance = null;
+    init();
+  }
+
   public static synchronized void stop(Duration gracefulShutdownTimeout) {
     if (instance != null) {
       instance.doStop(gracefulShutdownTimeout);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java

@@ -15,7 +15,9 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
 import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
@@ -36,17 +38,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.after;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 class EventProcessorTest {
@@ -56,6 +48,8 @@ class EventProcessorTest {
   public static final int FAKE_CONTROLLER_EXECUTION_DURATION = 250;
   public static final int SEPARATE_EXECUTION_TIMEOUT = 450;
   public static final String TEST_NAMESPACE = "default-event-handler-test";
+  public static final int TIME_TO_WAIT_AFTER_SUBMISSION_BEFORE_EXECUTION = 150;
+  public static final int DISPATCHING_DELAY = 250;
 
   private final ReconciliationDispatcher reconciliationDispatcherMock =
       mock(ReconciliationDispatcher.class);
@@ -418,14 +412,24 @@ void schedulesRetryForMarReconciliationIntervalIfRetryExhausted() {
   }
 
   @Test
-  void executionOfReconciliationNotStartIfProcessorStopped() {
+  void executionOfReconciliationNotStartIfProcessorStopped() throws InterruptedException {
+    when(reconciliationDispatcherMock.handleExecution(any()))
+        .then((Answer<PostExecutionControl>) invocationOnMock -> {
+          Thread.sleep(DISPATCHING_DELAY);
+          return PostExecutionControl.defaultDispatch();
+        });
+    // one event will lock the thread / executor
+    ConfigurationServiceProvider.overrideCurrent(o -> o.withConcurrentReconciliationThreads(1));
+    ExecutorServiceManager.reset();
+    eventProcessor.start();
+
+    eventProcessor.handleEvent(prepareCREvent());
     eventProcessor.handleEvent(prepareCREvent());
-    // note that there could be race condition in this test, however it is very unlikely that it
-    // will happen the stop is called after submission (that could be theoretically executed before
-    // stop)
     eventProcessor.stop();
 
-    verify(reconciliationDispatcherMock, timeout(SEPARATE_EXECUTION_TIMEOUT).times(0))
+    // wait until both event should be handled
+    Thread.sleep(TIME_TO_WAIT_AFTER_SUBMISSION_BEFORE_EXECUTION + 2 * DISPATCHING_DELAY);
+    verify(reconciliationDispatcherMock, atMostOnce())
         .handleExecution(any());
   }
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

@@ -75,6 +75,7 @@ static void classSetup() {
      * equals will fail on the two equal but NOT identical TestCustomResources because equals is not
      * implemented on TestCustomResourceSpec or TestCustomResourceStatus
      */
+    ConfigurationServiceProvider.reset();
     ConfigurationServiceProvider.overrideCurrent(overrider -> overrider
         .checkingCRDAndValidateLocalModel(false).withResourceCloner(new Cloner() {
           @Override