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

Commit 95f9e9a6 authored by Aaron Liu's avatar Aaron Liu
Browse files

Convert bouncer ui tests 

Convert tests to deviceless.

Bug: 297899448
Test: atest SystemUiRoboTests (with no device connected)

Change-Id: I933833c88d245fa4e407160f49fe102283efe9de
parent 7f5bf41e

packages/SystemUI/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -326,6 +326,17 @@ filegroup { 
        "tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt",

        "tests/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractorImplTest.kt",

        "tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt",



        /* Bouncer UI tests */

        "tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt",

        "tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt",

        "tests/src/com/android/keyguard/KeyguardPinBasedInputViewControllerTest.java",

        "tests/src/com/android/keyguard/KeyguardPinViewControllerTest.kt",

        "tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java",

        "tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt",

        "tests/src/com/android/keyguard/KeyguardSecurityViewFlipperControllerTest.java",

        "tests/src/com/android/keyguard/KeyguardSimPinViewControllerTest.kt",

        "tests/src/com/android/keyguard/KeyguardSimPukViewControllerTest.kt",

    ],

    path: "tests/src",

}

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ constructor( 
     * Once a transition between one scene and another passes a threshold, the UI invokes this

     * method to report it, updating the value in [desiredScene] to match what the UI shows.

     */

    internal fun onSceneChanged(scene: SceneModel, loggingReason: String) {

    fun onSceneChanged(scene: SceneModel, loggingReason: String) {

        updateDesiredScene(scene, loggingReason, logger::logSceneChangeCommitted)

    }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -16,15 +16,16 @@ 


package com.android.keyguard



import android.testing.AndroidTestingRunner

import android.testing.TestableLooper

import android.view.inputmethod.InputMethodManager

import android.widget.EditText

import android.widget.ImageView

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.util.LatencyTracker

import com.android.internal.widget.LockPatternUtils

import com.android.systemui.R

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.classifier.FalsingCollector

import com.android.systemui.flags.FakeFeatureFlags
@@ -45,7 +46,8 @@ import org.mockito.Mockito.`when` 
import org.mockito.MockitoAnnotations



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RoboPilotTest

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper

class KeyguardPasswordViewControllerTest : SysuiTestCase() {

    @Mock private lateinit var keyguardPasswordView: KeyguardPasswordView

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -16,15 +16,16 @@ 


package com.android.keyguard



import android.testing.AndroidTestingRunner

import android.testing.TestableLooper

import android.view.View

import androidx.constraintlayout.widget.ConstraintLayout

import androidx.constraintlayout.widget.ConstraintSet

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.util.LatencyTracker

import com.android.internal.widget.LockPatternUtils

import com.android.systemui.R

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.classifier.FalsingCollector

import com.android.systemui.classifier.FalsingCollectorFake
@@ -52,7 +53,8 @@ import org.mockito.Mockito.`when` 
import org.mockito.MockitoAnnotations



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RoboPilotTest

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper

class KeyguardPatternViewControllerTest : SysuiTestCase() {

    private lateinit var mKeyguardPatternView: KeyguardPatternView

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -22,16 +22,17 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.view.View;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.R;

import com.android.systemui.RoboPilotTest;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.classifier.FalsingCollectorFake;
@@ -46,7 +47,8 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RoboPilotTest

@RunWith(AndroidJUnit4.class)

@RunWithLooper

public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase {