diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt index e0887ab672ef278b57116e133611cb128f10233d..9b23f5eca4035d5da1266bdc020f05dc3bb131fe 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/flow/HotDataFlowTest.kt @@ -1,7 +1,7 @@ package de.rki.coronawarnapp.util.flow -import io.kotest.assertions.throwables.shouldThrow import de.rki.coronawarnapp.util.mutate +import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe import io.kotest.matchers.types.instanceOf import io.mockk.coEvery @@ -85,7 +85,7 @@ class HotDataFlowTest : BaseTest() { ) testScope.apply { - runBlockingTest2(permanentJobs = true) { + runBlockingTest2(ignoreActive = true) { hotData.data.first() shouldBe "Test" hotData.data.first() shouldBe "Test" } @@ -108,7 +108,7 @@ class HotDataFlowTest : BaseTest() { ) testScope.apply { - runBlockingTest2(permanentJobs = true) { + runBlockingTest2(ignoreActive = true) { hotData.data.first() shouldBe "Test" hotData.data.first() shouldBe "Test" } @@ -231,7 +231,7 @@ class HotDataFlowTest : BaseTest() { sharingBehavior = SharingStarted.Lazily ) - testScope.runBlockingTest2(permanentJobs = true) { + testScope.runBlockingTest2(ignoreActive = true) { val sub1 = hotData.data.test(tag = "sub1", startOnScope = this) val sub2 = hotData.data.test(tag = "sub2", startOnScope = this) val sub3 = hotData.data.test(tag = "sub3", startOnScope = this) @@ -252,7 +252,7 @@ class HotDataFlowTest : BaseTest() { } @Test - fun `update queue is wiped on completion`() = runBlockingTest2(permanentJobs = true) { + fun `update queue is wiped on completion`() = runBlockingTest2(ignoreActive = true) { val valueProvider = mockk<suspend CoroutineScope.() -> Long>() coEvery { valueProvider.invoke(any()) } returns 1 diff --git a/Corona-Warn-App/src/test/java/testhelpers/coroutines/TestExtensions.kt b/Corona-Warn-App/src/test/java/testhelpers/coroutines/TestExtensions.kt index 375adf36e462e42753b985160ba5062cbcdc3397..68d1ba19c174d4bb013eb4bcba609566a31cafdf 100644 --- a/Corona-Warn-App/src/test/java/testhelpers/coroutines/TestExtensions.kt +++ b/Corona-Warn-App/src/test/java/testhelpers/coroutines/TestExtensions.kt @@ -11,10 +11,10 @@ import kotlin.coroutines.EmptyCoroutineContext @ExperimentalCoroutinesApi // Since 1.2.1, tentatively till 1.3.0 fun TestCoroutineScope.runBlockingTest2( - permanentJobs: Boolean = false, + ignoreActive: Boolean = false, block: suspend TestCoroutineScope.() -> Unit ): Unit = runBlockingTest2( - ignoreActive = permanentJobs, + ignoreActive = ignoreActive, context = coroutineContext, testBody = block )