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

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

Revert "Convert Keyguard tests to Robolectric tests" am: 122768bf am: 49da8b69 

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



Change-Id: I13a15db660acaebfc50fbc51c5ffcdccaef25ce7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76699350 49da8b69

packages/SystemUI/Android.bp

+1 −60
Original line number Diff line number Diff line
@@ -223,45 +223,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: [
@@ -376,16 +337,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",

    ],
@@ -399,9 +352,6 @@ android_app { 
    certificate: "platform",

    privileged: true,

    resource_dirs: [],

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



    plugins: ["dagger2-compiler"],

}



android_robolectric_test {
@@ -409,13 +359,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",
@@ -423,9 +366,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"],

}

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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