Merge "Failing with diags when UiObject2 container disappears" into ub-launcher3-rvc-dev (2c75d088) · Commits · e / os / android_packages_apps_Trebuchet

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+28 −13

Original line number	Diff line number	Diff line
		@@ -833,27 +833,42 @@ public final class LauncherInstrumentation {

		@NonNull
		List<UiObject2> getObjectsInContainer(UiObject2 container, String resName) {
		try {
		return container.findObjects(getLauncherObjectSelector(resName));
		} catch (StaleObjectException e) {
		fail("The container disappeared from screen");
		return null;
		}
		}

		@NonNull
		UiObject2 waitForObjectInContainer(UiObject2 container, String resName) {
		try {
		final UiObject2 object = container.wait(
		Until.findObject(getLauncherObjectSelector(resName)),
		WAIT_TIME_MS);
		assertNotNull("Can't find a view in Launcher, id: " + resName + " in container: "
		+ container.getResourceName(), object);
		return object;
		} catch (StaleObjectException e) {
		fail("The container disappeared from screen");
		return null;
		}
		}

		@NonNull
		UiObject2 waitForObjectInContainer(UiObject2 container, BySelector selector) {
		try {
		final UiObject2 object = container.wait(
		Until.findObject(selector),
		WAIT_TIME_MS);
		assertNotNull("Can't find a view in Launcher, id: " + selector + " in container: "
		+ container.getResourceName(), object);
		return object;
		} catch (StaleObjectException e) {
		fail("The container disappeared from screen");
		return null;
		}
		}

		private boolean hasLauncherObject(String resId) {