Fix KeyboardNavigationUiTest#testKeyboard_arrowsRootsList for phones. (e899b568) · Commits · e / os / android_packages_apps_DocumentsUI

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,10 @@ public class KeyboardNavigationUiTest extends ActivityTest<FilesActivity> {

		// Tests that arrow keys do not switch focus away from the roots list.
		public void testKeyboard_arrowsRootsList() throws Exception {

		// Open the drawer so we can ensure root list available even for phones
		bots.roots.openDrawer();

		bots.keyboard.pressKey(KeyEvent.KEYCODE_TAB);
		for (int i = 0; i < 10; i++) {
		bots.keyboard.pressKey(KeyEvent.KEYCODE_DPAD_RIGHT);

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

+18 −9

Original line number	Diff line number	Diff line
		@@ -51,19 +51,13 @@ public class RootsListBot extends Bots.BaseBot {
		}

		private UiObject findRoot(String label) throws UiObjectNotFoundException {
		// We might need to expand drawer if not visible
		openDrawer();

		final UiSelector rootsList = new UiSelector().resourceId(
		"com.android.documentsui:id/container_roots").childSelector(
		new UiSelector().resourceId(ROOTS_LIST_ID));

		// We might need to expand drawer if not visible
		if (!new UiObject(rootsList).waitForExists(mTimeout)) {
		Log.d(TAG, "Failed to find roots list; trying to expand");
		final UiSelector hamburger = new UiSelector().resourceId(
		"com.android.documentsui:id/toolbar").childSelector(
		new UiSelector().className("android.widget.ImageButton").clickable(true));
		new UiObject(hamburger).click();
		}

		// Wait for the first list item to appear
		new UiObject(rootsList.childSelector(new UiSelector())).waitForExists(mTimeout);

		@@ -78,6 +72,21 @@ public class RootsListBot extends Bots.BaseBot {
		closeDrawer();
		}

		public void openDrawer() throws UiObjectNotFoundException {
		final UiSelector rootsList = new UiSelector().resourceId(
		"com.android.documentsui:id/container_roots").childSelector(
		new UiSelector().resourceId(ROOTS_LIST_ID));

		// We might need to expand drawer if not visible
		if (!new UiObject(rootsList).waitForExists(mTimeout)) {
		Log.d(TAG, "Failed to find roots list; trying to expand");
		final UiSelector hamburger = new UiSelector().resourceId(
		"com.android.documentsui:id/toolbar").childSelector(
		new UiSelector().className("android.widget.ImageButton").clickable(true));
		new UiObject(hamburger).click();
		}
		}

		public void closeDrawer() {
		// Espresso will try to close the drawer if it's opened
		// But if no drawer exists (Tablet devices), we will have to catch the exception