Fix test race-condition

Author: kagkarlsson

db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/helper/ExecutionCompletedCondition.java

@@ -1,6 +1,8 @@
 package com.github.kagkarlsson.scheduler.helper;
 
 import com.github.kagkarlsson.scheduler.stats.StatsRegistry;
+import com.github.kagkarlsson.scheduler.task.ExecutionComplete;
+import com.github.kagkarlsson.scheduler.task.ExecutionComplete.Result;
 import java.util.concurrent.CountDownLatch;
 import org.slf4j.LoggerFactory;
 
@@ -32,10 +34,13 @@ public void apply(StatsRegistry.SchedulerStatsEvent e) {}
   public void apply(StatsRegistry.CandidateStatsEvent e) {}
 
   @Override
-  public void apply(StatsRegistry.ExecutionStatsEvent e) {
-    if (e == StatsRegistry.ExecutionStatsEvent.COMPLETED) {
+  public void apply(StatsRegistry.ExecutionStatsEvent e) {}
+
+  @Override
+  public void applyExecutionComplete(ExecutionComplete complete) {
+    if (complete.getResult() == Result.OK) {
       LoggerFactory.getLogger(ExecutionCompletedCondition.class)
-          .debug("Received event execution-completed, counting down");
+        .debug("Received event execution-completed, counting down");
       completed.countDown();
     }
   }

db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/helper/RanExecuteDueCondition.java

@@ -1,6 +1,7 @@
 package com.github.kagkarlsson.scheduler.helper;
 
 import com.github.kagkarlsson.scheduler.stats.StatsRegistry;
+import com.github.kagkarlsson.scheduler.task.ExecutionComplete;
 import java.util.concurrent.CountDownLatch;
 import org.slf4j.LoggerFactory;
 
@@ -39,4 +40,7 @@ public void apply(StatsRegistry.CandidateStatsEvent e) {}
 
   @Override
   public void apply(StatsRegistry.ExecutionStatsEvent e) {}
+
+  @Override
+  public void applyExecutionComplete(ExecutionComplete complete) {}
 }

db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/helper/RanUpdateHeartbeatsCondition.java

@@ -2,6 +2,7 @@
 
 import com.github.kagkarlsson.scheduler.stats.StatsRegistry;
 import com.github.kagkarlsson.scheduler.stats.StatsRegistry.SchedulerStatsEvent;
+import com.github.kagkarlsson.scheduler.task.ExecutionComplete;
 import java.util.concurrent.CountDownLatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,4 +42,7 @@ public void apply(StatsRegistry.CandidateStatsEvent e) {}
 
   @Override
   public void apply(StatsRegistry.ExecutionStatsEvent e) {}
+
+  @Override
+  public void applyExecutionComplete(ExecutionComplete complete) {}
 }

db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/helper/TestableRegistry.java

@@ -61,6 +61,7 @@ public void register(ExecutionStatsEvent e) {
 
   @Override
   public void registerSingleCompletedExecution(ExecutionComplete completeEvent) {
+    applyToConditions(completeEvent);
     completed.add(completeEvent);
     log(completeEvent);
   }
@@ -95,6 +96,11 @@ private void applyToConditions(ExecutionStatsEvent e) {
     waitConditions.forEach(c -> c.apply(e));
   }
 
+  private void applyToConditions(ExecutionComplete complete) {
+    waitConditions.forEach(c -> c.applyExecutionComplete(complete));
+  }
+
+
   private void countEvent(Enum e) {
     String key = counterKey(e.getClass(), e.name());
     AtomicLong counter = counters.get(key);
@@ -146,6 +152,8 @@ public interface Condition {
     void apply(CandidateStatsEvent e);
 
     void apply(ExecutionStatsEvent e);
+
+    void applyExecutionComplete(ExecutionComplete complete);
   }
 
   public static class Builder {