[incubator-kie-drools-6093] flaky test: org.drools.compiler.integrati…

…ontests.TimerAndCalendarFireUntilHaltTest (#6096)
apache · Sep 25, 2024 · bcc64e1 · bcc64e1
1 parent d59145e
commit bcc64e1
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/...src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarFireUntilHaltTest.java b/...src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarFireUntilHaltTest.java
@@ -109,9 +109,12 @@ public void testTimerRuleFires() throws Exception {
         startEngine();
 
         activateRule();
-        advanceTimerOneSecond();
-
         await().until(ruleHasFired("TimerRule", 1));
+
+        advanceTimerOneSecond();
+        await().until(ruleHasFired("TimerRule", 2));
+
+        stopEngine();
     }
 
     @Test(timeout = 10000)
@@ -126,14 +129,17 @@ public void testTimerRuleHaltStopsFiring() throws Exception {
                            "end";
         setupKSessionFor(drl);
         startEngine();
+
         activateRule();
-        advanceTimerOneSecond();
         await().until(ruleHasFired("TimerRule", 1));
+
+        advanceTimerOneSecond();
+        await().until(ruleHasFired("TimerRule", 2));
 
         stopEngine();
 
         advanceTimerOneSecond();
-        await().during(Duration.ofSeconds(1)).atMost(Duration.ofSeconds(2)).until(ruleHasFired("TimerRule", 1));
+        await().during(Duration.ofSeconds(1)).atMost(Duration.ofSeconds(2)).until(ruleHasFired("TimerRule", 2));
     }
 
     @Test(timeout = 10000)
@@ -148,15 +154,20 @@ public void testTimerRuleRestartsAfterStop() throws Exception {
                            "end";
         setupKSessionFor(drl);
         startEngine();
+
         activateRule();
-        advanceTimerOneSecond();
         await().until(ruleHasFired("TimerRule", 1));
+
+        advanceTimerOneSecond();
+        await().until(ruleHasFired("TimerRule", 2));
 
         stopEngine();
         startEngine();
 
         advanceTimerOneSecond();
-        await().during(Duration.ofSeconds(1)).atMost(Duration.ofSeconds(2)).until(ruleHasFired("TimerRule", 2));
+        await().during(Duration.ofSeconds(1)).atMost(Duration.ofSeconds(2)).until(ruleHasFired("TimerRule", 3));
+
+        stopEngine();
     }
 
     @Test(timeout = 10000)
@@ -171,18 +182,21 @@ public void testTimerRuleDoesRestartsIfNoLongerHolds() throws Exception {
                            "end";
         setupKSessionFor(drl);
         startEngine();
+
         activateRule();
-        advanceTimerOneSecond();
-
         await().until(ruleHasFired("TimerRule", 1));
+
+        advanceTimerOneSecond();
+        await().until(ruleHasFired("TimerRule", 2));
 
         stopEngine();
         disactivateRule();
         startEngine();
 
         advanceTimerOneSecond();
+        await().during(Duration.ofSeconds(1)).atMost(Duration.ofSeconds(2)).until(ruleHasFired("TimerRule", 2));
 
-        await().during(Duration.ofSeconds(1)).atMost(Duration.ofSeconds(2)).until(ruleHasFired("TimerRule", 1));
+        stopEngine();
     }