dee5a4dc2a5a6829e5509fc0e94903e30dcc238f - platform/frameworks/base

commit	dee5a4dc2a5a6829e5509fc0e94903e30dcc238f	[log] [tgz]
author	Tadashi G. Takaoka <takaoka@google.com>	Wed Sep 19 11:59:40 2018 +0900
committer	Tadashi G. Takaoka <takaoka@google.com>	Fri Sep 21 11:42:15 2018 +0900
tree	21ed2a4d140d6dbbea7c7bca86d21344f773ae87
parent	833a6276eddd9271d910ef1583c039294754d1fa [diff]

DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests

Test: All presubmit and non-flaky tests pass
    129 com.android.server.am
    176 com.android.server.wm
     32 com.android.server.policy
    $ tradefed.sh run commandAndExit WmTests \
        --include-filter com.android.server.am. \
        --include-annotation android.platform.test.annotations.Presubmit \
        --exclude-annotation android.support.test.filters.FlakyTest
    $ tradefed.sh run commandAndExit WmTests \
        --include-filter com.android.server.wm. \
        --include-annotation android.platform.test.annotations.Presubmit \
        --exclude-annotation android.support.test.filters.FlakyTest
    $ tradefed.sh run commandAndExit WmTests \
        --include-filter com.android.server.policy. \
        --include-annotation android.platform.test.annotations.Presubmit \
        --exclude-annotation android.support.test.filters.FlakyTest
Test: No AM/WM unit test in FrameworksServicesTests
    $ tradefed.sh run commandAndExit FrameworksServicesTests \
        --include-filter com.android.server.am.
    $ tradefed.sh run commandAndExit FrameworksServicesTests \
        --include-filter com.android.server.wm.
    $ tradefed.sh run commandAndExit FrameworksServicesTests \
        --include-filter com.android.server.policy.
Bug: 113800711

Change-Id: I01ab256aabf7e1f1b513fe3b92140f6936c2d649

services/tests/wmtests/Android.mk[diff]
services/tests/wmtests/AndroidManifest.xml[diff]
services/tests/wmtests/AndroidTest.xml[diff]
services/tests/wmtests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityManagerInternalTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityManagerServiceTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityManagerTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityRecordTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityStackSupervisorTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityStackSupervisorTests.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityStackTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityStartControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityStartControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityStartInterceptorTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityStartInterceptorTest.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityStarterTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java - diff]
services/tests/wmtests/src/com/android/server/am/ActivityTestsBase.java[Renamed from services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java - diff]
services/tests/wmtests/src/com/android/server/am/AppErrorDialogTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java - diff]
services/tests/wmtests/src/com/android/server/am/AssistDataRequesterTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java - diff]
services/tests/wmtests/src/com/android/server/am/ClientLifecycleManagerTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/ClientLifecycleManagerTests.java - diff]
services/tests/wmtests/src/com/android/server/am/CoreSettingsObserverTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/CoreSettingsObserverTest.java - diff]
services/tests/wmtests/src/com/android/server/am/DummyAmTests.java[Deleted - diff]
services/tests/wmtests/src/com/android/server/am/GlobalSettingsToPropertiesMapperTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/GlobalSettingsToPropertiesMapperTest.java - diff]
services/tests/wmtests/src/com/android/server/am/LaunchParamsControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/am/LockTaskControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/am/MemoryStatUtilTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java - diff]
services/tests/wmtests/src/com/android/server/am/PendingRemoteAnimationRegistryTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/PendingRemoteAnimationRegistryTest.java - diff]
services/tests/wmtests/src/com/android/server/am/PersistentConnectionTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/PersistentConnectionTest.java - diff]
services/tests/wmtests/src/com/android/server/am/RecentTasksTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java - diff]
services/tests/wmtests/src/com/android/server/am/RecentsAnimationTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/RecentsAnimationTest.java - diff]
services/tests/wmtests/src/com/android/server/am/RunningTasksTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/RunningTasksTest.java - diff]
services/tests/wmtests/src/com/android/server/am/SafeActivityOptionsTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/SafeActivityOptionsTest.java - diff]
services/tests/wmtests/src/com/android/server/am/TaskLaunchParamsModifierTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/TaskLaunchParamsModifierTests.java - diff]
services/tests/wmtests/src/com/android/server/am/TaskPersisterTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java - diff]
services/tests/wmtests/src/com/android/server/am/TaskRecordTests.java[Renamed from services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java - diff]
services/tests/wmtests/src/com/android/server/am/TaskStackChangedListenerTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java - diff]
services/tests/wmtests/src/com/android/server/am/UserControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/am/UserControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/policy/FakeWindowState.java[Renamed from services/tests/servicestests/src/com/android/server/policy/FakeWindowState.java - diff]
services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerInsetsTest.java[Renamed from services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerInsetsTest.java - diff]
services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java[Renamed from services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java - diff]
services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTest.java[Renamed from services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerTest.java - diff]
services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTestBase.java[Renamed from services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerTestBase.java - diff]
services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/AppTransitionTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/AppWindowContainerControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/AppWindowContainerControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/BoundsAnimationControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/BoundsAnimationControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/ConfigurationContainerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/ConfigurationContainerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/DimmerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/DimmerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/DragDropControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/DummyWmTests.java[Deleted - diff]
services/tests/wmtests/src/com/android/server/wm/PinnedStackControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/PinnedStackControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/RecentsAnimationControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/RemoteAnimationControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/RootWindowContainerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/ScreenDecorWindowTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/ScreenDecorWindowTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/StackWindowControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/SurfaceAnimatorTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/SurfaceAnimatorTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskPositionerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskPositioningControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskSnapshotCacheTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskSnapshotCacheTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskSnapshotControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskSnapshotControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskSnapshotSurfaceTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskSnapshotSurfaceTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskStackContainersTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskStackTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/TaskWindowContainerControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TaskWindowContainerControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/TestIWindow.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TestIWindow.java - diff]
services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java[Renamed from services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java - diff]
services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WallpaperControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowAnimationSpecTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowAnimationSpecTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowConfigurationTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowConfigurationTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowContainerControllerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowContainerControllerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowContainerTraversalTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceRule.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRule.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceRuleTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowManagerServiceRuleTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowSurfacePlacerTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowSurfacePlacerTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowTokenTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowTokenTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/WindowTracingTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java[Renamed from services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java - diff]
services/tests/wmtests/src/com/android/server/wm/utils/CoordinateTransformsTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/utils/CoordinateTransformsTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/utils/InsetUtilsTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/utils/InsetUtilsTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/utils/RotationCacheTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/utils/RotationCacheTest.java - diff]
services/tests/wmtests/src/com/android/server/wm/utils/WmDisplayCutoutTest.java[Renamed from services/tests/servicestests/src/com/android/server/wm/utils/WmDisplayCutoutTest.java - diff]

90 files changed

tree: 21ed2a4d140d6dbbea7c7bca86d21344f773ae87