Revert "Convert Keyguard tests to Robolectric tests"
This reverts commit cff46f1fa0.
Reason for revert: errorprone broken with RequiresPermissionChecker, will revert the revert with the fix
Change-Id: I9366e6d5139c447b73d3479927a9350d7793a06f
This commit is contained in:
@@ -204,45 +204,6 @@ filegroup {
|
||||
path: "tests/utils/src",
|
||||
}
|
||||
|
||||
filegroup {
|
||||
name: "SystemUI-tests-robolectric-pilots",
|
||||
srcs: [
|
||||
// data
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfigTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfigTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/FakeKeyguardQuickAffordanceConfig.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfigTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfigTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceRemoteUserSelectionManagerTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfigTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt",
|
||||
// domain
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/quickaffordance/FakeKeyguardQuickAffordanceRegistry.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt",
|
||||
// ui
|
||||
"tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModelTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt",
|
||||
"tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt",
|
||||
],
|
||||
path: "tests/src",
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "SystemUI-tests-concurrency",
|
||||
srcs: [
|
||||
@@ -354,16 +315,8 @@ android_app {
|
||||
defaults: [
|
||||
"platform_app_defaults",
|
||||
"SystemUI_app_defaults",
|
||||
"SystemUI_compose_defaults",
|
||||
],
|
||||
manifest: "tests/AndroidManifest-base.xml",
|
||||
|
||||
srcs: [
|
||||
"src/**/*.kt",
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
":ReleaseJavaFiles",
|
||||
],
|
||||
static_libs: [
|
||||
"SystemUI-tests-base",
|
||||
],
|
||||
@@ -377,9 +330,6 @@ android_app {
|
||||
certificate: "platform",
|
||||
privileged: true,
|
||||
resource_dirs: [],
|
||||
kotlincflags: ["-Xjvm-default=all"],
|
||||
|
||||
plugins: ["dagger2-compiler"],
|
||||
}
|
||||
|
||||
android_robolectric_test {
|
||||
@@ -387,13 +337,6 @@ android_robolectric_test {
|
||||
srcs: [
|
||||
"tests/robolectric/src/**/*.kt",
|
||||
"tests/robolectric/src/**/*.java",
|
||||
":SystemUI-tests-utils",
|
||||
":SystemUI-tests-robolectric-pilots",
|
||||
],
|
||||
static_libs: [
|
||||
"androidx.test.uiautomator_uiautomator",
|
||||
"androidx.test.ext.junit",
|
||||
"inline-mockito-robolectric-prebuilt",
|
||||
],
|
||||
libs: [
|
||||
"android.test.runner",
|
||||
@@ -401,9 +344,7 @@ android_robolectric_test {
|
||||
"android.test.mock",
|
||||
"truth-prebuilt",
|
||||
],
|
||||
|
||||
upstream: true,
|
||||
|
||||
kotlincflags: ["-Xjvm-default=enable"],
|
||||
instrumentation_for: "SystemUIRobo-stub",
|
||||
java_resource_dirs: ["tests/robolectric/config"],
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ package com.android.systemui.keyguard.data.quickaffordance
|
||||
import android.app.StatusBarManager
|
||||
import android.content.Context
|
||||
import android.content.pm.PackageManager
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.camera.CameraGestureHelper
|
||||
@@ -32,13 +31,14 @@ import org.junit.Assert.assertEquals
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class CameraQuickAffordanceConfigTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var cameraGestureHelper: CameraGestureHelper
|
||||
|
||||
@@ -22,7 +22,6 @@ import android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
|
||||
import android.provider.Settings.Global.ZEN_MODE_OFF
|
||||
import android.provider.Settings.Secure.ZEN_DURATION_FOREVER
|
||||
import android.provider.Settings.Secure.ZEN_DURATION_PROMPT
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.settingslib.notification.EnableZenModeDialog
|
||||
import com.android.systemui.R
|
||||
@@ -52,6 +51,7 @@ import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentCaptor
|
||||
import org.mockito.Captor
|
||||
import org.mockito.Mock
|
||||
@@ -60,7 +60,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class DoNotDisturbQuickAffordanceConfigTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var zenModeController: ZenModeController
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
package com.android.systemui.keyguard.data.quickaffordance
|
||||
|
||||
import android.content.Context
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.common.shared.model.Icon
|
||||
@@ -36,12 +35,13 @@ import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class FlashlightQuickAffordanceConfigTest : LeakCheckedTest() {
|
||||
|
||||
@Mock private lateinit var context: Context
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.data.quickaffordance
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -35,12 +34,13 @@ import kotlinx.coroutines.test.runBlockingTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.`when` as whenever
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class HomeControlsKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var component: ControlsComponent
|
||||
|
||||
@@ -20,7 +20,6 @@ package com.android.systemui.keyguard.data.quickaffordance
|
||||
import android.content.Context
|
||||
import android.content.res.Resources
|
||||
import android.provider.Settings
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -41,6 +40,7 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentMatchers.anyInt
|
||||
import org.mockito.ArgumentMatchers.anyString
|
||||
import org.mockito.Mock
|
||||
@@ -48,7 +48,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var sharedPrefs: FakeSharedPreferences
|
||||
|
||||
@@ -20,7 +20,6 @@ package com.android.systemui.keyguard.data.quickaffordance
|
||||
import android.content.Intent
|
||||
import android.content.SharedPreferences
|
||||
import android.content.pm.UserInfo
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -41,6 +40,7 @@ import org.junit.After
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentMatchers.anyInt
|
||||
import org.mockito.ArgumentMatchers.anyString
|
||||
import org.mockito.Mock
|
||||
@@ -51,7 +51,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var userFileManager: UserFileManager
|
||||
|
||||
@@ -19,7 +19,6 @@ package com.android.systemui.keyguard.data.quickaffordance
|
||||
|
||||
import android.content.pm.UserInfo
|
||||
import android.os.UserHandle
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.settings.FakeUserTracker
|
||||
@@ -38,12 +37,13 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardQuickAffordanceRemoteUserSelectionManagerTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var userHandle: UserHandle
|
||||
|
||||
@@ -21,7 +21,6 @@ import android.content.Context
|
||||
import android.media.AudioManager
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.flags.FeatureFlags
|
||||
@@ -48,6 +47,7 @@ import org.junit.Assert.assertEquals
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.Mockito.verifyZeroInteractions
|
||||
@@ -55,8 +55,8 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
class MuteQuickAffordanceCoreStartableTest : SysuiTestCase() {
|
||||
@RunWith(JUnit4::class)
|
||||
class MuteQuickAffordanceCoreStartableTest : SysuiTestCase() {
|
||||
|
||||
@Mock
|
||||
private lateinit var featureFlags: FeatureFlags
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
package com.android.systemui.keyguard.data.quickaffordance
|
||||
|
||||
import android.content.Intent
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig.OnTriggeredResult
|
||||
@@ -34,12 +33,13 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class QrCodeScannerKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var controller: QRCodeScannerController
|
||||
|
||||
@@ -20,7 +20,6 @@ package com.android.systemui.keyguard.data.quickaffordance
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.service.quickaccesswallet.GetWalletCardsResponse
|
||||
import android.service.quickaccesswallet.QuickAccessWalletClient
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -42,13 +41,14 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var walletController: QuickAccessWalletController
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.data.quickaffordance
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.ActivityIntentHelper
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -33,6 +32,7 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentMatchers.anyBoolean
|
||||
import org.mockito.ArgumentMatchers.anyInt
|
||||
import org.mockito.Mock
|
||||
@@ -40,7 +40,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class VideoCameraQuickAffordanceConfigTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var activityIntentHelper: ActivityIntentHelper
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.data.repository
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.keyguard.ViewMediatorCallback
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -27,12 +26,13 @@ import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardBouncerRepositoryTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var systemClock: SystemClock
|
||||
|
||||
@@ -19,11 +19,9 @@ package com.android.systemui.keyguard.data.repository
|
||||
|
||||
import android.content.pm.UserInfo
|
||||
import android.os.UserHandle
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.R
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.coroutines.collectLastValue
|
||||
import com.android.systemui.keyguard.data.quickaffordance.FakeKeyguardQuickAffordanceConfig
|
||||
import com.android.systemui.keyguard.data.quickaffordance.FakeKeyguardQuickAffordanceProviderClientFactory
|
||||
import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig
|
||||
@@ -41,19 +39,23 @@ import com.android.systemui.util.mockito.mock
|
||||
import com.android.systemui.util.mockito.whenever
|
||||
import com.android.systemui.util.settings.FakeSettings
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.StandardTestDispatcher
|
||||
import kotlinx.coroutines.test.TestScope
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import kotlinx.coroutines.yield
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentMatchers.anyInt
|
||||
import org.mockito.ArgumentMatchers.anyString
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
|
||||
private lateinit var underTest: KeyguardQuickAffordanceRepository
|
||||
@@ -63,14 +65,12 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
private lateinit var userTracker: FakeUserTracker
|
||||
private lateinit var client1: FakeCustomizationProviderClient
|
||||
private lateinit var client2: FakeCustomizationProviderClient
|
||||
private lateinit var testScope: TestScope
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
config1 = FakeKeyguardQuickAffordanceConfig(FakeCustomizationProviderClient.AFFORDANCE_1)
|
||||
config2 = FakeKeyguardQuickAffordanceConfig(FakeCustomizationProviderClient.AFFORDANCE_2)
|
||||
val testDispatcher = StandardTestDispatcher()
|
||||
testScope = TestScope(testDispatcher)
|
||||
val scope = CoroutineScope(IMMEDIATE)
|
||||
userTracker = FakeUserTracker()
|
||||
val localUserSelectionManager =
|
||||
KeyguardQuickAffordanceLocalUserSelectionManager(
|
||||
@@ -93,7 +93,7 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
client2 = FakeCustomizationProviderClient()
|
||||
val remoteUserSelectionManager =
|
||||
KeyguardQuickAffordanceRemoteUserSelectionManager(
|
||||
scope = testScope.backgroundScope,
|
||||
scope = scope,
|
||||
userTracker = userTracker,
|
||||
clientFactory =
|
||||
FakeKeyguardQuickAffordanceProviderClientFactory(
|
||||
@@ -116,14 +116,14 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
underTest =
|
||||
KeyguardQuickAffordanceRepository(
|
||||
appContext = context,
|
||||
scope = testScope.backgroundScope,
|
||||
scope = scope,
|
||||
localUserSelectionManager = localUserSelectionManager,
|
||||
remoteUserSelectionManager = remoteUserSelectionManager,
|
||||
userTracker = userTracker,
|
||||
legacySettingSyncer =
|
||||
KeyguardQuickAffordanceLegacySettingSyncer(
|
||||
scope = testScope.backgroundScope,
|
||||
backgroundDispatcher = testDispatcher,
|
||||
scope = scope,
|
||||
backgroundDispatcher = IMMEDIATE,
|
||||
secureSettings = FakeSettings(),
|
||||
selectionsManager = localUserSelectionManager,
|
||||
),
|
||||
@@ -135,14 +135,15 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun setSelections() =
|
||||
testScope.runTest {
|
||||
val configsBySlotId = collectLastValue(underTest.selections)
|
||||
runBlocking(IMMEDIATE) {
|
||||
var configsBySlotId: Map<String, List<KeyguardQuickAffordanceConfig>>? = null
|
||||
val job = underTest.selections.onEach { configsBySlotId = it }.launchIn(this)
|
||||
val slotId1 = "slot1"
|
||||
val slotId2 = "slot2"
|
||||
|
||||
underTest.setSelections(slotId1, listOf(config1.key))
|
||||
assertSelections(
|
||||
configsBySlotId(),
|
||||
configsBySlotId,
|
||||
mapOf(
|
||||
slotId1 to listOf(config1),
|
||||
),
|
||||
@@ -150,7 +151,7 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
|
||||
underTest.setSelections(slotId2, listOf(config2.key))
|
||||
assertSelections(
|
||||
configsBySlotId(),
|
||||
configsBySlotId,
|
||||
mapOf(
|
||||
slotId1 to listOf(config1),
|
||||
slotId2 to listOf(config2),
|
||||
@@ -160,17 +161,19 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
underTest.setSelections(slotId1, emptyList())
|
||||
underTest.setSelections(slotId2, listOf(config1.key))
|
||||
assertSelections(
|
||||
configsBySlotId(),
|
||||
configsBySlotId,
|
||||
mapOf(
|
||||
slotId1 to emptyList(),
|
||||
slotId2 to listOf(config1),
|
||||
),
|
||||
)
|
||||
|
||||
job.cancel()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getAffordancePickerRepresentations() =
|
||||
testScope.runTest {
|
||||
runBlocking(IMMEDIATE) {
|
||||
assertThat(underTest.getAffordancePickerRepresentations())
|
||||
.isEqualTo(
|
||||
listOf(
|
||||
@@ -223,7 +226,7 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun `selections for secondary user`() =
|
||||
testScope.runTest {
|
||||
runBlocking(IMMEDIATE) {
|
||||
userTracker.set(
|
||||
userInfos =
|
||||
listOf(
|
||||
@@ -249,10 +252,12 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
|
||||
affordanceId = FakeCustomizationProviderClient.AFFORDANCE_2,
|
||||
)
|
||||
val observed = collectLastValue(underTest.selections)
|
||||
val observed = mutableListOf<Map<String, List<KeyguardQuickAffordanceConfig>>>()
|
||||
val job = underTest.selections.onEach { observed.add(it) }.launchIn(this)
|
||||
yield()
|
||||
|
||||
assertSelections(
|
||||
observed = observed(),
|
||||
observed = observed.last(),
|
||||
expected =
|
||||
mapOf(
|
||||
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START to
|
||||
@@ -261,6 +266,8 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
),
|
||||
)
|
||||
)
|
||||
|
||||
job.cancel()
|
||||
}
|
||||
|
||||
private fun assertSelections(
|
||||
@@ -276,6 +283,7 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val IMMEDIATE = Dispatchers.Main.immediate
|
||||
private const val SECONDARY_USER_1 = UserHandle.MIN_SECONDARY_USER_ID + 1
|
||||
private const val SECONDARY_USER_2 = UserHandle.MIN_SECONDARY_USER_ID + 2
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ package com.android.systemui.keyguard.data.repository
|
||||
|
||||
import android.graphics.Point
|
||||
import android.hardware.biometrics.BiometricSourceType
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.keyguard.KeyguardUpdateMonitor
|
||||
import com.android.keyguard.KeyguardUpdateMonitorCallback
|
||||
@@ -55,12 +54,13 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardRepositoryImplTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var statusBarStateController: StatusBarStateController
|
||||
|
||||
@@ -20,7 +20,6 @@ import android.animation.ValueAnimator
|
||||
import android.util.Log
|
||||
import android.util.Log.TerribleFailure
|
||||
import android.util.Log.TerribleFailureHandler
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.animation.Interpolators
|
||||
@@ -44,9 +43,10 @@ import org.junit.After
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardTransitionRepositoryTest : SysuiTestCase() {
|
||||
|
||||
private lateinit var underTest: KeyguardTransitionRepository
|
||||
|
||||
@@ -18,7 +18,6 @@ package com.android.systemui.keyguard.data.repository
|
||||
|
||||
import android.app.trust.TrustManager
|
||||
import android.content.pm.UserInfo
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.keyguard.logging.TrustRepositoryLogger
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -34,6 +33,7 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentCaptor
|
||||
import org.mockito.Captor
|
||||
import org.mockito.Mock
|
||||
@@ -43,7 +43,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class TrustRepositoryTest : SysuiTestCase() {
|
||||
@Mock private lateinit var trustManager: TrustManager
|
||||
@Captor private lateinit var listenerCaptor: ArgumentCaptor<TrustManager.TrustListener>
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.keyguard.KeyguardUpdateMonitor
|
||||
import com.android.keyguard.ViewMediatorCallback
|
||||
@@ -37,13 +36,14 @@ import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class AlternateBouncerInteractorTest : SysuiTestCase() {
|
||||
private lateinit var underTest: AlternateBouncerInteractor
|
||||
private lateinit var bouncerRepository: KeyguardBouncerRepository
|
||||
|
||||
@@ -19,7 +19,6 @@ package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import android.app.StatusBarManager
|
||||
import android.content.Context
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.coroutines.collectLastValue
|
||||
@@ -37,12 +36,12 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardInteractorTest : SysuiTestCase() {
|
||||
private lateinit var commandQueue: FakeCommandQueue
|
||||
private lateinit var featureFlags: FakeFeatureFlags
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import android.content.Intent
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.internal.logging.UiEventLogger
|
||||
import com.android.systemui.SysuiTestCase
|
||||
@@ -40,6 +39,7 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentMatchers.anyBoolean
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.never
|
||||
@@ -48,7 +48,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardLongPressInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var activityStarter: ActivityStarter
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import android.os.UserHandle
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.internal.widget.LockPatternUtils
|
||||
import com.android.systemui.R
|
||||
@@ -61,6 +60,7 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.ArgumentMatchers.anyInt
|
||||
import org.mockito.ArgumentMatchers.anyString
|
||||
import org.mockito.Mock
|
||||
@@ -68,7 +68,7 @@ import org.mockito.MockitoAnnotations
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Mock private lateinit var lockPatternUtils: LockPatternUtils
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -30,17 +29,17 @@ import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING
|
||||
import com.android.systemui.keyguard.shared.model.TransitionState.STARTED
|
||||
import com.android.systemui.keyguard.shared.model.TransitionStep
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import kotlinx.coroutines.test.UnconfinedTestDispatcher
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
private lateinit var underTest: KeyguardTransitionInteractor
|
||||
@@ -54,7 +53,7 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun `transition collectors receives only appropriate events`() =
|
||||
runTest(UnconfinedTestDispatcher()) {
|
||||
runBlocking(IMMEDIATE) {
|
||||
var lockscreenToAodSteps = mutableListOf<TransitionStep>()
|
||||
val job1 =
|
||||
underTest.lockscreenToAodTransition
|
||||
@@ -88,9 +87,10 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun dozeAmountTransitionTest() =
|
||||
runTest(UnconfinedTestDispatcher()) {
|
||||
runBlocking(IMMEDIATE) {
|
||||
var dozeAmountSteps = mutableListOf<TransitionStep>()
|
||||
val job = underTest.dozeAmountTransition.onEach { dozeAmountSteps.add(it) }.launchIn(this)
|
||||
val job =
|
||||
underTest.dozeAmountTransition.onEach { dozeAmountSteps.add(it) }.launchIn(this)
|
||||
|
||||
val steps = mutableListOf<TransitionStep>()
|
||||
|
||||
@@ -119,9 +119,10 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun keyguardStateTests() =
|
||||
runTest(UnconfinedTestDispatcher()) {
|
||||
runBlocking(IMMEDIATE) {
|
||||
var finishedSteps = mutableListOf<KeyguardState>()
|
||||
val job = underTest.finishedKeyguardState.onEach { finishedSteps.add(it) }.launchIn(this)
|
||||
val job =
|
||||
underTest.finishedKeyguardState.onEach { finishedSteps.add(it) }.launchIn(this)
|
||||
|
||||
val steps = mutableListOf<TransitionStep>()
|
||||
|
||||
@@ -142,10 +143,12 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun finishedKeyguardTransitionStepTests() =
|
||||
runTest(UnconfinedTestDispatcher()) {
|
||||
runBlocking(IMMEDIATE) {
|
||||
var finishedSteps = mutableListOf<TransitionStep>()
|
||||
val job =
|
||||
underTest.finishedKeyguardTransitionStep.onEach { finishedSteps.add(it) }.launchIn(this)
|
||||
underTest.finishedKeyguardTransitionStep
|
||||
.onEach { finishedSteps.add(it) }
|
||||
.launchIn(this)
|
||||
|
||||
val steps = mutableListOf<TransitionStep>()
|
||||
|
||||
@@ -166,10 +169,12 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun startedKeyguardTransitionStepTests() =
|
||||
runTest(UnconfinedTestDispatcher()) {
|
||||
runBlocking(IMMEDIATE) {
|
||||
var startedSteps = mutableListOf<TransitionStep>()
|
||||
val job =
|
||||
underTest.startedKeyguardTransitionStep.onEach { startedSteps.add(it) }.launchIn(this)
|
||||
underTest.startedKeyguardTransitionStep
|
||||
.onEach { startedSteps.add(it) }
|
||||
.launchIn(this)
|
||||
|
||||
val steps = mutableListOf<TransitionStep>()
|
||||
|
||||
@@ -187,4 +192,8 @@ class KeyguardTransitionInteractorTest : SysuiTestCase() {
|
||||
|
||||
job.cancel()
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val IMMEDIATE = Dispatchers.Main.immediate
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -34,10 +33,11 @@ import org.junit.Assert.assertEquals
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class LightRevealScrimInteractorTest : SysuiTestCase() {
|
||||
private val fakeKeyguardTransitionRepository = FakeKeyguardTransitionRepository()
|
||||
private val fakeLightRevealScrimRepository = FakeLightRevealScrimRepository()
|
||||
|
||||
@@ -17,18 +17,18 @@
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import android.view.View
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class PrimaryBouncerCallbackInteractorTest : SysuiTestCase() {
|
||||
private val mPrimaryBouncerCallbackInteractor = PrimaryBouncerCallbackInteractor()
|
||||
@Mock
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.android.systemui.keyguard.domain.interactor
|
||||
|
||||
import android.os.Looper
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.keyguard.KeyguardSecurityModel
|
||||
import com.android.keyguard.KeyguardUpdateMonitor
|
||||
@@ -36,11 +35,12 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class PrimaryBouncerInteractorWithCoroutinesTest : SysuiTestCase() {
|
||||
private lateinit var repository: FakeKeyguardBouncerRepository
|
||||
@Mock private lateinit var bouncerView: BouncerView
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.ui.viewmodel
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -34,9 +33,10 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class DreamingToLockscreenTransitionViewModelTest : SysuiTestCase() {
|
||||
private lateinit var underTest: DreamingToLockscreenTransitionViewModel
|
||||
private lateinit var repository: FakeKeyguardTransitionRepository
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.ui.viewmodel
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -33,9 +32,10 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class GoneToDreamingTransitionViewModelTest : SysuiTestCase() {
|
||||
private lateinit var underTest: GoneToDreamingTransitionViewModel
|
||||
private lateinit var repository: FakeKeyguardTransitionRepository
|
||||
|
||||
@@ -16,29 +16,28 @@
|
||||
|
||||
package com.android.systemui.keyguard.ui.viewmodel
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.BouncerView
|
||||
import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor
|
||||
import com.android.systemui.keyguard.shared.model.BouncerShowMessageModel
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import kotlinx.coroutines.test.runCurrent
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
@RunWith(JUnit4::class)
|
||||
class KeyguardBouncerViewModelTest : SysuiTestCase() {
|
||||
lateinit var underTest: KeyguardBouncerViewModel
|
||||
@Mock lateinit var bouncerView: BouncerView
|
||||
@@ -52,7 +51,7 @@ class KeyguardBouncerViewModelTest : SysuiTestCase() {
|
||||
|
||||
@Test
|
||||
fun setMessage() =
|
||||
runTest {
|
||||
runBlocking(Dispatchers.Main.immediate) {
|
||||
val flow = MutableStateFlow<BouncerShowMessageModel?>(null)
|
||||
var message: BouncerShowMessageModel? = null
|
||||
Mockito.`when`(bouncerInteractor.showMessage)
|
||||
@@ -63,8 +62,6 @@ class KeyguardBouncerViewModelTest : SysuiTestCase() {
|
||||
flow.value = BouncerShowMessageModel(message = "abc", colorStateList = null)
|
||||
|
||||
val job = underTest.bouncerShowMessage.onEach { message = it }.launchIn(this)
|
||||
// Run the tasks that are pending at this point of virtual time.
|
||||
runCurrent()
|
||||
assertThat(message?.message).isEqualTo("abc")
|
||||
job.cancel()
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.ui.viewmodel
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -33,9 +32,10 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() {
|
||||
private lateinit var underTest: LockscreenToDreamingTransitionViewModel
|
||||
private lateinit var repository: FakeKeyguardTransitionRepository
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.ui.viewmodel
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -33,9 +32,10 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() {
|
||||
private lateinit var underTest: LockscreenToOccludedTransitionViewModel
|
||||
private lateinit var repository: FakeKeyguardTransitionRepository
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.systemui.keyguard.ui.viewmodel
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.SmallTest
|
||||
import com.android.systemui.SysuiTestCase
|
||||
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
|
||||
@@ -33,9 +32,10 @@ import kotlinx.coroutines.test.runTest
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
@RunWith(JUnit4::class)
|
||||
class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() {
|
||||
private lateinit var underTest: OccludedToLockscreenTransitionViewModel
|
||||
private lateinit var repository: FakeKeyguardTransitionRepository
|
||||
|
||||
@@ -49,15 +49,14 @@ public class TestableSettingsProvider extends MockContentProvider {
|
||||
}
|
||||
|
||||
void clearValuesAndCheck(Context context) {
|
||||
// Ensure we swapped over to use TestableSettingsProvider
|
||||
int userId = UserHandle.myUserId();
|
||||
mValues.put(key("global", MY_UNIQUE_KEY, userId), MY_UNIQUE_KEY);
|
||||
mValues.put(key("secure", MY_UNIQUE_KEY, userId), MY_UNIQUE_KEY);
|
||||
mValues.put(key("system", MY_UNIQUE_KEY, userId), MY_UNIQUE_KEY);
|
||||
|
||||
Settings.Global.clearProviderForTest();
|
||||
Settings.Secure.clearProviderForTest();
|
||||
Settings.System.clearProviderForTest();
|
||||
|
||||
// putString will eventually invoking the mocked call() method and update mValues
|
||||
Settings.Global.putString(context.getContentResolver(), MY_UNIQUE_KEY, MY_UNIQUE_KEY);
|
||||
Settings.Secure.putString(context.getContentResolver(), MY_UNIQUE_KEY, MY_UNIQUE_KEY);
|
||||
Settings.System.putString(context.getContentResolver(), MY_UNIQUE_KEY, MY_UNIQUE_KEY);
|
||||
// Verify that if any test is using TestableContext, they all have the correct settings
|
||||
// provider.
|
||||
assertEquals("Incorrect settings provider, test using incorrect Context?", MY_UNIQUE_KEY,
|
||||
|
||||
Reference in New Issue
Block a user