Scheduler - try to fix flaky tests

- resolves quarkusio#16532
mkouba · Apr 15, 2021 · bb6d7ed · bb6d7ed
1 parent 52a0320
commit bb6d7ed
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/...s/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledScheduledMethodTest.java b/...s/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledScheduledMethodTest.java
@@ -1,6 +1,7 @@
 package io.quarkus.quartz.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -25,8 +26,7 @@ public class DisabledScheduledMethodTest {
 
     @Test
     public void testNoSchedulerInvocations() throws InterruptedException {
-        Thread.sleep(100);
-        Jobs.LATCH.await(500, TimeUnit.MILLISECONDS);
+        assertTrue(Jobs.LATCH.await(2, TimeUnit.SECONDS));
         assertEquals(0, Jobs.executionCounter);
     }
 
@@ -46,7 +46,7 @@ void disabledByDefault() {
             executionCounter++;
         }
 
-        @Scheduled(every = "0.001s")
+        @Scheduled(every = "0.5s")
         void enabled() {
             LATCH.countDown();
         }

diff --git a/...tz/deployment/src/test/java/io/quarkus/quartz/test/PropertyDefaultValueSchedulerTest.java b/...tz/deployment/src/test/java/io/quarkus/quartz/test/PropertyDefaultValueSchedulerTest.java
@@ -29,7 +29,7 @@ public class PropertyDefaultValueSchedulerTest {
 
     @Test
     public void testDefaultIdentity() throws InterruptedException {
-        assertTrue(Jobs.LATCH.await(500, TimeUnit.MILLISECONDS), "Scheduler was not triggered");
+        assertTrue(Jobs.LATCH.await(5, TimeUnit.SECONDS), "Scheduler was not triggered");
         assertNotNull(Jobs.execution);
         final String actualIdentity = Jobs.execution.getTrigger().getId();
         assertTrue(actualIdentity.contains(EXPECTED_IDENTITY),
@@ -40,12 +40,12 @@ static class Jobs {
 
         static final CountDownLatch LATCH = new CountDownLatch(1);
 
-        static ScheduledExecution execution;
+        static volatile ScheduledExecution execution;
 
-        @Scheduled(every = "0.001s", identity = "{nonexistent:${PropertyDefaultValueSchedulerTest.default}}")
-        void trigger(ScheduledExecution execution) {
-            if (this.execution == null) {
-                this.execution = execution;
+        @Scheduled(every = "0.5s", identity = "{nonexistent:${PropertyDefaultValueSchedulerTest.default}}")
+        void trigger(ScheduledExecution exec) {
+            if (execution == null) {
+                execution = exec;
             }
             LATCH.countDown();
         }

diff --git a/...duler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledScheduledMethodTest.java b/...duler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledScheduledMethodTest.java
@@ -1,6 +1,7 @@
 package io.quarkus.scheduler.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -25,8 +26,7 @@ public class DisabledScheduledMethodTest {
 
     @Test
     public void testNoSchedulerInvocations() throws InterruptedException {
-        Thread.sleep(100);
-        Jobs.LATCH.await(500, TimeUnit.MILLISECONDS);
+        assertTrue(Jobs.LATCH.await(2, TimeUnit.SECONDS));
         assertEquals(0, Jobs.executionCounter);
     }
 
@@ -46,7 +46,7 @@ void disabledByDefault() {
             executionCounter++;
         }
 
-        @Scheduled(every = "0.001s")
+        @Scheduled(every = "0.5s")
         void enabled() {
             LATCH.countDown();
         }

diff --git a/...deployment/src/test/java/io/quarkus/scheduler/test/PropertyDefaultValueSchedulerTest.java b/...deployment/src/test/java/io/quarkus/scheduler/test/PropertyDefaultValueSchedulerTest.java
@@ -30,7 +30,7 @@ public class PropertyDefaultValueSchedulerTest {
 
     @Test
     public void testDefaultIdentity() throws InterruptedException {
-        assertTrue(Jobs.LATCH.await(500, TimeUnit.MILLISECONDS), "Scheduler was not triggered");
+        assertTrue(Jobs.LATCH.await(5, TimeUnit.SECONDS), "Scheduler was not triggered");
         assertNotNull(Jobs.execution);
         assertEquals(EXPECTED_IDENTITY, Jobs.execution.getTrigger().getId());
     }
@@ -39,12 +39,12 @@ static class Jobs {
 
         static final CountDownLatch LATCH = new CountDownLatch(1);
 
-        static ScheduledExecution execution;
+        static volatile ScheduledExecution execution;
 
-        @Scheduled(every = "0.001s", identity = "{nonexistent:${PropertyDefaultValueSchedulerTest.default}}")
-        void trigger(ScheduledExecution execution) {
-            if (this.execution == null) {
-                this.execution = execution;
+        @Scheduled(every = "0.5s", identity = "{nonexistent:${PropertyDefaultValueSchedulerTest.default}}")
+        void trigger(ScheduledExecution exec) {
+            if (execution == null) {
+                execution = exec;
             }
             LATCH.countDown();
         }