Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b65d66 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Add Wm policy tests to presubmit" into main

parents 0904befb 4dbd7e31

services/tests/wmtests/src/com/android/server/policy/CombinationKeyTests.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.server.policy.PhoneWindowManager.POWER_VOLUME_UP_BEHAV 
import static com.android.server.policy.PhoneWindowManager.POWER_VOLUME_UP_BEHAVIOR_MUTE;



import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.Presubmit;

import android.view.ViewConfiguration;



import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -38,6 +39,7 @@ import org.junit.runner.RunWith; 
 * Build/Install/Run:

 *  atest WmTests:CombinationKeyTests

 */

@Presubmit

@MediumTest

@RunWith(AndroidJUnit4.class)

@DisableFlags(com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER_MULTI_KEY_GESTURES)

services/tests/wmtests/src/com/android/server/policy/DeferredKeyActionExecutorTests.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.policy; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.platform.test.annotations.Presubmit;

import android.view.KeyEvent;



import org.junit.Before;
@@ -29,6 +30,7 @@ import org.junit.Test; 
 *

 * <p>Build/Install/Run: atest WmTests:DeferredKeyActionExecutorTests

 */

@Presubmit

public final class DeferredKeyActionExecutorTests {



    private DeferredKeyActionExecutor mKeyActionExecutor;

services/tests/wmtests/src/com/android/server/policy/KeyCombinationManagerTests.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static org.testng.Assert.assertTrue; 
import android.os.Handler;

import android.os.Looper;

import android.os.SystemClock;

import android.platform.test.annotations.Presubmit;

import android.view.KeyEvent;



import androidx.test.filters.SmallTest;
@@ -45,7 +46,7 @@ import java.util.concurrent.TimeUnit; 
 * Build/Install/Run:

 *  atest KeyCombinationManagerTests

 */



@Presubmit

@SmallTest

public class KeyCombinationManagerTests {

    private KeyCombinationManager mKeyCombinationManager;

services/tests/wmtests/src/com/android/server/policy/ModifierShortcutManagerTests.java

+3 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.UserHandle;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;

import android.view.KeyEvent;

import android.view.KeyboardShortcutGroup;
@@ -64,7 +65,7 @@ import java.util.Collections; 
 * Build/Install/Run:

 *  atest ModifierShortcutManagerTests

 */



@Presubmit

@SmallTest

@EnableFlags(com.android.hardware.input.Flags.FLAG_MODIFIER_SHORTCUT_MANAGER_REFACTOR)

public class ModifierShortcutManagerTests {
@@ -127,7 +128,7 @@ public class ModifierShortcutManagerTests { 
        // Total valid shortcuts.

        KeyboardShortcutGroup group =

                mModifierShortcutManager.getApplicationLaunchKeyboardShortcuts(-1);

        assertEquals(13, group.getItems().size());

        assertEquals(11, group.getItems().size());



        // Total valid shift shortcuts.

        assertEquals(3, group.getItems().stream()

services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.app.AppOpsManager; 
import android.content.Context;

import android.hardware.input.InputManager;

import android.os.PowerManager;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.filters.SmallTest;
@@ -72,6 +73,7 @@ import org.junit.Test; 
 * Build/Install/Run:

 * atest WmTests:PhoneWindowManagerTests

 */

@Presubmit

@SmallTest

public class PhoneWindowManagerTests {