From 1754620afd3de4aac2ee64012ca7ab74ea60bc0b Mon Sep 17 00:00:00 2001 From: Chilun Date: Mon, 27 Apr 2020 16:22:49 +0800 Subject: Move post-submit tests of WmTests to pre-submit Move below post-submit tests to pre-submit since they are all passed consistently. - ActivityTaskManagerServiceTests - WindowManagerSettingsTests - RotationAnimationUtilsTest Bug: 151621673 Test: Manually run these tests Change-Id: I11af2fe24dcb36d76e2f9b2b7783a1b562dba937 --- .../src/com/android/server/wm/ActivityTaskManagerServiceTests.java | 2 ++ .../wmtests/src/com/android/server/wm/WindowManagerSettingsTests.java | 2 ++ .../src/com/android/server/wm/utils/RotationAnimationUtilsTest.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java index 17dd26ed18e9..4b43ceb6e07f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java @@ -39,6 +39,7 @@ import android.content.res.Configuration; import android.graphics.Rect; import android.os.IBinder; import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; import android.view.IDisplayWindowListener; import androidx.test.filters.MediumTest; @@ -57,6 +58,7 @@ import java.util.ArrayList; * Build/Install/Run: * atest WmTests:ActivityTaskManagerServiceTests */ +@Presubmit @MediumTest @RunWith(WindowTestRunner.class) public class ActivityTaskManagerServiceTests extends ActivityTestsBase { diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerSettingsTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerSettingsTests.java index 926bd8c9846a..8d5363c89570 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerSettingsTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerSettingsTests.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; import android.content.ContentResolver; import android.net.Uri; +import android.platform.test.annotations.Presubmit; import android.provider.Settings; import androidx.test.filters.SmallTest; @@ -43,6 +44,7 @@ import org.junit.runner.RunWith; * Build/Install/Run: * atest WmTests:WindowManagerSettingsTests */ +@Presubmit @SmallTest @RunWith(WindowTestRunner.class) public class WindowManagerSettingsTests extends WindowTestsBase { diff --git a/services/tests/wmtests/src/com/android/server/wm/utils/RotationAnimationUtilsTest.java b/services/tests/wmtests/src/com/android/server/wm/utils/RotationAnimationUtilsTest.java index e5497a2313d1..233e147c5904 100644 --- a/services/tests/wmtests/src/com/android/server/wm/utils/RotationAnimationUtilsTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/utils/RotationAnimationUtilsTest.java @@ -27,10 +27,12 @@ import android.graphics.GraphicBuffer; import android.graphics.Matrix; import android.graphics.PointF; import android.view.Surface; +import android.platform.test.annotations.Presubmit; import org.junit.Before; import org.junit.Test; +@Presubmit public class RotationAnimationUtilsTest { private static final int BITMAP_HEIGHT = 100; -- cgit v1.2.3-59-g8ed1b