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

Commit 239dd6cc authored by Justin Weir's avatar Justin Weir
Browse files

Switch flags from mock to fake 

Fixes: 308616543
Test: N/A
Flag: NONE
Change-Id: Ia14d041936000f9004a88ebf1598ebcaa875e08b
parent 40f54db0

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+10 −2
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ import com.android.systemui.common.ui.data.repository.FakeConfigurationRepositor 
import com.android.systemui.common.ui.view.LongPressHandlingView;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.FakeFeatureFlagsClassic;

import com.android.systemui.flags.Flags;

import com.android.systemui.fragments.FragmentHostManager;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
@@ -228,7 +229,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    @Mock protected ScreenOffAnimationController mScreenOffAnimationController;

    @Mock protected NotificationPanelView mView;

    @Mock protected LayoutInflater mLayoutInflater;

    @Mock protected FeatureFlags mFeatureFlags;

    @Mock protected DynamicPrivacyController mDynamicPrivacyController;

    @Mock protected StatusBarTouchableRegionManager mStatusBarTouchableRegionManager;

    @Mock protected KeyguardStateController mKeyguardStateController;
@@ -335,6 +335,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    @Mock private KeyguardClockPositionAlgorithm mKeyguardClockPositionAlgorithm;



    protected final int mMaxUdfpsBurnInOffsetY = 5;

    protected FakeFeatureFlagsClassic mFeatureFlags = new FakeFeatureFlagsClassic();

    protected KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor;

    protected FakeKeyguardRepository mFakeKeyguardRepository;

    protected KeyguardInteractor mKeyguardInteractor;
@@ -368,6 +369,13 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mFeatureFlags.set(Flags.WM_SHADE_ANIMATE_BACK_GESTURE, false);

        mFeatureFlags.set(Flags.TRACKPAD_GESTURE_FEATURES, false);

        mFeatureFlags.set(Flags.MIGRATE_KEYGUARD_STATUS_VIEW, false);

        mFeatureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false);

        mFeatureFlags.set(Flags.MIGRATE_NSSL, false);

        mFeatureFlags.set(Flags.QS_USER_DETAIL_SHORTCUT, false);

        mFeatureFlags.set(Flags.ONE_WAY_HAPTICS_API_MIGRATION, false);

        mMainDispatcher = getMainDispatcher();

        KeyguardInteractorFactory.WithDependencies keyguardInteractorDeps =

                KeyguardInteractorFactory.create();

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ import androidx.test.filters.SmallTest; 


import com.android.keyguard.FaceAuthApiRequestReason;

import com.android.systemui.DejankUtils;

import com.android.systemui.res.R;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.notification.row.ExpandableView;

import com.android.systemui.statusbar.notification.row.ExpandableView.OnHeightChangedListener;

import com.android.systemui.statusbar.notification.stack.AmbientState;
@@ -838,7 +838,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
        mStatusBarStateController.setState(KEYGUARD);

        enableSplitShade(/* enabled= */ false);

        mNotificationPanelViewController.setDozing(false, false);

        when(mFeatureFlags.isEnabled(Flags.LOCKSCREEN_ENABLE_LANDSCAPE)).thenReturn(true);

        mFeatureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, true);

        when(mResources.getBoolean(R.bool.force_small_clock_on_lockscreen)).thenReturn(true);

        when(mMediaDataManager.hasActiveMedia()).thenReturn(false);

        when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0);
@@ -856,7 +856,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 
        mStatusBarStateController.setState(KEYGUARD);

        enableSplitShade(/* enabled= */ false);

        mNotificationPanelViewController.setDozing(false, false);

        when(mFeatureFlags.isEnabled(Flags.LOCKSCREEN_ENABLE_LANDSCAPE)).thenReturn(false);

        mFeatureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false);

        when(mResources.getBoolean(R.bool.force_small_clock_on_lockscreen)).thenReturn(true);

        when(mMediaDataManager.hasActiveMedia()).thenReturn(false);

        when(mNotificationStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(0);
@@ -1105,7 +1105,7 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo 


    @Test

    public void nsslFlagEnabled_allowOnlyExternalTouches() {

        when(mFeatureFlags.isEnabled(Flags.MIGRATE_NSSL)).thenReturn(true);

        mFeatureFlags.set(Flags.MIGRATE_NSSL, true);



        // This sets the dozing state that is read when onMiddleClicked is eventually invoked.

        mTouchHandler.onTouch(mock(View.class), mDownMotionEvent);

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerWithCoroutinesTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ import android.view.ViewStub 
import androidx.test.filters.SmallTest

import com.android.internal.util.CollectionUtils

import com.android.keyguard.KeyguardClockSwitch.LARGE

import com.android.systemui.res.R

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION

import com.android.systemui.res.R

import com.android.systemui.statusbar.StatusBarState.KEYGUARD

import com.android.systemui.statusbar.StatusBarState.SHADE

import com.android.systemui.statusbar.StatusBarState.SHADE_LOCKED
@@ -160,7 +160,7 @@ class NotificationPanelViewControllerWithCoroutinesTest : 
    @Test

    fun doubleTapRequired_onKeyguard_oneWayHapticsDisabled_usesOldVibrate() = runTest {

        launch(Dispatchers.Main.immediate) {

            whenever(mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)).thenReturn(false)

            mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false)

            val listener = getFalsingTapListener()

            mStatusBarStateController.setState(KEYGUARD)
@@ -182,7 +182,7 @@ class NotificationPanelViewControllerWithCoroutinesTest : 
    @Test

    fun doubleTapRequired_onKeyguard_oneWayHapticsEnabled_usesPerformHapticFeedback() = runTest {

        launch(Dispatchers.Main.immediate) {

            whenever(mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)).thenReturn(true)

            mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true)

            val listener = getFalsingTapListener()

            mStatusBarStateController.setState(KEYGUARD)
@@ -210,7 +210,7 @@ class NotificationPanelViewControllerWithCoroutinesTest : 
    @Test

    fun doubleTapRequired_shadeLocked_oneWayHapticsDisabled_usesOldVibrate() = runTest {

        launch(Dispatchers.Main.immediate) {

            whenever(mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)).thenReturn(false)

            mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false)

            val listener = getFalsingTapListener()

            val packageName = mView.context.packageName

            mStatusBarStateController.setState(SHADE_LOCKED)
@@ -233,7 +233,7 @@ class NotificationPanelViewControllerWithCoroutinesTest : 
    @Test

    fun doubleTapRequired_shadeLocked_oneWayHapticsEnabled_usesPerformHapticFeedback() = runTest {

        launch(Dispatchers.Main.immediate) {

            whenever(mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)).thenReturn(true)

            mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true)

            val listener = getFalsingTapListener()

            mStatusBarStateController.setState(SHADE_LOCKED)