test fix

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -57,7 +57,7 @@ default boolean isGenerationAware() {
   String getAssociatedReconcilerClassName();
 
   default Retry getRetry() {
-    return GenericRetry.DEFAULT;
+    return GenericRetry.defaultLimitedExponentialRetry();
   }
 
   @SuppressWarnings("rawtypes")

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetry.java

@@ -13,7 +13,7 @@ public class GenericRetry implements Retry, AnnotationConfigurable<GradualRetry>
   public static final GenericRetry DEFAULT = new GenericRetry();
 
   public static GenericRetry defaultLimitedExponentialRetry() {
-    return DEFAULT;
+    return new GenericRetry();
   }
 
   public static GenericRetry noRetry() {

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

@@ -44,6 +44,7 @@
 import static org.mockito.Mockito.after;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.atMostOnce;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -618,7 +619,7 @@ void processesAdditionalEventWhileInDeleteModeRetry() {
     eventProcessor.handleEvent(prepareCREvent1());
     waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
     eventProcessor.handleEvent(prepareCRDeleteEvent1());
-    verify(reconciliationDispatcherMock, times(2)).handleExecution(any());
+    verify(reconciliationDispatcherMock, atMost(2)).handleExecution(any());
     waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
     // retry event
     eventProcessor.handleEvent(new Event(TestUtils.testCustomResource1Id()));
@@ -661,7 +662,26 @@ void afterRetryExhaustedAdditionalEventTriggerReconciliationWhenDeleteEventPrese
 
   @Test
   void passesResourceFromStateToDispatcher() {
-    // check also last state unknown
+    eventProcessor =
+        spy(
+            new EventProcessor(
+                controllerConfigTriggerAllEvent(null, rateLimiterMock),
+                reconciliationDispatcherMock,
+                eventSourceManagerMock,
+                null));
+    when(reconciliationDispatcherMock.handleExecution(any()))
+        .thenReturn(PostExecutionControl.defaultDispatch());
+    when(eventSourceManagerMock.retryEventSource()).thenReturn(mock(TimerEventSource.class));
+    eventProcessor.start();
+
+    eventProcessor.handleEvent(prepareCREvent1());
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+
+    eventProcessor.handleEvent(prepareCRDeleteEvent1());
+    waitUntilProcessingFinished(eventProcessor, TestUtils.testCustomResource1Id());
+    var captor = ArgumentCaptor.forClass(ExecutionScope.class);
+    verify(reconciliationDispatcherMock, times(2)).handleExecution(captor.capture());
+    assertThat(captor.getAllValues().get(1).getResource()).isNotNull();
   }
 
   @Test