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

Commit d49e3bc0 authored by Kevin Liu's avatar Kevin Liu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Convert Keyguard tests to Robolectric tests""" into... 

Merge "Revert "Revert "Convert Keyguard tests to Robolectric tests""" into tm-qpr-dev am: 698171c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21356159



Change-Id: I65aedead75a129fe9db0751bfc7bc67d3f20ef39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1bd8dba 698171c3

packages/SystemUI/Android.bp

+60 −1
Original line number Diff line number Diff line
@@ -204,6 +204,45 @@ 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: [
@@ -318,8 +357,16 @@ 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",

    ],
@@ -333,6 +380,9 @@ android_app { 
    certificate: "platform",

    privileged: true,

    resource_dirs: [],

    kotlincflags: ["-Xjvm-default=all"],



    plugins: ["dagger2-compiler"],

}



android_robolectric_test {
@@ -340,6 +390,13 @@ 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",
@@ -347,7 +404,9 @@ android_robolectric_test { 
        "android.test.mock",

        "truth-prebuilt",

    ],

    kotlincflags: ["-Xjvm-default=enable"],



    upstream: true,



    instrumentation_for: "SystemUIRobo-stub",

    java_resource_dirs: ["tests/robolectric/config"],

}

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/CameraQuickAffordanceConfigTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 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
@@ -31,14 +32,13 @@ 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(JUnit4::class)

@RunWith(AndroidJUnit4::class)

class CameraQuickAffordanceConfigTest : SysuiTestCase() {



    @Mock private lateinit var cameraGestureHelper: CameraGestureHelper

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/DoNotDisturbQuickAffordanceConfigTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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
@@ -51,7 +52,6 @@ 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(JUnit4::class)

@RunWith(AndroidJUnit4::class)

class DoNotDisturbQuickAffordanceConfigTest : SysuiTestCase() {



    @Mock private lateinit var zenModeController: ZenModeController

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/FlashlightQuickAffordanceConfigTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
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
@@ -35,13 +36,12 @@ 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(JUnit4::class)

@RunWith(AndroidJUnit4::class)

class FlashlightQuickAffordanceConfigTest : LeakCheckedTest() {



    @Mock private lateinit var context: Context

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfigTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


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
@@ -34,13 +35,12 @@ 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(JUnit4::class)

@RunWith(AndroidJUnit4::class)

class HomeControlsKeyguardQuickAffordanceConfigTest : SysuiTestCase() {



    @Mock private lateinit var component: ControlsComponent