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

Commit 16cd9a9e authored by Matthew Reynolds's avatar Matthew Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix tests misnamed in ag/29675059" into main

parents 5b719d63 8a719e6a

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ filegroup { 
filegroup {

    name: "SystemUI-tests-broken-robofiles-run",

    srcs: [

        "tests/src/**/systemui/dreams/touch/CommunalTouchHandlerTest.java",

        "tests/src/**/systemui/shade/NotificationShadeWindowViewControllerTest.kt",

        "tests/src/**/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt",

        "tests/src/**/systemui/statusbar/pipeline/mobile/ui/model/SignalIconModelParameterizedTest.kt",

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/model→packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt

+3 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class BiometricPromptRequestTest : SysuiTestCase() { 
                    title = title,

                    subtitle = subtitle,

                    description = description,

                    contentView = contentView

                    contentView = contentView,

                ),

                BiometricUserInfo(USER_ID),

                BiometricOperationInfo(OPERATION_ID),
@@ -101,9 +101,7 @@ class BiometricPromptRequestTest : SysuiTestCase() { 
        val fpPros = fingerprintSensorPropertiesInternal().first()

        val request =

            BiometricPromptRequest.Biometric(

                promptInfo(

                    logoBitmap = logoBitmap,

                ),

                promptInfo(logoBitmap = logoBitmap),

                BiometricUserInfo(USER_ID),

                BiometricOperationInfo(OPERATION_ID),

                BiometricModalities(fingerprintProperties = fpPros),
@@ -162,7 +160,7 @@ class BiometricPromptRequestTest : SysuiTestCase() { 
                    BiometricUserInfo(USER_ID),

                    BiometricOperationInfo(OPERATION_ID),

                    stealth,

                )

                ),

            )



        for (request in toCheck) {

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch→packages/SystemUI/tests/src/com/android/systemui/dreams/touch/CommunalTouchHandlerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ public class CommunalTouchHandlerTest extends SysuiTestCase { 
                INITIATION_WIDTH,

                mKosmos.getCommunalInteractor(),

                mKosmos.getConfigurationInteractor(),

                mKosmos.getSceneInteractor(),

                Optional.of(mKosmos.getMockWindowRootViewProvider()),

                mLifecycle

                );

    }

packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor 
import com.android.systemui.scene.domain.startable.scrimStartable

import com.android.systemui.scene.sceneContainerConfig

import com.android.systemui.scene.shared.model.sceneDataSource

import com.android.systemui.scene.ui.view.mockWindowRootViewProvider

import com.android.systemui.settings.brightness.domain.interactor.brightnessMirrorShowingInteractor

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.shade.domain.interactor.shadeInteractor
@@ -191,4 +192,5 @@ class KosmosJavaAdapter() { 
    }

    val disableFlagsInteractor by lazy { kosmos.disableFlagsInteractor }

    val fakeDisableFlagsRepository by lazy { kosmos.fakeDisableFlagsRepository }

    val mockWindowRootViewProvider by lazy { kosmos.mockWindowRootViewProvider }

}

packages/SystemUI/tests/utils/src/com/android/systemui/scene/ui/view/WindowRootViewKosmos.kt

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
package com.android.systemui.scene.ui.view



import com.android.systemui.kosmos.Kosmos

import javax.inject.Provider

import org.mockito.kotlin.mock



val Kosmos.mockShadeRootView by Kosmos.Fixture { mock<WindowRootView>() }

val Kosmos.mockWindowRootViewProvider by

    Kosmos.Fixture { Provider<WindowRootView> { mock<WindowRootView>() } }