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

Commit cc8b3070 authored by Jacqueline Bronger's avatar Jacqueline Bronger
Browse files

Fix failing TvPipGravityTest cases 

TvPipGravityTest#updateGravity_move_expanded_invalid failing due to setDesiredTvExpandedAspectRatio resetting the TvPipBoundsState right after setting it to expanded. The rest of the test was therefore running as not expanded.

Bug: 349411026
Test: atest TvPipGravityTest
Flag: TEST_ONLY
Change-Id: I7498494a31e015e5ec487070f966054ca52dc4c2
parent 24d0f2f7

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipGravityTest.java

+4 −4
Original line number Diff line number Diff line
@@ -241,16 +241,16 @@ public class TvPipGravityTest extends ShellTestCase { 


    @Test

    public void updateGravity_move_expanded_valid() {

        mTvPipBoundsState.setTvPipExpanded(true);



        // Vertical expanded PiP.

        mTvPipBoundsState.setDesiredTvExpandedAspectRatio(VERTICAL_EXPANDED_ASPECT_RATIO, true);

        mTvPipBoundsState.setTvPipExpanded(true);

        mTvPipBoundsState.setTvPipGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT);

        moveAndCheckGravity(KEYCODE_DPAD_LEFT, Gravity.CENTER_VERTICAL | Gravity.LEFT, true);

        moveAndCheckGravity(KEYCODE_DPAD_RIGHT, Gravity.CENTER_VERTICAL | Gravity.RIGHT, true);



        // Horizontal expanded PiP.

        mTvPipBoundsState.setDesiredTvExpandedAspectRatio(HORIZONTAL_EXPANDED_ASPECT_RATIO, true);

        mTvPipBoundsState.setTvPipExpanded(true);

        mTvPipBoundsState.setTvPipGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL);

        moveAndCheckGravity(KEYCODE_DPAD_UP, Gravity.TOP | Gravity.CENTER_HORIZONTAL, true);

        moveAndCheckGravity(KEYCODE_DPAD_DOWN, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, true);
@@ -281,10 +281,9 @@ public class TvPipGravityTest extends ShellTestCase { 


    @Test

    public void updateGravity_move_expanded_invalid() {

        mTvPipBoundsState.setTvPipExpanded(true);



        // Vertical expanded PiP.

        mTvPipBoundsState.setDesiredTvExpandedAspectRatio(VERTICAL_EXPANDED_ASPECT_RATIO, true);

        mTvPipBoundsState.setTvPipExpanded(true);

        mTvPipBoundsState.setTvPipGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT);

        moveAndCheckGravity(KEYCODE_DPAD_RIGHT, Gravity.CENTER_VERTICAL | Gravity.RIGHT, false);

        moveAndCheckGravity(KEYCODE_DPAD_UP, Gravity.CENTER_VERTICAL | Gravity.RIGHT, false);
@@ -297,6 +296,7 @@ public class TvPipGravityTest extends ShellTestCase { 


        // Horizontal expanded PiP.

        mTvPipBoundsState.setDesiredTvExpandedAspectRatio(HORIZONTAL_EXPANDED_ASPECT_RATIO, true);

        mTvPipBoundsState.setTvPipExpanded(true);

        mTvPipBoundsState.setTvPipGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL);

        moveAndCheckGravity(KEYCODE_DPAD_DOWN, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, false);

        moveAndCheckGravity(KEYCODE_DPAD_LEFT, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, false);