full crud test

Author: csviri

caffein-bounded-cache-support/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeinBoundedCache.java

@@ -23,8 +23,7 @@ public R remove(K key) {
   }
 
   @Override
-  public R put(K key, R object) {
+  public void put(K key, R object) {
     cache.put(key, object);
-    return object;
   }
 }

caffein-bounded-cache-support/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeinBoundedItemStores.java

@@ -10,6 +10,8 @@
 
 public class CaffeinBoundedItemStores {
 
+  private CaffeinBoundedItemStores() {}
+
   public static <R extends HasMetadata> BoundedItemStore<R> boundedItemStore(
       KubernetesClient client, Class<R> rClass,
       Duration accessExpireDuration, long cacheMaxSize) {

caffein-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeinBoundedCacheIT.java

@@ -23,6 +23,7 @@ class CaffeinBoundedCacheIT {
   public static final int NUMBER_OF_RESOURCE_TO_TEST = 3;
   public static final String RESOURCE_NAME_PREFIX = "test-";
   public static final String INITIAL_DATA_PREFIX = "data-";
+  public static final String UPDATED_PREFIX = "updatedPrefix";
 
   @RegisterExtension
   LocallyRunOperatorExtension extension =
@@ -38,17 +39,44 @@ class CaffeinBoundedCacheIT {
   void reconciliationWorksWithLimitedCache() {
     createTestResources();
 
-    await().untilAsserted(() -> {
-      assertConfigMapData(INITIAL_DATA_PREFIX);
+    assertConfigMapData(INITIAL_DATA_PREFIX);
+
+    updateTestResources();
+
+    assertConfigMapData(UPDATED_PREFIX);
+
+    deleteTestResources();
+
+    assertConfigMapsDeleted();
+  }
+
+  private void assertConfigMapsDeleted() {
+    await().untilAsserted(() -> IntStream.range(0, NUMBER_OF_RESOURCE_TO_TEST).forEach(i -> {
+      var cm = extension.get(ConfigMap.class, RESOURCE_NAME_PREFIX + i);
+      assertThat(cm).isNull();
+    }));
+  }
+
+  private void deleteTestResources() {
+    IntStream.range(0, NUMBER_OF_RESOURCE_TO_TEST).forEach(i -> {
+      var cm = extension.get(BoundedCacheTestCustomResource.class, RESOURCE_NAME_PREFIX + i);
+      extension.delete(cm);
     });
   }
 
-  void assertConfigMapData(String dataPrefix) {
+  private void updateTestResources() {
     IntStream.range(0, NUMBER_OF_RESOURCE_TO_TEST).forEach(i -> {
-      assertConfigMap(i, dataPrefix);
+      var cm = extension.get(ConfigMap.class, RESOURCE_NAME_PREFIX + i);
+      cm.getData().put(DATA_KEY, UPDATED_PREFIX + i);
+      extension.replace(cm);
     });
   }
 
+  void assertConfigMapData(String dataPrefix) {
+    await().untilAsserted(() -> IntStream.range(0, NUMBER_OF_RESOURCE_TO_TEST)
+        .forEach(i -> assertConfigMap(i, dataPrefix)));
+  }
+
   private void assertConfigMap(int i, String prefix) {
     var cm = extension.get(ConfigMap.class, RESOURCE_NAME_PREFIX + i);
     assertThat(cm).isNotNull();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedCache.java

@@ -1,12 +1,11 @@
 package io.javaoperatorsdk.operator.processing.event.source.cache;
 
-// todo: rename to cache? (replace the old one)
 public interface BoundedCache<K, R> {
 
   R get(K key);
 
   R remove(K key);
 
-  R put(K key, R object);
+  void put(K key, R object);
 
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedItemStore.java

@@ -28,14 +28,15 @@ public class BoundedItemStore<R extends HasMetadata>
 
   public BoundedItemStore(KubernetesClient client,
       BoundedCache<String, R> cache, Class<R> resourceClass) {
-    this(client, cache, resourceClass, namespaceKeyFunc());
+    this(cache, resourceClass, namespaceKeyFunc(),
+        new KubernetesResourceFetcher<>(resourceClass, client));
   }
 
-  public BoundedItemStore(KubernetesClient client,
-      BoundedCache<String, R> cache,
+  public BoundedItemStore(BoundedCache<String, R> cache,
       Class<R> resourceClass,
-      Function<R, String> keyFunction) {
-    this.resourceFetcher = new KubernetesResourceFetcher<>(resourceClass, client);
+      Function<R, String> keyFunction,
+      ResourceFetcher<String, R> resourceFetcher) {
+    this.resourceFetcher = resourceFetcher;
     this.cache = cache;
     this.keyFunction = keyFunction;
     this.resourceClass = resourceClass;

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

@@ -0,0 +1,104 @@
+package io.javaoperatorsdk.operator.processing.event.source.cache;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.client.informers.cache.Cache;
+import io.javaoperatorsdk.operator.TestUtils;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+
+import static io.javaoperatorsdk.operator.processing.event.source.cache.BoundedItemStore.namespaceKeyFunc;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+class BoundedItemStoreTest {
+
+  private BoundedItemStore<TestCustomResource> boundedItemStore;
+  private BoundedCache<String, TestCustomResource> boundedCache = mock(BoundedCache.class);
+  private ResourceFetcher<String, TestCustomResource> resourceFetcher = mock(ResourceFetcher.class);
+
+  @BeforeEach
+  void setup() {
+    boundedItemStore = new BoundedItemStore<>(boundedCache,
+        TestCustomResource.class,
+        namespaceKeyFunc(),
+        resourceFetcher);
+  }
+
+  @Test
+  void notFetchesResourceFromServer() {
+    var res = boundedItemStore.get(testRes1Key());
+
+    assertThat(res).isNull();
+    verify(resourceFetcher, never()).fetchResource(any());
+  }
+
+  @Test
+  void getsResourceFromServerIfNotInCache() {
+    boundedItemStore.put(testRes1Key(),
+        TestUtils.testCustomResource1());
+    when(resourceFetcher.fetchResource(testRes1Key()))
+        .thenReturn(TestUtils.testCustomResource1());
+
+    var res = boundedItemStore.get(testRes1Key());
+
+    assertThat(res).isNotNull();
+    verify(resourceFetcher, times(1)).fetchResource(any());
+  }
+
+  @Test
+  void ifFetchingNotFoundResourceRemovesItFromStore() {
+    boundedItemStore.put(testRes1Key(),
+        TestUtils.testCustomResource1());
+    when(resourceFetcher.fetchResource(testRes1Key()))
+        .thenReturn(null);
+
+    var res = boundedItemStore.get(testRes1Key());
+
+    assertThat(res).isNull();
+    assertThat(boundedItemStore.keySet()).isEmpty();
+  }
+
+  @Test
+  void removesResourceFromCache() {
+    boundedItemStore.put(testRes1Key(),
+        TestUtils.testCustomResource1());
+
+    boundedItemStore.remove(testRes1Key());
+
+    var res = boundedItemStore.get(testRes1Key());
+    verify(resourceFetcher, never()).fetchResource(any());
+    assertThat(res).isNull();
+    assertThat(boundedItemStore.keySet()).isEmpty();
+  }
+
+  @Test
+  void readingKeySeyNotReadsTheBoundedCache() {
+    boundedItemStore.put(testRes1Key(),
+        TestUtils.testCustomResource1());
+
+    boundedItemStore.keySet();
+
+    verify(boundedCache, never()).get(any());
+  }
+
+  @Test
+  void readingValuesNotReadsTheBoundedCache() {
+    boundedItemStore.put(testRes1Key(),
+        TestUtils.testCustomResource1());
+
+    boundedItemStore.values();
+
+    verify(boundedCache, never()).get(any());
+  }
+
+  String key(HasMetadata r) {
+    return Cache.namespaceKeyFunc(r.getMetadata().getNamespace(), r.getMetadata().getName());
+  }
+
+  String testRes1Key() {
+    return key(TestUtils.testCustomResource1());
+  }
+}