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

Commit 6005e82b authored by Aaron Liu's avatar Aaron Liu Committed by Android Build Coastguard Worker
Browse files

Fix KeyguardSecurityContainerControllerTest 

Fixing tests that are failing for other build targets.
For orientation, I think the orientation in resources is already defined
as landscape, which is causing the failure in the test.

For the gravity, we have different overlays based on screen size so we
can be so specific with gravity.

Test: Run on ABTD
Fixes: 268367452
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8eb68c7ebef719a1459e01c1624a82f98991ca57)
Merged-In: Ie341c5d85845098b358f247e6eb8fad05ff0029c
Change-Id: Ie341c5d85845098b358f247e6eb8fad05ff0029c
parent be1c38a3

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+9 −11
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
    @Captor

    private ArgumentCaptor<KeyguardSecurityContainer.SwipeListener> mSwipeListenerArgumentCaptor;



    private Configuration mConfiguration;



    private KeyguardSecurityContainerController mKeyguardSecurityContainerController;

    private KeyguardPasswordViewController mKeyguardPasswordViewController;

    private KeyguardPasswordView mKeyguardPasswordView;
@@ -172,12 +170,12 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 


    @Before

    public void setup() {

        mConfiguration = new Configuration();

        mConfiguration.setToDefaults(); // Defaults to ORIENTATION_UNDEFINED.

        mTestableResources = mContext.getOrCreateTestableResources();

        mTestableResources.getResources().getConfiguration().orientation =

                Configuration.ORIENTATION_UNDEFINED;



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

        when(mView.getResources()).thenReturn(mContext.getResources());

        when(mView.getResources()).thenReturn(mTestableResources.getResources());

        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(/* width=  */ 0, /* height= */

                0);

        lp.gravity = 0;
@@ -254,6 +252,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 


    @Test

    public void onResourcesUpdate_callsThroughOnRotationChange() {

        clearInvocations(mView);



        // Rotation is the same, shouldn't cause an update

        mKeyguardSecurityContainerController.updateResources();

        verify(mView, never()).initMode(eq(MODE_DEFAULT), eq(mGlobalSettings), eq(mFalsingManager),
@@ -579,12 +579,12 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
        // Set initial gravity

        mTestableResources.addOverride(R.integer.keyguard_host_view_gravity,

                Gravity.CENTER);

        mTestableResources.addOverride(

                R.bool.can_use_one_handed_bouncer, false);



        // Kick off the initial pass...

        mKeyguardSecurityContainerController.onInit();

        verify(mView).setLayoutParams(argThat(

                (ArgumentMatcher<FrameLayout.LayoutParams>) argument ->

                        argument.gravity == Gravity.CENTER));

        verify(mView).setLayoutParams(any());

        clearInvocations(mView);



        // Now simulate a config change
@@ -592,9 +592,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);



        mKeyguardSecurityContainerController.updateResources();

        verify(mView).setLayoutParams(argThat(

                (ArgumentMatcher<FrameLayout.LayoutParams>) argument ->

                        argument.gravity == (Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM)));

        verify(mView).setLayoutParams(any());

    }



    @Test