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

Commit 82d9e978 authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Wait for the IME nav bar to become visible 

This attempts to fix an issue with unit tests not finding the IME back
button and IME switcher button, by first checking that the IME
navigation bar becomes visible, as we are in gesture nav mode.

Flag: EXEMPT testfix
Bug: 395783236
Test: atest InputMethodServiceTest#testBackButtonClick
  InputMethodServiceTest#testBackButtonLongClick
  InputMethodServiceTest#testImeSwitchButtonClick
  InputMethodServiceTest#testImeSwitchButtonLongClick
Change-Id: I5ae6fc07600cfe59bcf65f48f3e347d71f34db75
parent 4fb4149e

services/tests/InputMethodSystemServerTests/src/com/android/inputmethodservice/InputMethodServiceTest.java

+12 −0
Original line number Diff line number Diff line
@@ -866,6 +866,9 @@ public class InputMethodServiceTest { 
                    () -> mActivity.showImeWithWindowInsetsController(),

                    EVENT_SHOW, true /* eventExpected */, true /* shown */, "IME is shown");



            eventually(() -> assertWithMessage("IME navigation bar is shown")

                    .that(mInputMethodService.isImeNavigationBarShownForTesting()).isTrue());



            final var backButton = getUiObject(By.res(INPUT_METHOD_NAV_BACK_ID));

            verifyInputViewStatus(

                    () -> {
@@ -892,6 +895,9 @@ public class InputMethodServiceTest { 
                    () -> mActivity.showImeWithWindowInsetsController(),

                    EVENT_SHOW, true /* eventExpected */, true /* shown */, "IME is shown");



            eventually(() -> assertWithMessage("IME navigation bar is shown")

                    .that(mInputMethodService.isImeNavigationBarShownForTesting()).isTrue());



            final var backButton = getUiObject(By.res(INPUT_METHOD_NAV_BACK_ID));

            verifyInputViewStatus(

                    () -> {
@@ -927,6 +933,9 @@ public class InputMethodServiceTest { 
                    },

                    EVENT_SHOW, true /* eventExpected */, true /* shown */, "IME is shown");



            eventually(() -> assertWithMessage("IME navigation bar is shown")

                    .that(mInputMethodService.isImeNavigationBarShownForTesting()).isTrue());



            final var imeSwitcherButton = getUiObject(By.res(INPUT_METHOD_NAV_IME_SWITCHER_ID));

            imeSwitcherButton.click();

            mInstrumentation.waitForIdleSync();
@@ -965,6 +974,9 @@ public class InputMethodServiceTest { 
                    },

                    EVENT_SHOW, true /* eventExpected */, true /* shown */, "IME is shown");



            eventually(() -> assertWithMessage("IME navigation bar is shown")

                    .that(mInputMethodService.isImeNavigationBarShownForTesting()).isTrue());



            final var imeSwitcherButton = getUiObject(By.res(INPUT_METHOD_NAV_IME_SWITCHER_ID));

            imeSwitcherButton.longClick();

            mInstrumentation.waitForIdleSync();