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

Commit 319e272d authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "Fix flakiness of testFilesList_LiveUpdate."

parents c3aa42b1 1008c2d4

packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class DownloadsActivityUiTest extends ActivityTest<DownloadsActivity> { 


        mDocsHelper.createDocument(rootDir0, "yummers/sandwich", "Ham & Cheese.sandwich");



        device.waitForIdle();

        bot.waitForDocument("Ham & Cheese.sandwich");

        bot.assertHasDocuments("file0.log", "file1.png", "file2.csv", "Ham & Cheese.sandwich");

    }

packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class FilesActivityUiTest extends ActivityTest<FilesActivity> { 
        bot.openRoot(ROOT_0_ID);

        mDocsHelper.createDocument(rootDir0, "yummers/sandwich", "Ham & Cheese.sandwich");



        device.waitForIdle();

        bot.waitForDocument("Ham & Cheese.sandwich");

        bot.assertHasDocuments("file0.log", "file1.png", "file2.csv", "Ham & Cheese.sandwich");

    }

packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java

+4 −0
Original line number Diff line number Diff line
@@ -257,6 +257,10 @@ class UiBot { 
        mDevice.wait(Until.gone(SNACK_DELETE), mTimeout * 2);

    }



    void waitForDocument(String label) throws UiObjectNotFoundException {

        findDocument(label).waitForExists(mTimeout);

    }



    void switchViewMode() {

        UiObject2 mode = menuGridMode();

        if (mode != null) {