From 41c2a9a900792bef3620fcac24c9786bd0fe2af2 Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Tue, 27 Feb 2024 02:44:11 +0000 Subject: [PATCH] Debugging Logs for TaplTestsTransientTaskbar#testSwipeToStashAndUnstash Add logging for TaplTestsTransientTaskbar#testSwipeToStashAndUnstash. Flag: NONE Test: Manually tested in pixel 7. Bug: 324940434 Change-Id: I1309e8c1b2ce7b6c06cb520818ef109bbf2f2d23 --- .../com/android/launcher3/testing/shared/TestProtocol.java | 1 + .../tapl/com/android/launcher3/tapl/LaunchedAppState.java | 4 ++++ .../com/android/launcher3/tapl/LauncherInstrumentation.java | 6 ++++++ .../tapl/com/android/launcher3/tapl/LogEventChecker.java | 3 +++ 4 files changed, 14 insertions(+) diff --git a/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java b/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java index 8929d5d15c..f725c4a1ef 100644 --- a/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java +++ b/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java @@ -173,6 +173,7 @@ public final class TestProtocol { public static final String UIOBJECT_STALE_ELEMENT = "b/319501259"; public static final String ACTIVITY_NOT_RESUMED_AFTER_BACK = "b/322823209"; public static final String GET_FROM_RECENTS_FAILURE = "b/321775748"; + public static final String SUCCESSFUL_GESTURE_MISMATCH_EVENTS = "b/324940434"; public static final String REQUEST_EMULATE_DISPLAY = "emulate-display"; public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display"; diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LaunchedAppState.java b/tests/multivalentTests/tapl/com/android/launcher3/tapl/LaunchedAppState.java index 200f2fff17..b5414b7cb8 100644 --- a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LaunchedAppState.java +++ b/tests/multivalentTests/tapl/com/android/launcher3/tapl/LaunchedAppState.java @@ -24,7 +24,9 @@ import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_ENABLE_B import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_SHELL_DRAG_READY; import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_STASHED_TASKBAR_SCALE; import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_TASKBAR_FROM_NAV_THRESHOLD; +import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS; import static com.android.launcher3.testing.shared.TestProtocol.TEST_INFO_RESPONSE_FIELD; +import static com.android.launcher3.testing.shared.TestProtocol.testLogD; import android.graphics.Point; import android.graphics.Rect; @@ -139,6 +141,8 @@ public final class LaunchedAppState extends Background { return new Taskbar(mLauncher); } finally { + testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, + "swipeUpToUnstashTaskbar: completed gesture"); mLauncher.getTestInfo(REQUEST_DISABLE_BLOCK_TIMEOUT); } } diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 326802f540..5165d58d66 100644 --- a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -30,7 +30,9 @@ import static com.android.launcher3.tapl.TestHelpers.getOverviewPackageName; import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL; import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_GET_SPLIT_SELECTION_ACTIVE; import static com.android.launcher3.testing.shared.TestProtocol.REQUEST_NUM_ALL_APPS_COLUMNS; +import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS; import static com.android.launcher3.testing.shared.TestProtocol.TEST_INFO_RESPONSE_FIELD; +import static com.android.launcher3.testing.shared.TestProtocol.testLogD; import android.app.ActivityManager; import android.app.Instrumentation; @@ -2312,9 +2314,13 @@ public final class LauncherInstrumentation { } if (mEventChecker != null) { + testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "eventsCheck: mEventChecker exists"); mEventChecker = null; if (mCheckEventsForSuccessfulGestures) { final String message = eventChecker.verify(WAIT_TIME_MS, true); + testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, + "mCheckEventsForSuccessfulGestures = true | eventsCheck: message=" + + message); if (message != null) { dumpDiagnostics(message); checkForAnomaly(); diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/multivalentTests/tapl/com/android/launcher3/tapl/LogEventChecker.java index 672c6e0c8c..70d63bd817 100644 --- a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LogEventChecker.java +++ b/tests/multivalentTests/tapl/com/android/launcher3/tapl/LogEventChecker.java @@ -18,6 +18,8 @@ package com.android.launcher3.tapl; import static com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_MAIN; import static com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_PILFER; import static com.android.launcher3.testing.shared.TestProtocol.SEQUENCE_TIS; +import static com.android.launcher3.testing.shared.TestProtocol.SUCCESSFUL_GESTURE_MISMATCH_EVENTS; +import static com.android.launcher3.testing.shared.TestProtocol.testLogD; import android.os.SystemClock; @@ -88,6 +90,7 @@ public class LogEventChecker { } String verify(long waitForExpectedCountMs, boolean successfulGesture) { + testLogD(SUCCESSFUL_GESTURE_MISMATCH_EVENTS, "LogEventChecker.java - verify"); final ListMap actualEvents = finishSync(waitForExpectedCountMs); if (actualEvents == null) return "null event sequences because launcher likely died";