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

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

Merge "Replace Sealed Class mock for Robolectric test" into udc-dev am: e68bdefb 

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



Change-Id: I0bfbf6634cf5dca2aae4327f3c53fcd9e0f6b86f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b464881 e68bdefb

packages/SystemUI/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -243,15 +243,11 @@ filegroup { 
        // 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",

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -635,14 +635,14 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
        }



    companion object {

        private val ICON: Icon = mock {

            whenever(this.contentDescription)

                .thenReturn(

        private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337

        private val ICON: Icon =

            Icon.Resource(

                res = CONTENT_DESCRIPTION_RESOURCE_ID,

                contentDescription =

                    ContentDescription.Resource(

                        res = CONTENT_DESCRIPTION_RESOURCE_ID,

                    ),

            )

                )

        }

        private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337

    }

}