additional unit tests

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

@@ -239,7 +239,7 @@ private String getLatestResourceVersion(String namespace) {
   }
 
   private void checkObsoleteResources() {
-    if (System.currentTimeMillis() > lastObsoleteResourceCheck + obsoleteResourceCheckInterval) {
+    if (System.currentTimeMillis() >= lastObsoleteResourceCheck + obsoleteResourceCheckInterval) {
       lastObsoleteResourceCheck = System.currentTimeMillis();
       log.debug("Checking for obsolete resources.");
       var iterator = cache.entrySet().iterator();
@@ -248,9 +248,11 @@ private void checkObsoleteResources() {
         if (ReconcilerUtilsInternal.compareResourceVersions(
                 e.getValue().getMetadata().getResourceVersion(),
                 getLatestResourceVersion(e.getValue().getMetadata().getNamespace()))
-            < 0) iterator.remove();
-        managedInformerEventSource.handleEvent(ResourceAction.DELETED, e.getValue(), null, true);
-        log.debug("Removing obsolete resource with ID: {}", e.getKey());
+            < 0) {
+          iterator.remove();
+          managedInformerEventSource.handleEvent(ResourceAction.DELETED, e.getValue(), null, true);
+          log.debug("Removing obsolete resource with ID: {}", e.getKey());
+        }
       }
     }
   }

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

@@ -319,12 +319,8 @@ void rapidDeletion() {
 
   @Test
   void removalOfObsoleteResources() {
-    this.temporaryResourceCache =
-        new TemporaryResourceCache<>(
-            true,
-            OBSOLETE_RESOURCE_CHECK_INTERVAL,
-            Executors.newScheduledThreadPool(1),
-            managedInformerEventSource);
+    withTemporaryResourceCacheForObsoleteHandling();
+
     var tr = testResource();
     this.temporaryResourceCache.putResource(tr);
 
@@ -344,6 +340,54 @@ void removalOfObsoleteResources() {
                     .isEmpty());
   }
 
+  @Test
+  void checksObsoleteOnlyWithCertainDelay() {
+    withTemporaryResourceCacheForObsoleteHandling();
+    this.temporaryResourceCache.putResource(testResource());
+    latestSyncVersion = "3";
+    await()
+        .pollDelay(Duration.ofMillis(OBSOLETE_RESOURCE_CHECK_INTERVAL / 5))
+        .untilAsserted(
+            () ->
+                assertThat(
+                        temporaryResourceCache.getResourceFromCache(
+                            ResourceID.fromResource(testResource())))
+                    .isPresent());
+
+    await()
+        .untilAsserted(
+            () ->
+                assertThat(
+                        temporaryResourceCache.getResourceFromCache(
+                            ResourceID.fromResource(testResource())))
+                    .isEmpty());
+  }
+
+  @Test
+  void obsoleteResourceIsNotRemovedIfLatestSyncVersionIsOlder() {
+    withTemporaryResourceCacheForObsoleteHandling();
+    this.temporaryResourceCache.putResource(testResource());
+    latestSyncVersion = "1";
+
+    await()
+        .pollDelay(Duration.ofMillis(OBSOLETE_RESOURCE_CHECK_INTERVAL * 2))
+        .untilAsserted(
+            () ->
+                assertThat(
+                        temporaryResourceCache.getResourceFromCache(
+                            ResourceID.fromResource(testResource())))
+                    .isPresent());
+  }
+
+  private void withTemporaryResourceCacheForObsoleteHandling() {
+    this.temporaryResourceCache =
+        new TemporaryResourceCache<>(
+            true,
+            OBSOLETE_RESOURCE_CHECK_INTERVAL,
+            Executors.newScheduledThreadPool(1),
+            managedInformerEventSource);
+  }
+
   private ConfigMap propagateTestResourceToCache() {
     var testResource = testResource();
     temporaryResourceCache.putResource(testResource);