fix: tests set up

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java

@@ -45,6 +45,7 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
   private final Map<ResourceID, RetryExecution> retryState = new HashMap<>();
   private final ExecutorService executor;
   private final String controllerName;
+  private final String resourceType;
   private final ReentrantLock lock = new ReentrantLock();
   private final Metrics metrics;
   private volatile boolean running;
@@ -54,6 +55,7 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
   EventProcessor(EventSourceManager<R> eventSourceManager) {
     this(ExecutorServiceManager.instance().executorService(),
         eventSourceManager.getController().getConfiguration().getName(),
+        eventSourceManager.getController().getConfiguration().getResourceTypeName(),
         new ReconciliationDispatcher<>(eventSourceManager.getController()),
         GenericRetry.fromConfiguration(
             eventSourceManager.getController().getConfiguration().getRetryConfiguration()),
@@ -63,16 +65,12 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
   }
 
   EventProcessor(ReconciliationDispatcher<R> reconciliationDispatcher,
-      EventSourceManager<R> eventSourceManager,
-      String relatedControllerName,
-      Retry retry) {
-    this(null,
-        relatedControllerName,
-        reconciliationDispatcher, retry, null, eventSourceManager);
+      EventSourceManager<R> eventSourceManager, Retry retry) {
+    this(null, "Test", "Test", reconciliationDispatcher, retry, null, eventSourceManager);
   }
 
   private EventProcessor(ExecutorService executor,
-      String relatedControllerName,
+      String relatedControllerName, String resourceTypeName,
       ReconciliationDispatcher<R> reconciliationDispatcher, Retry retry, Metrics metrics,
       EventSourceManager<R> eventSourceManager) {
     this.executor =
@@ -85,6 +83,7 @@ private EventProcessor(ExecutorService executor,
     this.retry = retry;
     this.metrics = metrics != null ? metrics : Metrics.NOOP;
     this.eventSourceManager = eventSourceManager;
+    this.resourceType = resourceTypeName;
   }
 
   EventMarker getEventMarker() {
@@ -140,9 +139,7 @@ private void submitReconciliationExecution(ResourceID resourceID) {
             controllerUnderExecution,
             latest.isPresent());
         if (latest.isEmpty()) {
-          log.warn("No {} resource found in cache for ResourceID: {}",
-              eventSourceManager.getController().getConfiguration().getResourceTypeName(),
-              resourceID);
+          log.warn("No {} resource found in cache for ResourceID: {}", resourceType, resourceID);
         }
       }
     } finally {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/OperatorTest.java

@@ -8,6 +8,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 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.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -23,6 +24,9 @@ class OperatorTest {
       MockKubernetesClient.client(FooCustomResource.class);
   private final ConfigurationService configurationService = mock(ConfigurationService.class);
   private final ControllerConfiguration configuration = mock(ControllerConfiguration.class);
+  static {
+    ExecutorServiceManager.useTestInstance();
+  }
 
   private final Operator operator = new Operator(kubernetesClient, configurationService);
   private final FooReconciler fooReconciler = FooReconciler.create();

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

@@ -54,9 +54,9 @@ public void setup() {
     when(controllerResourceEventSourceMock.getResourceCache()).thenReturn(resourceCacheMock);
 
     eventProcessor =
-        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null));
+        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, null));
     eventProcessorWithRetry =
-        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test",
+        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock,
             GenericRetry.defaultLimitedExponentialRetry()));
 
     when(eventProcessor.retryEventSource()).thenReturn(retryTimerEventSourceMock);