Merge "Moved some stable WmTest post-submit test to pre-submit" (214f5460) · Commits · e / os / android_frameworks_base

services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ import static org.junit.Assert.assertTrue;

	import android.graphics.Rect;		import android.graphics.Rect;
	import android.os.IBinder;		import android.os.IBinder;
			import android.platform.test.annotations.Presubmit;
	import android.view.Display;		import android.view.Display;
	import android.view.IRemoteAnimationFinishedCallback;		import android.view.IRemoteAnimationFinishedCallback;
	import android.view.IRemoteAnimationRunner;		import android.view.IRemoteAnimationRunner;
	@@ -48,6 +49,7 @@ import org.junit.Test;
	* atest WmTests:AppChangeTransitionTests		* atest WmTests:AppChangeTransitionTests
	*/		*/
	@SmallTest		@SmallTest
			@Presubmit
	public class AppChangeTransitionTests extends WindowTestsBase {		public class AppChangeTransitionTests extends WindowTestsBase {

	private TaskStack mStack;		private TaskStack mStack;

services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,6 @@ import android.platform.test.annotations.Presubmit;
	import android.view.Surface;		import android.view.Surface;
	import android.view.WindowManager;		import android.view.WindowManager;

	import androidx.test.filters.FlakyTest;
	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;

	import org.junit.Before;		import org.junit.Before;
	@@ -142,7 +141,6 @@ public class AppWindowTokenTests extends WindowTestsBase {
	mToken.removeImmediately();		mToken.removeImmediately();
	}		}

	@FlakyTest(detail = "Promote to presubmit when shown to be stable.")
	@Test		@Test
	public void testLandscapeSeascapeRotationByApp() {		public void testLandscapeSeascapeRotationByApp() {
	// Some plumbing to get the service ready for rotation updates.		// Some plumbing to get the service ready for rotation updates.
	@@ -303,7 +301,6 @@ public class AppWindowTokenTests extends WindowTestsBase {
	}		}

	@Test		@Test
	@FlakyTest(detail = "Promote once confirmed non-flaky")
	public void testStuckExitingWindow() {		public void testStuckExitingWindow() {
	final WindowState closingWindow = createWindow(null, FIRST_APPLICATION_WINDOW,		final WindowState closingWindow = createWindow(null, FIRST_APPLICATION_WINDOW,
	"closingWindow");		"closingWindow");
	@@ -346,7 +343,6 @@ public class AppWindowTokenTests extends WindowTestsBase {
	assertNoStartingWindow(mToken);		assertNoStartingWindow(mToken);
	}		}

	@FlakyTest(detail = "Promote to presubmit when shown to be stable.")
	@Test		@Test
	public void testAddRemoveRace() {		public void testAddRemoveRace() {
	// There was once a race condition between adding and removing starting windows		// There was once a race condition between adding and removing starting windows

services/tests/wmtests/src/com/android/server/wm/AssistDataRequesterTest.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.Looper;		import android.os.Looper;
			import android.platform.test.annotations.Presubmit;
	import android.util.Log;		import android.util.Log;
	import android.view.IWindowManager;		import android.view.IWindowManager;

	@@ -71,6 +72,7 @@ import java.util.concurrent.TimeUnit;
	* atest WmTests:AssistDataRequesterTest		* atest WmTests:AssistDataRequesterTest
	*/		*/
	@MediumTest		@MediumTest
			@Presubmit
	public class AssistDataRequesterTest extends ActivityTestsBase {		public class AssistDataRequesterTest extends ActivityTestsBase {

	private static final String TAG = AssistDataRequesterTest.class.getSimpleName();		private static final String TAG = AssistDataRequesterTest.class.getSimpleName();

services/tests/wmtests/src/com/android/server/wm/KeyguardDisableHandlerTest.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@ import android.os.Binder;
	import android.os.Handler;		import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.UserHandle;		import android.os.UserHandle;
			import android.platform.test.annotations.Presubmit;
	import android.util.SparseBooleanArray;		import android.util.SparseBooleanArray;

	import com.android.server.wm.LockTaskController.LockTaskToken;		import com.android.server.wm.LockTaskController.LockTaskToken;
	@@ -43,6 +44,7 @@ import org.junit.Test;

	import java.lang.reflect.Constructor;		import java.lang.reflect.Constructor;

			@Presubmit
	public class KeyguardDisableHandlerTest {		public class KeyguardDisableHandlerTest {

	private KeyguardDisableHandler mKeyguardDisable;		private KeyguardDisableHandler mKeyguardDisable;

services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@ import android.util.SparseBooleanArray;
	import android.view.IRecentsAnimationRunner;		import android.view.IRecentsAnimationRunner;
	import android.view.SurfaceControl;		import android.view.SurfaceControl;

	import androidx.test.filters.FlakyTest;
	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;

	import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;		import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;
	@@ -112,7 +111,6 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
	}		}
	}		}

	@FlakyTest(bugId = 117117823)
	@Test		@Test
	public void testIncludedApps_expectTargetAndVisible() {		public void testIncludedApps_expectTargetAndVisible() {
	mWm.setRecentsAnimationController(mController);		mWm.setRecentsAnimationController(mController);