summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chilun <chilunhuang@google.com> 2020-04-27 16:22:49 +0800
committer Chilun Huang <chilunhuang@google.com> 2020-04-28 04:48:10 +0000
commit1754620afd3de4aac2ee64012ca7ab74ea60bc0b (patch)
tree6c8cca5ab38fedb66d4787fa577dab45114cde41
parent2d07babc2756588315521f937f8982dd1b1a09d9 (diff)
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
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java2
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/WindowManagerSettingsTests.java2
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/utils/RotationAnimationUtilsTest.java2
3 files changed, 6 insertions, 0 deletions
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;