summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-02 20:32:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 20:32:34 +0000
commit814fe9eca0a4df93a94c8e42e7f6be25cfdb5027 (patch)
tree409e92068b3a30a6afb93618679fbaf23f2539c3
parent653c53fd24161aee958e08d09032e05a3af117b1 (diff)
parentd219d85f82d31e5de21e710b7f6b13037a8d8b73 (diff)
Merge "Fixes failing test after coroutine lib upgrade." into udc-dev-plus-aosp am: d219d85f82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24248080 Change-Id: Ifa58433e0f2012e50d1ede763a6224b566bbc1b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/retail/data/repository/RetailModeSettingsRepositoryTest.kt4
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/retail/data/repository/RetailModeSettingsRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/retail/data/repository/RetailModeSettingsRepositoryTest.kt
index d7682b20a98d..421c35595026 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/retail/data/repository/RetailModeSettingsRepositoryTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/retail/data/repository/RetailModeSettingsRepositoryTest.kt
@@ -26,6 +26,7 @@ import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.StandardTestDispatcher
import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
import kotlinx.coroutines.test.runTest
import org.junit.Test
import org.junit.runner.RunWith
@@ -51,6 +52,7 @@ class RetailModeSettingsRepositoryTest : SysuiTestCase() {
fun retailMode_defaultFalse() =
testScope.runTest {
val value by collectLastValue(underTest.retailMode)
+ runCurrent()
assertThat(value).isFalse()
assertThat(underTest.inRetailMode).isFalse()
@@ -60,6 +62,7 @@ class RetailModeSettingsRepositoryTest : SysuiTestCase() {
fun retailMode_false() =
testScope.runTest {
val value by collectLastValue(underTest.retailMode)
+ runCurrent()
globalSettings.putInt(SETTING, 0)
@@ -71,6 +74,7 @@ class RetailModeSettingsRepositoryTest : SysuiTestCase() {
fun retailMode_true() =
testScope.runTest {
val value by collectLastValue(underTest.retailMode)
+ runCurrent()
globalSettings.putInt(SETTING, 1)