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

Commit 0455439e authored by Takamasa Kuramitsu's avatar Takamasa Kuramitsu Committed by android-build-merger
Browse files

Merge "DocumentsUI: Fix some test failures in DocumentsUITests" into pi-dev 

am: 4f8fa7a7

Change-Id: I6d93b744b2b2461f58f6cb8d7048b5d91c2be54b
parents 3c9e968a 4f8fa7a7

tests/common/com/android/documentsui/bots/UiBot.java

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class UiBot extends Bots.BaseBot { 
        while (it.hasNext()) {

            menuItem = it.next();

            UiObject2 text = menuItem.findObject(By.text(label));

            if (text != null) {

            if (text != null && menuItem.isClickable()) {

                break;

            }

        }

tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ public class KeyboardNavigationUiTest extends ActivityTest<FilesActivity> { 
        // Open the drawer so we can ensure root list available even for phones

        bots.roots.openDrawer();



        bots.keyboard.pressKey(KeyEvent.KEYCODE_TAB);

        bots.keyboard.pressKey(KeyEvent.KEYCODE_TAB);

        for (int i = 0; i < 10; i++) {

            bots.keyboard.pressKey(KeyEvent.KEYCODE_DPAD_RIGHT);

tests/functional/com/android/documentsui/SearchViewUiTest.java

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { 
    public void testSearchView_CollapsesOnBack() throws Exception {

        bots.search.clickIcon();

        device.pressBack();

        device.pressBack();



        bots.search.assertIconVisible(true);

        bots.search.assertInputExists(false);
@@ -79,6 +80,7 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { 
        bots.search.clickIcon();

        bots.search.setInputText("file2");



        device.pressBack();

        device.pressBack();



        // Wait for a file in the default directory to be listed.