tests, improvements

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ResourceCache.java

@@ -18,7 +18,7 @@ public Optional<CustomResource> getLatestResource(String uuid) {
         return Optional.ofNullable(resources.get(uuid));
     }
 
-    public void cleanup(String customResourceUid) {
-        resources.remove(customResourceUid);
+    public CustomResource cleanup(String customResourceUid) {
+        return resources.remove(customResourceUid);
     }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

@@ -58,23 +58,6 @@ public void eventIsSkippedChangedOnMetadataOnlyUpdate() {
         });
     }
 
-    @Test
-    public void retryConflict() {
-        initAndCleanup(true);
-        integrationTestSupport.teardownIfSuccess(() -> {
-            TestCustomResource resource = testCustomResource();
-            TestCustomResource resource2 = testCustomResource();
-            resource2.getMetadata().getAnnotations().put("test-annotation", "val");
-
-            integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).create(resource);
-            integrationTestSupport.getCrOperations().inNamespace(IntegrationTestSupport.TEST_NAMESPACE).createOrReplace(resource2);
-
-            awaitResourcesCreatedOrUpdated();
-            awaitStatusUpdated(5);
-        });
-    }
-
-
     void awaitResourcesCreatedOrUpdated() {
         await("config map created").atMost(5, TimeUnit.SECONDS)
                 .untilAsserted(() -> {

operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator;
 
-import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.Watcher;
 import io.javaoperatorsdk.operator.api.DeleteControl;
@@ -9,7 +8,6 @@
 import io.javaoperatorsdk.operator.processing.EventDispatcher;
 import io.javaoperatorsdk.operator.processing.ExecutionScope;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;

operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/EventBufferTest.java

@@ -1,7 +1,59 @@
 package io.javaoperatorsdk.operator.processing;
 
+import io.javaoperatorsdk.operator.processing.event.Event;
+import io.javaoperatorsdk.operator.processing.event.internal.TimerEvent;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 class EventBufferTest {
 
+    private EventBuffer eventBuffer = new EventBuffer();
+
+    String uid = UUID.randomUUID().toString();
+    Event testEvent1 = new TimerEvent(uid, null);
+    Event testEvent2 = new TimerEvent(uid, null);
+
+    @Test
+    public void storesEvents() {
+        eventBuffer.addEvent(testEvent1);
+        eventBuffer.addEvent(testEvent2);
+
+        assertThat(eventBuffer.containsEvents(testEvent1.getRelatedCustomResourceUid())).isTrue();
+        List<Event> events = eventBuffer.getAndRemoveEventsForExecution(uid);
+        assertThat(events).hasSize(2);
+    }
+
+    @Test
+    public void getsAndRemovesEvents() {
+        eventBuffer.addEvent(testEvent1);
+        eventBuffer.addEvent(testEvent2);
+
+        List<Event> events = eventBuffer.getAndRemoveEventsForExecution(uid);
+        assertThat(events).hasSize(2);
+        assertThat(events).contains(testEvent1,testEvent2);
+    }
+
+    @Test
+    public void checksIfThereAreStoredEvents() {
+        eventBuffer.addEvent(testEvent1);
+        eventBuffer.addEvent(testEvent2);
+
+        assertThat(eventBuffer.containsEvents(testEvent1.getRelatedCustomResourceUid())).isTrue();
+    }
+
+    @Test
+    public void canClearEvents() {
+        eventBuffer.addEvent(testEvent1);
+        eventBuffer.addEvent(testEvent2);
+
+        eventBuffer.cleanup(uid);
+
+        assertThat(eventBuffer.containsEvents(testEvent1.getRelatedCustomResourceUid())).isFalse();
+    }
+
 }