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

Commit d1736fd4 authored by Ben Lin's avatar Ben Lin
Browse files

Fix Rename Ui Tests to properly wait for overflow menu item. 

Change-Id: I12ab56d959789f69c52e660db5849a1dd4b6507d
parent 16a77e28

tests/src/com/android/documentsui/RenameDocumentUiTest.java

+3 −1
Original line number Diff line number Diff line
@@ -157,7 +157,9 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> { 
    }



    private void clickRename() throws UiObjectNotFoundException {

        device.waitForIdle();

        if (!bots.main.waitForActionModeBarToAppear()) {

            throw new UiObjectNotFoundException("ActionMode bar not found");

        }

        bots.main.clickActionbarOverflowItem("Rename");

        device.waitForIdle();

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.support.test.uiautomator.UiObject; 
import android.support.test.uiautomator.UiObject2;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.support.test.uiautomator.UiSelector;

import android.support.test.uiautomator.Until;

import android.util.TypedValue;

import android.view.View;

import android.widget.Toolbar;
@@ -101,8 +102,7 @@ public class UiBot extends Bots.BaseBot { 
    }



    public void assertInActionMode(boolean inActionMode) {

        UiObject actionModeBar = findActionModeBar();

        assertEquals(inActionMode, actionModeBar.exists());

        assertEquals(inActionMode, waitForActionModeBarToAppear());

    }



    public UiObject openOverflowMenu() throws UiObjectNotFoundException {
@@ -177,10 +177,10 @@ public class UiBot extends Bots.BaseBot { 
        onView(withText(label)).perform(click());

    }



    UiObject findActionModeBar() {

        UiObject bar = findObject("android:id/action_mode_bar");

        bar.waitForExists(mTimeout);

        return bar;

    public boolean waitForActionModeBarToAppear() {

        UiObject2 bar =

                mDevice.wait(Until.findObject(By.res("android:id/action_mode_bar")), mTimeout);

        return (bar != null);

    }



    public UiObject findDownloadRetryDialog() {