unit test

Author: csviri

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

@@ -18,6 +18,7 @@
 import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.processing.event.rate.PeriodRateLimiter;
+import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerResourceEventSource;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEvent;
@@ -50,21 +51,23 @@ class EventProcessorTest {
   private Metrics metricsMock = mock(Metrics.class);
   private EventProcessor eventProcessor;
   private EventProcessor eventProcessorWithRetry;
+  private RateLimiter rateLimiterMock = mock(RateLimiter.class);
 
   @BeforeEach
   void setup() {
     when(eventSourceManagerMock.getControllerResourceEventSource())
         .thenReturn(controllerResourceEventSourceMock);
     eventProcessor =
         spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null,
-            new PeriodRateLimiter(), null));
+            rateLimiterMock, null));
     eventProcessor.start();
     eventProcessorWithRetry =
         spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test",
-            GenericRetry.defaultLimitedExponentialRetry(), new PeriodRateLimiter(), null));
+            GenericRetry.defaultLimitedExponentialRetry(), rateLimiterMock, null));
     eventProcessorWithRetry.start();
     when(eventProcessor.retryEventSource()).thenReturn(retryTimerEventSourceMock);
     when(eventProcessorWithRetry.retryEventSource()).thenReturn(retryTimerEventSourceMock);
+    when(rateLimiterMock.acquirePermission(any())).thenReturn(Optional.empty());
   }
 
   @Test
@@ -331,6 +334,25 @@ void newResourceAfterMissedDeleteEvent() {
     verify(reconciliationDispatcherMock, timeout(50).times(1)).handleExecution(any());
   }
 
+  @Test
+  void rateLimitsReconciliationSubmission() throws InterruptedException {
+    // the refresh period value does not matter here
+    var refreshPeriod = Duration.ofMillis(100);
+    var event = prepareCREvent();
+
+    when(rateLimiterMock.acquirePermission(event.getRelatedCustomResourceID()))
+        .thenReturn(Optional.empty())
+        .thenReturn(Optional.of(refreshPeriod));
+
+    eventProcessor.handleEvent(event);
+    verify(reconciliationDispatcherMock, after(FAKE_CONTROLLER_EXECUTION_DURATION).times(1))
+        .handleExecution(any());
+    verify(retryTimerEventSourceMock, times(0)).scheduleOnce(any(), anyLong());
+
+    eventProcessor.handleEvent(event);
+    verify(retryTimerEventSourceMock, times(1)).scheduleOnce(any(), anyLong());
+  }
+
   private ResourceID eventAlreadyUnderProcessing() {
     when(reconciliationDispatcherMock.handleExecution(any()))
         .then(

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

@@ -52,7 +52,10 @@ void setUpResources() {
     configurationService = spy(ConfigurationService.class);
     when(configurationService.checkCRDAndValidateLocalModel()).thenReturn(false);
     when(configurationService.getVersion()).thenReturn(new Version("1", "1", new Date()));
+    // make sure not the same config instance is used for the controller, so rate limiter is not
+    // shared
     when(configurationService.getConfigurationFor(any(MyController.class)))
+        .thenReturn(new MyConfiguration())
         .thenReturn(new MyConfiguration());
   }
 
@@ -138,8 +141,7 @@ public MyConfiguration() {
     }
   }
 
-  @ControllerConfiguration(namespaces = NAMESPACE,
-      rateLimiter = @RateLimiter(limitForPeriod = PeriodRateLimiter.DEFAULT_LIMIT_FOR_PERIOD))
+  @ControllerConfiguration(namespaces = NAMESPACE)
   public static class MyController implements Reconciler<TestCustomResource> {
 
     private final Consumer<TestCustomResource> consumer;