fix: tests

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutor.java

@@ -77,8 +77,10 @@ private synchronized void handleReconcileOrDelete(
 
     if (onlyReconcileForPossibleDelete) {
       reconcileConditionOrParentsConditionNotMet.add(dependentResourceNode);
-    } else if (dependentResourceNode.getReconcileCondition().isPresent()) {
-      handleReconcileCondition(dependentResourceNode);
+    } else {
+      dependentResourceNode.getReconcileCondition()
+          .ifPresent(reconcileCondition -> handleReconcileCondition(dependentResourceNode,
+              reconcileCondition));
     }
 
     Future<?> nodeFuture =
@@ -107,8 +109,7 @@ private boolean ownOrParentsReconcileConditionNotMet(
       DependentResourceNode<?, ?> dependentResourceNode) {
     return reconcileConditionOrParentsConditionNotMet.contains(dependentResourceNode) ||
         dependentResourceNode.getDependsOn().stream()
-            .anyMatch(dependsOnRelation -> reconcileConditionOrParentsConditionNotMet
-                .contains(dependsOnRelation.getDependsOn()));
+            .anyMatch(reconcileConditionOrParentsConditionNotMet::contains);
   }
 
   private class NodeExecutor implements Runnable {
@@ -170,9 +171,8 @@ private boolean alreadyReconciled(
   }
 
 
-  private void handleReconcileCondition(DependentResourceNode<?, ?> dependentResourceNode) {
-    ReconcileCondition<P> reconcileCondition =
-        (ReconcileCondition<P>) dependentResourceNode.getReconcileCondition().get();
+  private void handleReconcileCondition(DependentResourceNode<?, ?> dependentResourceNode,
+      ReconcileCondition reconcileCondition) {
     boolean conditionMet =
         reconcileCondition.isMet(dependentResourceNode.getDependentResource(), primary, context);
     if (!conditionMet) {
@@ -191,6 +191,6 @@ private boolean hasErroredDependOn(
       DependentResourceNode<?, ?> dependentResourceNode) {
     return !dependentResourceNode.getDependsOn().isEmpty()
         && dependentResourceNode.getDependsOn().stream()
-            .anyMatch(dependsOnRelation -> errored.contains(dependsOnRelation.getDependsOn()));
+            .anyMatch(errored::contains);
   }
 }

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

@@ -74,8 +74,8 @@ public ExecutionAssert reconciledInOrder(DependentResource<?, ?>... dependentRes
   }
 
   public ExecutionAssert notReconciled(DependentResource<?, ?>... dependentResources) {
-    for (int i = 0; i < dependentResources.length - 1; i++) {
-      if (!getActualDependentResources().contains(dependentResources[i])) {
+    for (int i = 0; i < dependentResources.length; i++) {
+      if (getActualDependentResources().contains(dependentResources[i])) {
         failWithMessage("Resource was reconciled: %s with index %d", dependentResources, i);
       }
     }

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

@@ -101,7 +101,7 @@ void exceptionHandlingSimpleCases() {
         .build();
     assertThrows(AggregatedOperatorException.class,
         () -> workflow.reconcile(new TestCustomResource(), null));
-    assertThat(executionHistory).notReconciled(drError);
+    assertThat(executionHistory).reconciled(drError);
   }
 
   @Test
@@ -114,7 +114,25 @@ void dependentsOnErroredResourceNotReconciled() {
     assertThrows(AggregatedOperatorException.class,
         () -> workflow.reconcile(new TestCustomResource(), null));
 
-    assertThat(executionHistory).reconciled(dr1).notReconciled(drError, dr2);
+    assertThat(executionHistory).reconciled(dr1, drError).notReconciled(dr2);
+  }
+
+  @Test
+  void oneBranchErrorsOtherCompletes() {
+    TestDependent dr3 = new TestDependent("DR_3");
+
+    var workflow = new WorkflowBuilder<TestCustomResource>()
+        .addDependent(dr1).build()
+        .addDependent(drError).dependsOn(dr1).build()
+        .addDependent(dr2).dependsOn(dr1).build()
+        .addDependent(dr3).dependsOn(dr2).build()
+        .build();
+
+    assertThrows(AggregatedOperatorException.class,
+        () -> workflow.reconcile(new TestCustomResource(), null));
+
+    assertThat(executionHistory).reconciledInOrder(dr1, dr2, dr3);
+    assertThat(executionHistory).reconciledInOrder(dr1, drError);
   }
 
   @Test
@@ -145,6 +163,21 @@ void simpleReconcileCondition() {
     assertThat(executionHistory).deleted(drDeleter);
   }
 
+  @Test
+  void triangleOnceConditionNotMet() {
+    var workflow = new WorkflowBuilder<TestCustomResource>()
+        .addDependent(dr1).build()
+        .addDependent(dr2).dependsOn(dr1).build()
+        .addDependent(drDeleter).withReconcileCondition(not_met_reconcile_condition).dependsOn(dr1)
+        .build()
+        .build();
+
+    workflow.reconcile(new TestCustomResource(), null);
+
+    assertThat(executionHistory).reconciledInOrder(dr1, dr2);
+    assertThat(executionHistory).deleted(drDeleter);
+  }
+
   @Test
   void reconcileConditionTransitiveDelete() {
     TestDeleterDependent drDeleter2 = new TestDeleterDependent("DR_DELETER_2");