From b841a73b6e4ed37e2cbfab07d9688606c833d1aa Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Fri, 17 Feb 2023 23:40:45 +0100 Subject: [PATCH] Fix ModifierShortcutTests Fixes ModifierShortcutTests after I3eb20dc0878f9b7c7ebfb7fc5099a1c1d6cc874f broke them. Also improves error reporting when it fails. Fixes: 269790468 Test: atest ModifierShortcutTests Change-Id: I71c6e9d122d830d64258833d1a01e0cbb043d9c0 --- .../com/android/server/policy/ModifierShortcutTests.java | 8 ++++---- .../android/server/policy/TestPhoneWindowManager.java | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java b/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java index ad47773747d4b..369e8f14ff743 100644 --- a/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java @@ -16,13 +16,12 @@ package com.android.server.policy; -import static android.view.KeyEvent.KEYCODE_A; import static android.view.KeyEvent.KEYCODE_ALT_LEFT; import static android.view.KeyEvent.KEYCODE_B; import static android.view.KeyEvent.KEYCODE_C; import static android.view.KeyEvent.KEYCODE_CTRL_LEFT; import static android.view.KeyEvent.KEYCODE_E; -import static android.view.KeyEvent.KEYCODE_L; +import static android.view.KeyEvent.KEYCODE_K; import static android.view.KeyEvent.KEYCODE_M; import static android.view.KeyEvent.KEYCODE_META_LEFT; import static android.view.KeyEvent.KEYCODE_N; @@ -31,6 +30,7 @@ import static android.view.KeyEvent.KEYCODE_S; import static android.view.KeyEvent.KEYCODE_SLASH; import static android.view.KeyEvent.KEYCODE_SPACE; import static android.view.KeyEvent.KEYCODE_TAB; +import static android.view.KeyEvent.KEYCODE_U; import static android.view.KeyEvent.KEYCODE_Z; import android.content.Intent; @@ -42,11 +42,11 @@ import org.junit.Test; public class ModifierShortcutTests extends ShortcutKeyTestBase { private static final SparseArray META_SHORTCUTS = new SparseArray<>(); static { - META_SHORTCUTS.append(KEYCODE_A, Intent.CATEGORY_APP_CALCULATOR); + META_SHORTCUTS.append(KEYCODE_U, Intent.CATEGORY_APP_CALCULATOR); META_SHORTCUTS.append(KEYCODE_B, Intent.CATEGORY_APP_BROWSER); META_SHORTCUTS.append(KEYCODE_C, Intent.CATEGORY_APP_CONTACTS); META_SHORTCUTS.append(KEYCODE_E, Intent.CATEGORY_APP_EMAIL); - META_SHORTCUTS.append(KEYCODE_L, Intent.CATEGORY_APP_CALENDAR); + META_SHORTCUTS.append(KEYCODE_K, Intent.CATEGORY_APP_CALENDAR); META_SHORTCUTS.append(KEYCODE_M, Intent.CATEGORY_APP_MAPS); META_SHORTCUTS.append(KEYCODE_P, Intent.CATEGORY_APP_MUSIC); META_SHORTCUTS.append(KEYCODE_S, Intent.CATEGORY_APP_MESSAGING); diff --git a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java index a76b82babe08a..6e7e005fc0a38 100644 --- a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java +++ b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java @@ -237,6 +237,7 @@ class TestPhoneWindowManager { overrideLaunchAccessibility(); doReturn(false).when(mPhoneWindowManager).keyguardOn(); doNothing().when(mContext).startActivityAsUser(any(), any()); + Mockito.reset(mContext); } void tearDown() { @@ -399,8 +400,12 @@ class TestPhoneWindowManager { void assertLaunchCategory(String category) { waitForIdle(); ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).startActivityAsUser(intentCaptor.capture(), any()); - Assert.assertTrue(intentCaptor.getValue().getSelector().hasCategory(category)); + try { + verify(mContext).startActivityAsUser(intentCaptor.capture(), any()); + Assert.assertTrue(intentCaptor.getValue().getSelector().hasCategory(category)); + } catch (Throwable t) { + throw new AssertionError("failed to assert " + category, t); + } // Reset verifier for next call. Mockito.reset(mContext); }