fix: tests

Author: metacosm

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutorTest.java

@@ -4,11 +4,14 @@
 import java.util.Collections;
 import java.util.List;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
 public class AbstractWorkflowExecutorTest {
@@ -28,24 +31,21 @@ public class AbstractWorkflowExecutorTest {
   protected List<ReconcileRecord> executionHistory =
       Collections.synchronizedList(new ArrayList<>());
 
-  public class TestDependent implements DependentResource<String, TestCustomResource> {
+  public class TestDependent extends KubernetesDependentResource<ConfigMap, TestCustomResource> {
 
     private final String name;
 
     public TestDependent(String name) {
+      super(ConfigMap.class);
       this.name = name;
     }
 
     @Override
-    public ReconcileResult<String> reconcile(TestCustomResource primary,
+    public ReconcileResult<ConfigMap> reconcile(TestCustomResource primary,
         Context<TestCustomResource> context) {
       executionHistory.add(new ReconcileRecord(this));
-      return ReconcileResult.resourceCreated(VALUE);
-    }
-
-    @Override
-    public Class<String> resourceType() {
-      return String.class;
+      return ReconcileResult
+          .resourceCreated(new ConfigMapBuilder().addToBinaryData("key", VALUE).build());
     }
 
     @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTest.java

@@ -34,7 +34,7 @@ void isNotCleanerIfNoDeleter() {
   }
 
   @Test
-  void isNotCleanerIfNoGarbageCollected() {
+  void isNotCleanerIfGarbageCollected() {
     assertThat(managedWorkflow(createDRSWithTraits(NAME, GarbageCollected.class))
         .isCleaner()).isFalse();
   }
@@ -45,12 +45,6 @@ void isCleanerIfHasDeleter() {
     assertThat(managedWorkflow(spec).isCleaner()).isTrue();
   }
 
-  @Test
-  void isNotCleanerIfDeleterIsGarbageCollected() {
-    var spec = createDRSWithTraits(NAME, Deleter.class, GarbageCollected.class);
-    assertThat(managedWorkflow(spec).isCleaner()).isFalse();
-  }
-
   ManagedWorkflow managedWorkflow(DependentResourceSpec... specs) {
     final var configuration = mock(ControllerConfiguration.class);
     final var specList = List.of(specs);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowTestUtils.java

@@ -1,11 +1,13 @@
 package io.javaoperatorsdk.operator.processing.dependent.workflow;
 
+import java.util.Arrays;
 import java.util.Set;
 
 import org.mockito.Mockito;
 
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.processing.dependent.EmptyTestDependentResource;
 
 import static org.mockito.Mockito.mock;
@@ -23,11 +25,19 @@ public static DependentResourceSpec createDRS(String name, String... dependOns)
 
   public static DependentResourceSpec createDRSWithTraits(String name,
       Class<?>... dependentResourceTraits) {
-    final var drs = createDRS(name);
-    final var spy = Mockito.spy(drs);
-    when(spy.getDependentResource())
-        .thenReturn(
-            mock(DependentResource.class, withSettings().extraInterfaces(dependentResourceTraits)));
+    final var spy = Mockito.mock(DependentResourceSpec.class);
+    when(spy.getName()).thenReturn(name);
+
+    Class<? extends DependentResource> toMock = DependentResource.class;
+    final var garbageCollected = dependentResourceTraits != null &&
+        Arrays.asList(dependentResourceTraits).contains(GarbageCollected.class);
+
+    final var dr = mock(toMock, withSettings().extraInterfaces(dependentResourceTraits));
+    // it would be better to call the real method here but it doesn't work because
+    // KubernetesDependentResource checks for GarbageCollected trait when instantiated which doesn't
+    // happen when using mocks
+    when(dr.isDeletable()).thenReturn(!garbageCollected);
+    when(spy.getDependentResource()).thenReturn(dr);
     return spy;
   }