Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcd38a60 authored by David Saff's avatar David Saff Committed by Android (Google) Code Review
Browse files

Merge "Try using Unconfined dispatcher in ConditionsExtensionTest" into main

parents aaf88804 8dd5dbe3
Loading
Loading
Loading
Loading
+4 −18
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.emptyFlow
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.StandardTestDispatcher
import kotlinx.coroutines.test.TestScope
import kotlinx.coroutines.test.runCurrent
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Test
@@ -25,7 +24,7 @@ class ConditionExtensionsTest : SysuiTestCase() {

    @Before
    fun setUp() {
        testScope = TestScope(StandardTestDispatcher())
        testScope = TestScope(UnconfinedTestDispatcher())
    }

    @Test
@@ -34,11 +33,9 @@ class ConditionExtensionsTest : SysuiTestCase() {
            val flow = flowOf(true)
            val condition = flow.toCondition(scope = this, Condition.START_EAGERLY)

            runCurrent()
            assertThat(condition.isConditionSet).isFalse()

            condition.start()
            runCurrent()
            assertThat(condition.isConditionSet).isTrue()
            assertThat(condition.isConditionMet).isTrue()
        }
@@ -49,11 +46,9 @@ class ConditionExtensionsTest : SysuiTestCase() {
            val flow = flowOf(false)
            val condition = flow.toCondition(scope = this, Condition.START_EAGERLY)

            runCurrent()
            assertThat(condition.isConditionSet).isFalse()

            condition.start()
            runCurrent()
            assertThat(condition.isConditionSet).isTrue()
            assertThat(condition.isConditionMet).isFalse()
        }
@@ -65,7 +60,6 @@ class ConditionExtensionsTest : SysuiTestCase() {
            val condition = flow.toCondition(scope = this, Condition.START_EAGERLY)
            condition.start()

            runCurrent()
            assertThat(condition.isConditionSet).isFalse()
            assertThat(condition.isConditionMet).isFalse()
        }
@@ -78,11 +72,10 @@ class ConditionExtensionsTest : SysuiTestCase() {
                flow.toCondition(
                    scope = this,
                    strategy = Condition.START_EAGERLY,
                    initialValue = true
                    initialValue = true,
                )
            condition.start()

            runCurrent()
            assertThat(condition.isConditionSet).isTrue()
            assertThat(condition.isConditionMet).isTrue()
        }
@@ -95,11 +88,10 @@ class ConditionExtensionsTest : SysuiTestCase() {
                flow.toCondition(
                    scope = this,
                    strategy = Condition.START_EAGERLY,
                    initialValue = false
                    initialValue = false,
                )
            condition.start()

            runCurrent()
            assertThat(condition.isConditionSet).isTrue()
            assertThat(condition.isConditionMet).isFalse()
        }
@@ -111,16 +103,13 @@ class ConditionExtensionsTest : SysuiTestCase() {
            val condition = flow.toCondition(scope = this, strategy = Condition.START_EAGERLY)
            condition.start()

            runCurrent()
            assertThat(condition.isConditionSet).isTrue()
            assertThat(condition.isConditionMet).isFalse()

            flow.value = true
            runCurrent()
            assertThat(condition.isConditionMet).isTrue()

            flow.value = false
            runCurrent()
            assertThat(condition.isConditionMet).isFalse()

            condition.stop()
@@ -131,15 +120,12 @@ class ConditionExtensionsTest : SysuiTestCase() {
        testScope.runTest {
            val flow = MutableSharedFlow<Boolean>()
            val condition = flow.toCondition(scope = this, strategy = Condition.START_EAGERLY)
            runCurrent()
            assertThat(flow.subscriptionCount.value).isEqualTo(0)

            condition.start()
            runCurrent()
            assertThat(flow.subscriptionCount.value).isEqualTo(1)

            condition.stop()
            runCurrent()
            assertThat(flow.subscriptionCount.value).isEqualTo(0)
        }
}