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

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

Merge "Add filter for Robolectric pilot tests" into udc-dev am: 9b65137e am: e58af9ff 

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



Change-Id: I0334acf2e5ea8c862cea1af73e671ece3efbde9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81da1ee0 e58af9ff

packages/SystemUI/Android.bp

+15 −3
Original line number Diff line number Diff line
@@ -228,26 +228,33 @@ filegroup { 
filegroup {

    name: "SystemUI-tests-robolectric-pilots",

    srcs: [

        /* Keyguard converted tests */

        // 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/MuteQuickAffordanceConfigTest.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/quickaffordance/VideoCameraQuickAffordanceConfigTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFingerprintAuthRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/DevicePostureRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.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/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",

        // ui

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt",
@@ -256,8 +263,13 @@ filegroup { 
        "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",

        // Keyguard helper

        "tests/src/com/android/systemui/keyguard/data/quickaffordance/FakeKeyguardQuickAffordanceConfig.kt",

        "tests/src/com/android/systemui/dump/LogBufferHelper.kt",

        "tests/src/com/android/systemui/statusbar/phone/FakeKeyguardStateController.java",

        "tests/src/com/android/systemui/keyguard/domain/quickaffordance/FakeKeyguardQuickAffordanceRegistry.kt",



        // Biometric

        /* Biometric converted tests */

        "tests/src/com/android/systemui/biometrics/BiometricTestExtensions.kt",

        "tests/src/com/android/systemui/biometrics/AuthBiometricFingerprintAndFaceViewTest.kt",

        "tests/src/com/android/systemui/biometrics/AuthBiometricFingerprintViewTest.kt",

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFingerprintAndFaceViewTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.view.View 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.R

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.google.common.truth.Truth.assertThat

import org.junit.After
@@ -43,6 +44,7 @@ import org.mockito.junit.MockitoJUnit 
@RunWith(AndroidJUnit4::class)

@RunWithLooper(setAsMainLooper = true)

@SmallTest

@RoboPilotTest

class AuthBiometricFingerprintAndFaceViewTest : SysuiTestCase() {



    @JvmField

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFingerprintViewTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.testing.TestableLooper.RunWithLooper 
import android.view.View

import androidx.test.filters.SmallTest

import com.android.systemui.R

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.google.common.truth.Truth.assertThat

import org.junit.After
@@ -40,6 +41,7 @@ import org.mockito.junit.MockitoJUnit 
@RunWith(AndroidJUnit4::class)

@RunWithLooper(setAsMainLooper = true)

@SmallTest

@RoboPilotTest

class AuthBiometricFingerprintViewTest : SysuiTestCase() {



    @JvmField

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ import com.android.internal.R; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.widget.LockPatternUtils;

import com.android.settingslib.udfps.UdfpsUtils;

import com.android.systemui.RoboPilotTest;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.biometrics.domain.interactor.BiometricPromptCredentialInteractor;

import com.android.systemui.biometrics.domain.interactor.LogContextInteractor;
@@ -120,6 +121,7 @@ import java.util.Random; 
@RunWith(AndroidJUnit4.class)

@RunWithLooper

@SmallTest

@RoboPilotTest

public class AuthControllerTest extends SysuiTestCase {



    private static final long REQUEST_ID = 22;

packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDisplayListenerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.view.Surface.Rotation; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.systemui.RoboPilotTest;

import com.android.systemui.SysuiTestCase;



import kotlin.Unit;
@@ -55,6 +56,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



@SmallTest

@RoboPilotTest

@RunWith(AndroidJUnit4.class)

@RunWithLooper(setAsMainLooper = true)

public class BiometricDisplayListenerTest extends SysuiTestCase {