Merge "Move post-submit CTS tests to pre-submit" into rvc-dev
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java b/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java
index bd054b9..4f6f726 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java
@@ -32,6 +32,7 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
+import android.platform.test.annotations.Presubmit;
import android.server.wm.cts.R;
import android.view.DragEvent;
import android.view.InputDevice;
@@ -53,6 +54,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
+@Presubmit
@RunWith(AndroidJUnit4.class)
public class DragDropTest extends WindowManagerTestBase {
static final String TAG = "DragDropTest";
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java
index 84961c1..67f51ab 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java
@@ -24,6 +24,7 @@
import android.app.Instrumentation;
import android.graphics.PixelFormat;
import android.graphics.Region;
+import android.platform.test.annotations.Presubmit;
import android.view.KeyEvent;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
@@ -44,6 +45,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+@Presubmit
@MediumTest
@RunWith(AndroidJUnit4.class)
public class SurfaceViewTest {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_BadTokenExceptionTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_BadTokenExceptionTest.java
index 5578ee4..c44d308 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_BadTokenExceptionTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_BadTokenExceptionTest.java
@@ -18,6 +18,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import android.platform.test.annotations.Presubmit;
import android.view.WindowManager.BadTokenException;
import androidx.test.filters.SmallTest;
@@ -26,6 +27,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+@Presubmit
@SmallTest
@RunWith(AndroidJUnit4.class)
public class WindowManager_BadTokenExceptionTest {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_LayoutParamsTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_LayoutParamsTest.java
index 442899f..fd9892c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_LayoutParamsTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowManager_LayoutParamsTest.java
@@ -26,6 +26,7 @@
import android.os.Binder;
import android.os.IBinder;
import android.os.Parcel;
+import android.platform.test.annotations.Presubmit;
import android.text.SpannedString;
import android.view.Gravity;
import android.view.WindowManager;
@@ -36,6 +37,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+@Presubmit
@SmallTest
@RunWith(AndroidJUnit4.class)
public class WindowManager_LayoutParamsTest {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
index e2c2fe6..baef606 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -51,6 +50,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
+import android.platform.test.annotations.Presubmit;
import android.server.wm.cts.R;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -89,6 +89,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@Presubmit
@MediumTest
@RunWith(AndroidJUnit4.class)
public class WindowTest {
