Better diagnostics for waitForLauncherObject
AOSP tests still fail, that's why.
Test: LauncherInstrumentation.getWorkspace
Change-Id: I98610040e571b5a7cb656908cfea328f1ae08c2c
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;
}