commit e8a72681163c9eca77608f030a14b1711e469b9d
author vadimt <vadimt@google.com> Thu Jun 27 11:57:30 2019 -0700
committer vadimt <vadimt@google.com> Thu Jun 27 13:24:12 2019 -0700
tree 95769e21a2ec6774b626127ebe5677a202e1fd58
parent 7926791fdbc040c607e1163ab794b98f11072eb0

Tapl: diagnosing anomalies

Bug: 133891845
Change-Id: I7e5afbdec580c6659917aa3e9586930d5f55ea51

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 a7e6336..40ab90a 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -263,10 +263,26 @@
         }
     }
 
+    private String getAnomalyMessage() {
+        final UiObject2 object = mDevice.findObject(By.res("android", "alertTitle"));
+        if (object != null) {
+            return "System alert popup is visible: " + object.getText();
+        }
+
+        if (!mDevice.hasObject(By.textStartsWith(""))) return "Screen is empty";
+
+        return null;
+    }
+
     private void fail(String message) {
-        log("Hierarchy dump for: " + getContextDescription() + message);
+        message = "http://go/tapl : " + getContextDescription() + message;
+
+        final String anomaly = getAnomalyMessage();
+        if (anomaly != null) message = anomaly + ", which causes:\n" + message;
+
+        log("Hierarchy dump for: " + message);
         dumpViewHierarchy();
-        Assert.fail("http://go/tapl : " + getContextDescription() + message);
+        Assert.fail(message);
     }
 
     private String getContextDescription() {