Merge "Rename WM test filter to FrameworksTestsFilter" (487ddbf5) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,15 @@ import android.support.test.runner.AndroidJUnit4;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		/**
		* Tests for {@link ClientTransaction}.
		*
		* <p>Build/Install/Run:
		* atest FrameworksCoreTests:ClientTransactionTests
		*
		* <p>This test class is a part of Window Manager Service tests and specified in
		* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
		*/
		@RunWith(AndroidJUnit4.class)
		@SmallTest
		@Presubmit

+9 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,15 @@ import android.support.test.runner.AndroidJUnit4;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		/**
		* Tests for {@link ObjectPool}.
		*
		* <p>Build/Install/Run:
		* atest FrameworksCoreTests:ObjectPoolTests
		*
		* <p>This test class is a part of Window Manager Service tests and specified in
		* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
		*/
		@RunWith(AndroidJUnit4.class)
		@SmallTest
		@Presubmit

+10 −3

Original line number	Diff line number	Diff line
		@@ -26,9 +26,8 @@ import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP;
		import static android.app.servertransaction.ActivityLifecycleItem.PRE_ON_CREATE;
		import static android.app.servertransaction.ActivityLifecycleItem.UNDEFINED;

		import static junit.framework.Assert.assertEquals;

		import static org.junit.Assert.assertArrayEquals;
		import static org.junit.Assert.assertEquals;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.inOrder;
		@@ -58,7 +57,15 @@ import java.util.Collections;
		import java.util.List;
		import java.util.stream.Collectors;

		/** Test {@link TransactionExecutor} logic. */
		/**
		* Test {@link TransactionExecutor} logic.
		*
		* <p>Build/Install/Run:
		* atest FrameworksCoreTests:TransactionExecutorTests
		*
		* <p>This test class is a part of Window Manager Service tests and specified in
		* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
		*/
		@RunWith(AndroidJUnit4.class)
		@SmallTest
		@Presubmit

+11 −3

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ import static android.app.servertransaction.TestUtils.mergedConfig;
		import static android.app.servertransaction.TestUtils.referrerIntentList;
		import static android.app.servertransaction.TestUtils.resultInfoList;

		import static junit.framework.Assert.assertEquals;
		import static junit.framework.Assert.assertTrue;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;

		import android.app.IApplicationThread;
		import android.app.IInstrumentationWatcher;
		@@ -60,7 +60,15 @@ import org.junit.runner.RunWith;
		import java.util.List;
		import java.util.Map;

		/** Test parcelling and unparcelling of transactions and transaction items. */
		/**
		* Test parcelling and unparcelling of transactions and transaction items.
		*
		* <p>Build/Install/Run:
		* atest FrameworksCoreTests:TransactionParcelTests
		*
		* <p>This test class is a part of Window Manager Service tests and specified in
		* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
		*/
		@RunWith(AndroidJUnit4.class)
		@SmallTest
		@Presubmit

+9 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,15 @@ import org.junit.runner.RunWith;

		import java.util.Arrays;

		/**
		* Tests for {@link DisplayCutout}.
		*
		* <p>Build/Install/Run:
		* atest FrameworksCoreTests:DisplayCutoutTest
		*
		* <p>This test class is a part of Window Manager Service tests and specified in
		* {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.
		*/
		@RunWith(AndroidJUnit4.class)
		@SmallTest
		@Presubmit