summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-04-18 11:45:20 -0700
committervadimt <vadimt@google.com>2019-04-18 11:45:20 -0700
commit5243d0fff84ca685f1a6e51be32b5eeb27577284 (patch)
treeece09b27cd0a6ea34e8e2e8a9185ad253beaf6a7 /tests
parent44a063a16fd60a4fdbdb1a93cefcfffbe7428051 (diff)
downloadandroid_packages_apps_Trebuchet-5243d0fff84ca685f1a6e51be32b5eeb27577284.tar.gz
android_packages_apps_Trebuchet-5243d0fff84ca685f1a6e51be32b5eeb27577284.tar.bz2
android_packages_apps_Trebuchet-5243d0fff84ca685f1a6e51be32b5eeb27577284.zip
Improving TAPL diags
Change-Id: Ic84a65e26c4d05776d7e2acd592bcc227dc86a42
Diffstat (limited to 'tests')
-rw-r--r--tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 876afcc9d..8f777b689 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -255,12 +255,14 @@ public final class LauncherInstrumentation {
assertEquals("Unexpected display rotation",
mExpectedRotation, mDevice.getDisplayRotation());
final NavigationModel navigationModel = getNavigationModel();
- assertTrue("Presence of recents button doesn't match the interaction mode",
- (navigationModel == NavigationModel.THREE_BUTTON) ==
- hasSystemUiObject("recent_apps"));
- assertTrue("Presence of home button doesn't match the interaction mode",
- (navigationModel != NavigationModel.ZERO_BUTTON) ==
- hasSystemUiObject("home"));
+ final boolean hasRecentsButton = hasSystemUiObject("recent_apps");
+ final boolean hasHomeButton = hasSystemUiObject("home");
+ assertTrue("Presence of recents button doesn't match the interaction mode, mode="
+ + navigationModel.name() + ", hasRecents=" + hasRecentsButton,
+ (navigationModel == NavigationModel.THREE_BUTTON) == hasRecentsButton);
+ assertTrue("Presence of home button doesn't match the interaction mode, mode="
+ + navigationModel.name() + ", hasHome=" + hasHomeButton,
+ (navigationModel != NavigationModel.ZERO_BUTTON) == hasHomeButton);
log("verifyContainerType: " + containerType);
try (Closable c = addContextLayer(