From 5243d0fff84ca685f1a6e51be32b5eeb27577284 Mon Sep 17 00:00:00 2001 From: vadimt Date: Thu, 18 Apr 2019 11:45:20 -0700 Subject: [PATCH] Improving TAPL diags Change-Id: Ic84a65e26c4d05776d7e2acd592bcc227dc86a42 --- .../launcher3/tapl/LauncherInstrumentation.java | 14 ++++++++------ 1 file 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 876afcc9de..8f777b6890 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(