From 4681849a6b94e6a7794bbb8b918f064187546890 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 26 Mar 2019 19:19:01 +0900 Subject: [PATCH] Rename WM test filter to FrameworksTestsFilter This CL adds Window Manager related tests of FrameworksServicesTests to the test filter, and adds a comment to each tests mentioning about FrameworksTestsFilter. Test: Pass all 85 non-flaky presubmit tests of FrameworksCoreTests specified in FrameworksTestsFilter. $ tradefed.sh run commandAndExit FrameworksCoreTests \ --instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter --include-annotation android.platform.test.annotations.Presubmit \ --exclude-annotation androidx.test.filters.FlakyTest Test: Pass all 133 non-flaky presubmit tests of FrameworksServicesTests specified in FrameworksTestsFilter. $ tradefed.sh run commandAndExit FrameworksServicesTests \ --instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter --include-annotation android.platform.test.annotations.Presubmit \ --exclude-annotation androidx.test.filters.FlakyTest Test: Pass all 162 non-flaky presubmit tests of FrameworksServicesTests specified as under package com.android.server.wm. $ tradefed.sh run commandAndExit FrameworksServicesTests \ --instrumentation-arg selectTest=com.android.server.wm. \ --instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter --include-annotation android.platform.test.annotations.Presubmit \ --exclude-annotation androidx.test.filters.FlakyTest Bug: 122451194 Change-Id: I9592ff01158eec1b4ef4d0dd22be243e10bd198e Merged-In: I9592ff01158eec1b4ef4d0dd22be243e10bd198e --- .../ClientTransactionTests.java | 9 +++ .../servertransaction/ObjectPoolTests.java | 9 +++ .../TransactionExecutorTests.java | 13 +++- .../TransactionParcelTests.java | 14 +++- .../src/android/view/DisplayCutoutTest.java | 9 +++ .../am/ActivityLaunchParamsModifierTests.java | 5 +- .../server/am/ActivityRecordTests.java | 14 ++-- .../am/ActivityStackSupervisorTests.java | 10 +-- .../android/server/am/ActivityStackTests.java | 7 +- .../am/ActivityStartControllerTests.java | 7 +- .../am/ActivityStartInterceptorTest.java | 7 +- .../server/am/ActivityStarterTests.java | 15 +++-- .../server/am/AssistDataRequesterTest.java | 6 +- .../am/ClientLifecycleManagerTests.java | 9 +++ .../am/LaunchParamsControllerTests.java | 11 ++-- .../PendingRemoteAnimationRegistryTest.java | 8 ++- .../android/server/am/RecentTasksTest.java | 8 ++- .../server/am/RecentsAnimationTest.java | 12 +++- .../android/server/am/RunningTasksTest.java | 10 ++- .../server/am/SafeActivityOptionsTest.java | 9 +++ .../am/TaskLaunchParamsModifierTests.java | 5 +- .../android/server/am/TaskPersisterTest.java | 10 ++- .../android/server/am/TaskRecordTests.java | 5 +- .../am/TaskStackChangedListenerTest.java | 9 +++ .../wm/test/filters/CoreTestsFilter.java | 44 ------------- .../test/filters/FrameworksTestsFilter.java | 66 +++++++++++++++++++ 26 files changed, 242 insertions(+), 89 deletions(-) delete mode 100644 tests/utils/testutils/java/com/android/server/wm/test/filters/CoreTestsFilter.java create mode 100644 tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java diff --git a/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java b/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java index b1f8552463200..c59098795faf5 100644 --- a/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java @@ -29,6 +29,15 @@ import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +/** + * Tests for {@link ClientTransaction}. + * + *

Build/Install/Run: + * atest FrameworksCoreTests:ClientTransactionTests + * + *

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 diff --git a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java index fb0f5344f6430..32e5f008c7296 100644 --- a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java @@ -41,6 +41,15 @@ import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +/** + * Tests for {@link ObjectPool}. + * + *

Build/Install/Run: + * atest FrameworksCoreTests:ObjectPoolTests + * + *

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 diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java index fe58116002f2d..6620a2e86272b 100644 --- a/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java @@ -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. + * + *

Build/Install/Run: + * atest FrameworksCoreTests:TransactionExecutorTests + * + *

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 diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java index 104208eefef77..d922c16a92973 100644 --- a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java @@ -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. + * + *

Build/Install/Run: + * atest FrameworksCoreTests:TransactionParcelTests + * + *

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 diff --git a/core/tests/coretests/src/android/view/DisplayCutoutTest.java b/core/tests/coretests/src/android/view/DisplayCutoutTest.java index fe45fe7d3aaf1..a3df1a094ec08 100644 --- a/core/tests/coretests/src/android/view/DisplayCutoutTest.java +++ b/core/tests/coretests/src/android/view/DisplayCutoutTest.java @@ -40,6 +40,15 @@ import org.junit.runner.RunWith; import java.util.Arrays; +/** + * Tests for {@link DisplayCutout}. + * + *

Build/Install/Run: + * atest FrameworksCoreTests:DisplayCutoutTest + * + *

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 diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java index d75a3fc8d20b7..01644737f55fe 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java @@ -43,8 +43,11 @@ import org.junit.runner.RunWith; /** * Tests for exercising resizing bounds due to activity options. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:ActivityLaunchParamsModifierTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java index 5ee7477b486c6..af0aaf31cd597 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java @@ -30,16 +30,15 @@ import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_BOTTOM; import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_LEFT; import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_RIGHT; -import static junit.framework.TestCase.assertNotNull; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -62,8 +61,11 @@ import org.mockito.invocation.InvocationOnMock; /** * Tests for the {@link ActivityRecord} class. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:com.android.server.am.ActivityRecordTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java index f36c57973240a..b0f949132c3e9 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java @@ -27,15 +27,14 @@ import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE; import static android.content.pm.ActivityInfo.FLAG_SHOW_WHEN_LOCKED; import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_DESTROYING; -import static com.android.server.am.ActivityStackSupervisor - .MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE; +import static com.android.server.am.ActivityStackSupervisor.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -62,8 +61,11 @@ import java.util.ArrayList; /** * Tests for the {@link ActivityStackSupervisor} class. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java index be0c689ab89f3..d89bc976e73f6 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -51,8 +51,11 @@ import org.junit.runner.RunWith; /** * Tests for the {@link ActivityStack} class. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:com.android.server.am.ActivityStackTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @SmallTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStartControllerTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityStartControllerTests.java index 3464ac2a30441..e84e354dbb8fd 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityStartControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityStartControllerTests.java @@ -19,8 +19,8 @@ package com.android.server.am; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -43,8 +43,11 @@ import java.util.Random; /** * Tests for the {@link ActivityStartController} class. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:ActivityStartControllerTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @SmallTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStartInterceptorTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityStartInterceptorTest.java index d1550d736e0bf..1c83ded3cb9e2 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityStartInterceptorTest.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityStartInterceptorTest.java @@ -55,8 +55,11 @@ import org.mockito.MockitoAnnotations; /** * Unit tests for {@link ActivityStartInterceptorTest}. * - * Build/Install/Run: - * bit FrameworksServicesTests:com.android.server.am.ActivityStartInterceptorTest + *

Build/Install/Run: + * atest FrameworksServicesTests:ActivityStartInterceptorTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @SmallTest public class ActivityStartInterceptorTest { diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java index f956a364315bf..1e127a9863e6c 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java @@ -39,14 +39,14 @@ import static com.android.server.am.ActivityManagerService.ANIMATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyObject; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -80,8 +80,11 @@ import org.junit.runner.RunWith; /** * Tests for the {@link ActivityStarter} class. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:ActivityStarterTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @SmallTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java b/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java index d985364a7ceef..2e1155e0a905a 100644 --- a/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java +++ b/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java @@ -64,7 +64,11 @@ import java.util.concurrent.TimeUnit; * Note: Currently, we only support fetching the screenshot for the current application, so the * screenshot checks are hardcoded accordingly. * - * runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java + *

Build/Install/Run: + * atest FrameworksServicesTests:AssistDataRequesterTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @FlakyTest(bugId = 113616538) diff --git a/services/tests/servicestests/src/com/android/server/am/ClientLifecycleManagerTests.java b/services/tests/servicestests/src/com/android/server/am/ClientLifecycleManagerTests.java index b4ad183db386d..f882b63acfce4 100644 --- a/services/tests/servicestests/src/com/android/server/am/ClientLifecycleManagerTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ClientLifecycleManagerTests.java @@ -16,6 +16,15 @@ import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +/** + * Tests for {@link ClientLifecycleManager}. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:ClientLifecycleManagerTests + * + *

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 diff --git a/services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java b/services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java index 8d675dd3032d7..d24991ebc539c 100644 --- a/services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java @@ -24,10 +24,10 @@ import static com.android.server.am.LaunchParamsController.LaunchParamsModifier. import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -51,8 +51,11 @@ import org.junit.runner.RunWith; /** * Tests for exercising {@link LaunchParamsController}. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:LaunchParamsControllerTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/PendingRemoteAnimationRegistryTest.java b/services/tests/servicestests/src/com/android/server/am/PendingRemoteAnimationRegistryTest.java index f5f507f8b210a..b52ce1702488f 100644 --- a/services/tests/servicestests/src/com/android/server/am/PendingRemoteAnimationRegistryTest.java +++ b/services/tests/servicestests/src/com/android/server/am/PendingRemoteAnimationRegistryTest.java @@ -38,7 +38,13 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; /** - * atest PendingRemoteAnimationRegistryTest + * Tests for {@link PendingRemoteAnimationRegistry}. + * + *

Build/Install/Run: + * atest PendingRemoteAnimationRegistryTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @SmallTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java index aa9123b16aa72..c610540992826 100644 --- a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java +++ b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java @@ -76,7 +76,13 @@ import java.util.Random; import java.util.Set; /** - * atest FrameworksServicesTests:RecentTasksTest + * Tests for {@link RecentTasks}. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:RecentTasksTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java b/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java index fa6a95ce275c1..edc623589f4b0 100644 --- a/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java +++ b/services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java @@ -22,9 +22,9 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -46,7 +46,13 @@ import org.junit.Test; import org.junit.runner.RunWith; /** - * atest FrameworksServicesTests:RecentsAnimationTest + * Tests for recent tasks animation. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:RecentsAnimationTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java index 19288a9c28d7f..c38a594c1038d 100644 --- a/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java +++ b/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java @@ -43,7 +43,13 @@ import org.junit.runner.RunWith; import java.util.ArrayList; /** - * runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java + * Tests for {@link RunningTasks}. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:RunningTasksTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit @@ -124,4 +130,4 @@ public class RunningTasksTest extends ActivityTestsBase { .build(); return task; } -} \ No newline at end of file +} diff --git a/services/tests/servicestests/src/com/android/server/am/SafeActivityOptionsTest.java b/services/tests/servicestests/src/com/android/server/am/SafeActivityOptionsTest.java index 8e4e7e6b63c3c..03d17375298fd 100644 --- a/services/tests/servicestests/src/com/android/server/am/SafeActivityOptionsTest.java +++ b/services/tests/servicestests/src/com/android/server/am/SafeActivityOptionsTest.java @@ -28,6 +28,15 @@ import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +/** + * Tests for {@link SafeActivityOptions}. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:SafeActivityOptionsTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. + */ @MediumTest @Presubmit @FlakyTest diff --git a/services/tests/servicestests/src/com/android/server/am/TaskLaunchParamsModifierTests.java b/services/tests/servicestests/src/com/android/server/am/TaskLaunchParamsModifierTests.java index eec55b162b3e3..fc9db14d58349 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskLaunchParamsModifierTests.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskLaunchParamsModifierTests.java @@ -38,8 +38,11 @@ import org.junit.runner.RunWith; /** * Tests for exercising resizing task bounds. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:TaskLaunchParamsModifierTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java b/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java index 9e6055d55e0f1..976e8355128ed 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java @@ -30,7 +30,13 @@ import java.io.File; import java.util.Random; /** - * atest FrameworksServicesTests:TaskPersisterTest + * Tests for {@link TaskPersister}. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:TaskPersisterTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ public class TaskPersisterTest extends AndroidTestCase { private static final String TEST_USER_NAME = "AM-Test-User"; @@ -85,4 +91,4 @@ public class TaskPersisterTest extends AndroidTestCase { fail("Error while removing the test user: " + TEST_USER_NAME); } } -} \ No newline at end of file +} diff --git a/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java b/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java index 5aecec005fdb4..eada2ce4f0040 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java @@ -59,8 +59,11 @@ import java.util.ArrayList; /** * Tests for exercising {@link TaskRecord}. * - * Build/Install/Run: + *

Build/Install/Run: * atest FrameworksServicesTests:com.android.server.am.TaskRecordTests + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. */ @MediumTest @Presubmit diff --git a/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java b/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java index 9406160b52cad..814071445df8d 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java @@ -52,6 +52,15 @@ import org.junit.runner.RunWith; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +/** + * Tests for {@link TaskStackListener}. + * + *

Build/Install/Run: + * atest FrameworksServicesTests:TaskStackChangedListenerTest + * + *

This test class is a part of Window Manager Service tests and specified in + * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}. + */ @MediumTest @RunWith(AndroidJUnit4.class) public class TaskStackChangedListenerTest { diff --git a/tests/utils/testutils/java/com/android/server/wm/test/filters/CoreTestsFilter.java b/tests/utils/testutils/java/com/android/server/wm/test/filters/CoreTestsFilter.java deleted file mode 100644 index 941cfdb20fed7..0000000000000 --- a/tests/utils/testutils/java/com/android/server/wm/test/filters/CoreTestsFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm.test.filters; - -import android.os.Bundle; - -import com.android.test.filters.SelectTest; - -/** - * JUnit test filter that select Window Manager Service related tests from FrameworksCoreTests. - * - *

Use this filter when running FrameworksCoreTests as - * 

- * adb shell am instrument -w \
- *     -e filter com.android.server.wm.test.filters.CoreTestsFilter  \
- *     -e selectTest_verbose true \
- *     com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner
- *
- */ -public final class CoreTestsFilter extends SelectTest { - - private static final String[] SELECTED_CORE_TESTS = { - "android.app.servertransaction.", // all tests under the package. - "android.view.DisplayCutoutTest", - }; - - public CoreTestsFilter(Bundle testArgs) { - super(addSelectTest(testArgs, SELECTED_CORE_TESTS)); - } -} diff --git a/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java b/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java new file mode 100644 index 0000000000000..2ce1fc68e1cec --- /dev/null +++ b/tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm.test.filters; + +import android.os.Bundle; + +import com.android.test.filters.SelectTest; + +/** + * JUnit test filter that select Window Manager Service related tests from FrameworksCoreTests. + * + *

Use this filter when running FrameworksCoreTests as + * 

+ * adb shell am instrument -w \
+ *     -e filter com.android.server.wm.test.filters.FrameworksTestsFilter  \
+ *     -e selectTest_verbose true \
+ *     com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner
+ *
+ */ +public final class FrameworksTestsFilter extends SelectTest { + + private static final String[] SELECTED_TESTS = { + // Test specifications for FrameworksCoreTests. + "android.app.servertransaction.", // all tests under the package. + "android.view.DisplayCutoutTest", + // Test specifications for FrameworksServicesTests. + "com.android.server.policy.", // all tests under the package. + "com.android.server.am.ActivityLaunchParamsModifierTests", + "com.android.server.am.ActivityRecordTests", + "com.android.server.am.ActivityStackSupervisorTests", + "com.android.server.am.ActivityStackTests", + "com.android.server.am.ActivityStartControllerTests", + "com.android.server.am.ActivityStarterTests", + "com.android.server.am.ActivityStartInterceptorTest", + "com.android.server.am.AssistDataRequesterTest", + "com.android.server.am.ClientLifecycleManagerTests", + "com.android.server.am.LaunchParamsControllerTests", + "com.android.server.am.PendingRemoteAnimationRegistryTest", + "com.android.server.am.RecentsAnimationTest", + "com.android.server.am.RecentTasksTest", + "com.android.server.am.RunningTasksTest", + "com.android.server.am.SafeActivityOptionsTest", + "com.android.server.am.TaskLaunchParamsModifierTests", + "com.android.server.am.TaskPersisterTest", + "com.android.server.am.TaskRecordTests", + "com.android.server.am.TaskStackChangedListenerTest", + }; + + public FrameworksTestsFilter(Bundle testArgs) { + super(addSelectTest(testArgs, SELECTED_TESTS)); + } +}