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

Commit 08c63adf authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

[Floaty] Fix test failure when topui controller enabled 

Bug: 411061512
Flag: com.android.systemui.shared.enable_lpp_assist_invocation_effect
Test: TopLevelWindowEffectsTest
Change-Id: I75783d21f13f6feeaaa4eb456eb34480f4f1eaaf
parent a3352e31

packages/SystemUI/multivalentTests/src/com/android/systemui/topwindoweffects/TopLevelWindowEffectsTest.kt

+4 −6
Original line number Diff line number Diff line
@@ -32,9 +32,8 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.statusbar.notificationShadeWindowController

import com.android.systemui.testKosmos

import com.android.systemui.topui.TopUiController

import com.android.systemui.topui.TopUiControllerRefactor

import com.android.systemui.topui.topUiController

import com.android.systemui.topui.mockTopUiController

import com.android.systemui.topwindoweffects.data.repository.SqueezeEffectRepositoryImpl.Companion.DEFAULT_INITIAL_DELAY_MILLIS

import com.android.systemui.topwindoweffects.data.repository.SqueezeEffectRepositoryImpl.Companion.DEFAULT_LONG_PRESS_POWER_DURATION_MILLIS

import com.android.systemui.topwindoweffects.data.repository.fakeSqueezeEffectRepository
@@ -66,8 +65,6 @@ class TopLevelWindowEffectsTest : SysuiTestCase() { 


    @Mock private lateinit var windowManager: WindowManager



    @Mock private lateinit var topUiController: TopUiController



    @Mock private lateinit var viewModelFactory: SqueezeEffectViewModel.Factory



    private val Kosmos.underTest by
@@ -86,7 +83,7 @@ class TopLevelWindowEffectsTest : SysuiTestCase() { 
                    ),

                appZoomOutOptional = Optional.empty(),

                notificationShadeWindowController = kosmos.notificationShadeWindowController,

                topUiController = kosmos.topUiController,

                topUiController = kosmos.mockTopUiController,

                interactionJankMonitor = kosmos.interactionJankMonitor,

            )

        }
@@ -256,7 +253,8 @@ class TopLevelWindowEffectsTest : SysuiTestCase() { 
    private fun verifyAddViewAndTopUi(mode: VerificationMode) {

        verify(windowManager, mode).addView(any<View>(), any<WindowManager.LayoutParams>())

        if (TopUiControllerRefactor.isEnabled) {

            verify(topUiController, mode).setRequestTopUi(true, TopLevelWindowEffects.TAG)

            verify(kosmos.mockTopUiController, mode)

                .setRequestTopUi(true, TopLevelWindowEffects.TAG)

        } else {

            verify(kosmos.notificationShadeWindowController, mode)

                .setRequestTopUi(true, TopLevelWindowEffects.TAG)