Skip to content

Commit 9e1e314

Browse files
committed
fix: tests set up
1 parent 4b4c43d commit 9e1e314

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

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

+7-10
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
4545
private final Map<ResourceID, RetryExecution> retryState = new HashMap<>();
4646
private final ExecutorService executor;
4747
private final String controllerName;
48+
private final String resourceType;
4849
private final ReentrantLock lock = new ReentrantLock();
4950
private final Metrics metrics;
5051
private volatile boolean running;
@@ -54,6 +55,7 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
5455
EventProcessor(EventSourceManager<R> eventSourceManager) {
5556
this(ExecutorServiceManager.instance().executorService(),
5657
eventSourceManager.getController().getConfiguration().getName(),
58+
eventSourceManager.getController().getConfiguration().getResourceTypeName(),
5759
new ReconciliationDispatcher<>(eventSourceManager.getController()),
5860
GenericRetry.fromConfiguration(
5961
eventSourceManager.getController().getConfiguration().getRetryConfiguration()),
@@ -63,16 +65,12 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
6365
}
6466

6567
EventProcessor(ReconciliationDispatcher<R> reconciliationDispatcher,
66-
EventSourceManager<R> eventSourceManager,
67-
String relatedControllerName,
68-
Retry retry) {
69-
this(null,
70-
relatedControllerName,
71-
reconciliationDispatcher, retry, null, eventSourceManager);
68+
EventSourceManager<R> eventSourceManager, Retry retry) {
69+
this(null, "Test", "Test", reconciliationDispatcher, retry, null, eventSourceManager);
7270
}
7371

7472
private EventProcessor(ExecutorService executor,
75-
String relatedControllerName,
73+
String relatedControllerName, String resourceTypeName,
7674
ReconciliationDispatcher<R> reconciliationDispatcher, Retry retry, Metrics metrics,
7775
EventSourceManager<R> eventSourceManager) {
7876
this.executor =
@@ -85,6 +83,7 @@ private EventProcessor(ExecutorService executor,
8583
this.retry = retry;
8684
this.metrics = metrics != null ? metrics : Metrics.NOOP;
8785
this.eventSourceManager = eventSourceManager;
86+
this.resourceType = resourceTypeName;
8887
}
8988

9089
EventMarker getEventMarker() {
@@ -140,9 +139,7 @@ private void submitReconciliationExecution(ResourceID resourceID) {
140139
controllerUnderExecution,
141140
latest.isPresent());
142141
if (latest.isEmpty()) {
143-
log.warn("No {} resource found in cache for ResourceID: {}",
144-
eventSourceManager.getController().getConfiguration().getResourceTypeName(),
145-
resourceID);
142+
log.warn("No {} resource found in cache for ResourceID: {}", resourceType, resourceID);
146143
}
147144
}
148145
} finally {

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

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.fabric8.kubernetes.client.KubernetesClient;
99
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1010
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
11+
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
1112
import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
1213
import io.javaoperatorsdk.operator.api.reconciler.Context;
1314
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -23,6 +24,9 @@ class OperatorTest {
2324
MockKubernetesClient.client(FooCustomResource.class);
2425
private final ConfigurationService configurationService = mock(ConfigurationService.class);
2526
private final ControllerConfiguration configuration = mock(ControllerConfiguration.class);
27+
static {
28+
ExecutorServiceManager.useTestInstance();
29+
}
2630

2731
private final Operator operator = new Operator(kubernetesClient, configurationService);
2832
private final FooReconciler fooReconciler = FooReconciler.create();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public void setup() {
5454
when(controllerResourceEventSourceMock.getResourceCache()).thenReturn(resourceCacheMock);
5555

5656
eventProcessor =
57-
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null));
57+
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, null));
5858
eventProcessorWithRetry =
59-
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test",
59+
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock,
6060
GenericRetry.defaultLimitedExponentialRetry()));
6161

6262
when(eventProcessor.retryEventSource()).thenReturn(retryTimerEventSourceMock);

0 commit comments

Comments
 (0)