Replace Thread.sleep() with await().untilAsserted().

open-telemetry · Sep 16, 2024 · b6c022c · b6c022c
1 parent 81ce005
commit b6c022c
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/context/src/test/java/io/opentelemetry/context/ContextTest.java b/context/src/test/java/io/opentelemetry/context/ContextTest.java
@@ -667,7 +667,7 @@ void scheduleCallable() {
     }
 
     @Test
-    void scheduleAtFixedRate() throws Exception {
+    void scheduleAtFixedRate() {
       LongAdder longAdder = new LongAdder();
       Runnable runnable =
           () -> {
@@ -676,14 +676,18 @@ void scheduleAtFixedRate() throws Exception {
           };
       Future<?> future = wrapped.scheduleAtFixedRate(runnable, 1L, 2L, TimeUnit.NANOSECONDS);
       assertThat(future).isNotNull();
-      Thread.sleep(5L);
-      future.cancel(true);
+      await().await().untilAsserted(() -> {
+        if (!future.isCancelled()) {
+          future.cancel(true);
+        }
+        assertThat(longAdder.intValue()).isGreaterThan(1);
+      });
       assertThat(longAdder.intValue()).isGreaterThan(1);
       assertThat(value).hasValue("cat");
     }
 
     @Test
-    void scheduleWithFixedDelay() throws Exception {
+    void scheduleWithFixedDelay() {
       LongAdder longAdder = new LongAdder();
       Runnable runnable =
           () -> {
@@ -692,9 +696,12 @@ void scheduleWithFixedDelay() throws Exception {
           };
       Future<?> future = wrapped.scheduleWithFixedDelay(runnable, 1L, 2L, TimeUnit.NANOSECONDS);
       assertThat(future).isNotNull();
-      Thread.sleep(5L);
-      future.cancel(true);
-      assertThat(longAdder.intValue()).isGreaterThan(1);
+      await().await().untilAsserted(() -> {
+        if (!future.isCancelled()) {
+          future.cancel(true);
+        }
+        assertThat(longAdder.intValue()).isGreaterThan(1);
+      });
       assertThat(value).hasValue("cat");
     }
   }