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

Commit ddc40e0b authored by Matt Pietal's avatar Matt Pietal
Browse files

Remove pieces of device entry flag part #3 

f note, a lot of tests from UdfpsControllerTest
were not running with the flag enabled. Opened a bug to
perhaps restore some of these, as the code is maybe active.
See b/372952178

Bug: 279440316
Test: atest SystemUITests
Flag: com.android.systemui.device_entry_udfps_refactor
Change-Id: I702bfc48bc765320dd66e4dc9c7a6c1cc6a6a7a2
parent a6043288

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsBpViewControllerTest.kt

deleted100644 → 0
+0 −70
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.biometrics



import android.testing.TestableLooper

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor

import com.android.systemui.dump.DumpManager

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

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.phone.SystemUIDialogManager

import org.junit.Assert.assertFalse

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.junit.MockitoJUnit



@SmallTest

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper

class UdfpsBpViewControllerTest : SysuiTestCase() {



    @JvmField @Rule var rule = MockitoJUnit.rule()



    @Mock lateinit var udfpsBpView: UdfpsBpView

    @Mock lateinit var statusBarStateController: StatusBarStateController

    @Mock lateinit var shadeInteractor: ShadeInteractor

    @Mock lateinit var systemUIDialogManager: SystemUIDialogManager

    @Mock lateinit var dumpManager: DumpManager

    @Mock lateinit var udfpsOverlayInteractor: UdfpsOverlayInteractor



    private lateinit var udfpsBpViewController: UdfpsBpViewController



    @Before

    fun setup() {

        udfpsBpViewController =

            UdfpsBpViewController(

                udfpsBpView,

                statusBarStateController,

                shadeInteractor,

                systemUIDialogManager,

                dumpManager,

                udfpsOverlayInteractor,

            )

    }



    @TestableLooper.RunWithLooper(setAsMainLooper = true)

    @Test

    fun testShouldNeverPauseAuth() {

        assertFalse(udfpsBpViewController.shouldPauseAuth())

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+0 −1067

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java

deleted100644 → 0
+0 −161
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.biometrics;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.ActivityTransitionAnimator;

import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor;

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

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

import com.android.systemui.shade.ShadeExpansionChangeEvent;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.SystemUIDialogManager;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;

import com.android.systemui.util.concurrency.DelayableExecutor;



import org.junit.Before;

import org.mockito.ArgumentCaptor;

import org.mockito.Captor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



public class UdfpsKeyguardViewLegacyControllerBaseTest extends SysuiTestCase {

    // Dependencies

    protected @Mock UdfpsKeyguardViewLegacy mView;

    protected @Mock Context mResourceContext;

    protected @Mock StatusBarStateController mStatusBarStateController;

    protected @Mock ShadeExpansionStateManager mShadeExpansionStateManager;

    protected @Mock StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    protected @Mock LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    protected @Mock DumpManager mDumpManager;

    protected @Mock DelayableExecutor mExecutor;

    protected @Mock KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    protected @Mock KeyguardStateController mKeyguardStateController;

    protected @Mock KeyguardViewMediator mKeyguardViewMediator;

    protected @Mock ConfigurationController mConfigurationController;

    protected @Mock UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    protected @Mock SystemUIDialogManager mDialogManager;

    protected @Mock UdfpsController mUdfpsController;

    protected @Mock ActivityTransitionAnimator mActivityTransitionAnimator;

    protected @Mock PrimaryBouncerInteractor mPrimaryBouncerInteractor;

    protected @Mock ShadeInteractor mShadeInteractor;

    protected @Mock AlternateBouncerInteractor mAlternateBouncerInteractor;

    protected @Mock UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate;

    protected @Mock SelectedUserInteractor mSelectedUserInteractor;

    protected @Mock KeyguardTransitionInteractor mKeyguardTransitionInteractor;

    protected @Mock UdfpsOverlayInteractor mUdfpsOverlayInteractor;



    protected FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();



    protected UdfpsKeyguardViewControllerLegacy mController;



    // Capture listeners so that they can be used to send events

    private @Captor ArgumentCaptor<StatusBarStateController.StateListener> mStateListenerCaptor;

    protected StatusBarStateController.StateListener mStatusBarStateListener;



    private @Captor ArgumentCaptor<KeyguardStateController.Callback>

            mKeyguardStateControllerCallbackCaptor;

    protected KeyguardStateController.Callback mKeyguardStateControllerCallback;



    private @Captor ArgumentCaptor<StatusBarKeyguardViewManager.KeyguardViewManagerCallback>

            mKeyguardViewManagerCallbackArgumentCaptor;

    protected StatusBarKeyguardViewManager.KeyguardViewManagerCallback mKeyguardViewManagerCallback;





    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mSetFlagsRule.disableFlags(Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR);

        when(mView.getContext()).thenReturn(mResourceContext);

        when(mResourceContext.getString(anyInt())).thenReturn("test string");

        when(mKeyguardViewMediator.isAnimatingScreenOff()).thenReturn(false);

        when(mView.getUnpausedAlpha()).thenReturn(255);

        when(mShadeExpansionStateManager.addExpansionListener(any())).thenReturn(

                new ShadeExpansionChangeEvent(0, false, false));

        mController = createUdfpsKeyguardViewController();

    }



    protected void sendStatusBarStateChanged(int statusBarState) {

        mStatusBarStateListener.onStateChanged(statusBarState);

    }



    protected void captureStatusBarStateListeners() {

        verify(mStatusBarStateController).addCallback(mStateListenerCaptor.capture());

        mStatusBarStateListener = mStateListenerCaptor.getValue();

    }



    protected void captureKeyguardStateControllerCallback() {

        verify(mKeyguardStateController).addCallback(

                mKeyguardStateControllerCallbackCaptor.capture());

        mKeyguardStateControllerCallback = mKeyguardStateControllerCallbackCaptor.getValue();

    }



    public UdfpsKeyguardViewControllerLegacy createUdfpsKeyguardViewController() {

        return createUdfpsKeyguardViewController(false);

    }



    public void captureKeyGuardViewManagerCallback() {

        verify(mStatusBarKeyguardViewManager).addCallback(

                mKeyguardViewManagerCallbackArgumentCaptor.capture());

        mKeyguardViewManagerCallback = mKeyguardViewManagerCallbackArgumentCaptor.getValue();

    }



    protected UdfpsKeyguardViewControllerLegacy createUdfpsKeyguardViewController(

            boolean useModernBouncer) {

        UdfpsKeyguardViewControllerLegacy controller = new UdfpsKeyguardViewControllerLegacy(

                mView,

                mStatusBarStateController,

                mStatusBarKeyguardViewManager,

                mKeyguardUpdateMonitor,

                mDumpManager,

                mLockscreenShadeTransitionController,

                mConfigurationController,

                mKeyguardStateController,

                mUnlockedScreenOffAnimationController,

                mDialogManager,

                mUdfpsController,

                mActivityTransitionAnimator,

                mPrimaryBouncerInteractor,

                mAlternateBouncerInteractor,

                mUdfpsKeyguardAccessibilityDelegate,

                mSelectedUserInteractor,

                mKeyguardTransitionInteractor,

                mShadeInteractor,

                mUdfpsOverlayInteractor);

        return controller;

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerTest.java

deleted100644 → 0
+0 −197
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.biometrics;



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.testing.TestableLooper;



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

import androidx.test.filters.SmallTest;



import com.android.systemui.statusbar.StatusBarState;



import org.junit.Test;

import org.junit.runner.RunWith;



@SmallTest

@RunWith(AndroidJUnit4.class)



@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class UdfpsKeyguardViewLegacyControllerTest extends

        UdfpsKeyguardViewLegacyControllerBaseTest {

    @Override

    public UdfpsKeyguardViewControllerLegacy createUdfpsKeyguardViewController() {

        return createUdfpsKeyguardViewController(/* useModernBouncer */ false);

    }



    @Test

    public void testShouldPauseAuth_bouncerShowing() {

        mController.onViewAttached();

        captureStatusBarStateListeners();

        sendStatusBarStateChanged(StatusBarState.KEYGUARD);



        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true);

        when(mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()).thenReturn(true);

        when(mView.getUnpausedAlpha()).thenReturn(0);

        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testRegistersStatusBarStateListenersOnAttached() {

        mController.onViewAttached();

        captureStatusBarStateListeners();

    }



    @Test

    public void testViewControllerQueriesSBStateOnAttached() {

        mController.onViewAttached();

        verify(mStatusBarStateController).getState();



        when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE_LOCKED);

        captureStatusBarStateListeners();



        mController.onViewAttached();

        verify(mView, atLeast(1)).setPauseAuth(true);

    }



    @Test

    public void testListenersUnregisteredOnDetached() {

        mController.onViewAttached();

        captureStatusBarStateListeners();

        captureKeyguardStateControllerCallback();

        mController.onViewDetached();



        verify(mStatusBarStateController).removeCallback(mStatusBarStateListener);

        verify(mKeyguardStateController).removeCallback(mKeyguardStateControllerCallback);

    }



    @Test

    public void testShouldPauseAuthUnpausedAlpha0() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        when(mView.getUnpausedAlpha()).thenReturn(0);

        sendStatusBarStateChanged(StatusBarState.KEYGUARD);



        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testShouldNotPauseAuthOnKeyguard() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        sendStatusBarStateChanged(StatusBarState.KEYGUARD);



        assertFalse(mController.shouldPauseAuth());

    }



    @Test

    public void onBiometricAuthenticated_pauseAuth() {

        // GIVEN view is attached and we're on the keyguard (see testShouldNotPauseAuthOnKeyguard)

        mController.onViewAttached();

        captureStatusBarStateListeners();

        sendStatusBarStateChanged(StatusBarState.KEYGUARD);



        // WHEN biometric is authenticated

        captureKeyguardStateControllerCallback();

        when(mKeyguardUpdateMonitor.getUserUnlockedWithBiometric(anyInt())).thenReturn(true);

        mKeyguardStateControllerCallback.onUnlockedChanged();



        // THEN pause auth

        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testShouldPauseAuthIsLaunchTransitionFadingAway() {

        // GIVEN view is attached and we're on the keyguard (see testShouldNotPauseAuthOnKeyguard)

        mController.onViewAttached();

        captureStatusBarStateListeners();

        sendStatusBarStateChanged(StatusBarState.KEYGUARD);



        // WHEN isLaunchTransitionFadingAway=true

        captureKeyguardStateControllerCallback();

        when(mKeyguardStateController.isLaunchTransitionFadingAway()).thenReturn(true);

        mKeyguardStateControllerCallback.onLaunchTransitionFadingAwayChanged();



        // THEN pause auth

        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testShouldPauseAuthOnShadeLocked() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        sendStatusBarStateChanged(StatusBarState.SHADE_LOCKED);



        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testShouldPauseAuthOnShade() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        // WHEN not on keyguard yet (shade = home)

        sendStatusBarStateChanged(StatusBarState.SHADE);



        // THEN pause auth

        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testShouldPauseAuthAnimatingScreenOffFromShade() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        // WHEN transitioning from home/shade => keyguard + animating screen off

        mStatusBarStateListener.onStatePreChange(StatusBarState.SHADE, StatusBarState.KEYGUARD);

        when(mKeyguardViewMediator.isAnimatingScreenOff()).thenReturn(true);



        // THEN pause auth

        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testDoNotPauseAuthAnimatingScreenOffFromLS() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        // WHEN animating screen off transition from LS => AOD

        sendStatusBarStateChanged(StatusBarState.KEYGUARD);

        when(mKeyguardViewMediator.isAnimatingScreenOff()).thenReturn(true);



        // THEN don't pause auth

        assertFalse(mController.shouldPauseAuth());

    }



    @Test

    public void testOverrideShouldPauseAuthOnShadeLocked() {

        mController.onViewAttached();

        captureStatusBarStateListeners();



        sendStatusBarStateChanged(StatusBarState.SHADE_LOCKED);

        assertTrue(mController.shouldPauseAuth());

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt

deleted100644 → 0
+0 −643

File deleted.

Preview size limit exceeded, changes collapsed.