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

Commit ae11234c authored Apr 28, 2020 by TreeHugger Robot Committed by Android (Google) Code Review Apr 28, 2020

Merge "Move post-submit tests of WmTests to pre-submit" into rvc-dev

parents 18f643d4 1754620a

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@ import android.content.res.Configuration;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.RemoteException;		import android.os.RemoteException;
			import android.platform.test.annotations.Presubmit;
	import android.view.IDisplayWindowListener;		import android.view.IDisplayWindowListener;

	import androidx.test.filters.MediumTest;		import androidx.test.filters.MediumTest;
	@@ -57,6 +58,7 @@ import java.util.ArrayList;
	* Build/Install/Run:		* Build/Install/Run:
	* atest WmTests:ActivityTaskManagerServiceTests		* atest WmTests:ActivityTaskManagerServiceTests
	*/		*/
			@Presubmit
	@MediumTest		@MediumTest
	@RunWith(WindowTestRunner.class)		@RunWith(WindowTestRunner.class)
	public class ActivityTaskManagerServiceTests extends ActivityTestsBase {		public class ActivityTaskManagerServiceTests extends ActivityTestsBase {

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify;

	import android.content.ContentResolver;		import android.content.ContentResolver;
	import android.net.Uri;		import android.net.Uri;
			import android.platform.test.annotations.Presubmit;
	import android.provider.Settings;		import android.provider.Settings;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	@@ -43,6 +44,7 @@ import org.junit.runner.RunWith;
	* Build/Install/Run:		* Build/Install/Run:
	* atest WmTests:WindowManagerSettingsTests		* atest WmTests:WindowManagerSettingsTests
	*/		*/
			@Presubmit
	@SmallTest		@SmallTest
	@RunWith(WindowTestRunner.class)		@RunWith(WindowTestRunner.class)
	public class WindowManagerSettingsTests extends WindowTestsBase {		public class WindowManagerSettingsTests extends WindowTestsBase {

services/tests/wmtests/src/com/android/server/wm/utils/RotationAnimationUtilsTest.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,10 +27,12 @@ import android.graphics.GraphicBuffer;
	import android.graphics.Matrix;		import android.graphics.Matrix;
	import android.graphics.PointF;		import android.graphics.PointF;
	import android.view.Surface;		import android.view.Surface;
			import android.platform.test.annotations.Presubmit;

	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;

			@Presubmit
	public class RotationAnimationUtilsTest {		public class RotationAnimationUtilsTest {

	private static final int BITMAP_HEIGHT = 100;		private static final int BITMAP_HEIGHT = 100;