Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ModifierShortcutTests

Browse Source 
Fixes ModifierShortcutTests after I3eb20dc0878f9b7c7ebfb7fc5099a1c1d6cc874f broke them.
Also improves error reporting when it fails.

Fixes: 269790468
Test: atest ModifierShortcutTests
Change-Id: I71c6e9d122d830d64258833d1a01e0cbb043d9c0
This commit is contained in:
Adrian Roos
2023-02-17 23:40:45 +01:00
parent e9972527c4
commit b841a73b6e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java
View File

@@ -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<String> 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);

9
services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java
View File

@@ -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<Intent> 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);
}