Merge pull request #824 from smallrye/bug/kotlin-flow-cancellation-fl…

…akiness Fix a Kotlin test timing issue due to slow starting coroutines
smallrye · Jan 24, 2022 · c583ae4 · c583ae4
2 parents 2ba56ec + 75f9166
commit c583ae4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/kotlin/src/test/kotlin/io/smallrye/mutiny/coroutines/FlowAsMultiTest.kt b/kotlin/src/test/kotlin/io/smallrye/mutiny/coroutines/FlowAsMultiTest.kt
@@ -13,6 +13,8 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import org.assertj.core.api.Assertions.assertThat
+import org.awaitility.Awaitility
+import org.awaitility.Awaitility.await
 
 class FlowAsMultiTest {
 
@@ -75,8 +77,12 @@ class FlowAsMultiTest {
     @Test
     fun `verify that coroutine cancellation result in failure`() {
         testBlocking {
+            Awaitility.pollInSameThread()
+            val ready = AtomicBoolean()
+
             // Given
             val flow = flow<UUID> {
+                ready.set(true)
                 delay(200)
                 emit(UUID.randomUUID())
             }
@@ -86,9 +92,8 @@ class FlowAsMultiTest {
             val job = launch {
                 flow.asMulti().subscribe().withSubscriber(subscriber)
             }
-            delay(50)
+            await().untilTrue(ready)
             job.cancel(CancellationException("abort"))
-            Thread.sleep(350)
 
             // Then
             subscriber.awaitFailure().assertFailedWith(CancellationException::class.java, "abort")