commit ec4be03dd34fd8e639684b0be905ae454a01b963
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 23 03:42:39 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 23 03:42:39 2021 +0000
tree 7a59799ec4f8a17ac4109cbd8c7c62ecb1794511
parent 2a0516f6cc95ca0051dcb41895ac9c8a993d25be
parent 6c1331ca42a67c13c306c72d41b64a1110578fd5

Merge "Improving diags when Launcher is invisible when the test fails" into sc-v2-dev

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 1f64131..5cd03e4 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -406,12 +406,15 @@
     }
 
     private String getVisiblePackages() {
-        return mDevice.findObjects(getAnyObjectSelector())
+        final String apps = mDevice.findObjects(getAnyObjectSelector())
                 .stream()
                 .map(LauncherInstrumentation::getApplicationPackageSafe)
                 .distinct()
-                .filter(pkg -> pkg != null && !"com.android.systemui".equals(pkg))
+                .filter(pkg -> pkg != null && !SYSTEMUI_PACKAGE.equals(pkg))
                 .collect(Collectors.joining(", "));
+        return !apps.isEmpty()
+                ? "active app: " + apps
+                : "the test doesn't see views from any app, including Launcher";
     }
 
     private static String getApplicationPackageSafe(UiObject2 object) {