commit dc893208e8bad5073b9ee5a8c6b2cffb045359fa
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 10 20:40:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 10 20:40:04 2019 +0000
tree 80802707639b4d940dc9c3ea9fb5f4a927a7fb26
parent ce08d22f354e44d005936cf45c53b2247a5b261a
parent b4b88afda0845cef2cd6599a289314e67343f9f7

Merge "Better diagnostics for waitForLauncherObject" into ub-launcher3-master

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

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 096d8a0..7070555 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -380,9 +380,10 @@
 
     @NonNull
     UiObject2 waitForLauncherObject(String resName) {
-        final UiObject2 object = mDevice.wait(Until.findObject(getLauncherObjectSelector(resName)),
-                WAIT_TIME_MS);
-        assertNotNull("Can't find a launcher object; id: " + resName, object);
+        final BySelector selector = getLauncherObjectSelector(resName);
+        final UiObject2 object = mDevice.wait(Until.findObject(selector), WAIT_TIME_MS);
+        assertNotNull("Can't find a launcher object; selector: " + selector + ", current launcher: "
+                + mDevice.getLauncherPackageName(), object);
         return object;
     }