Merge "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests" (be42bd86) · Commits · e / os / android_frameworks_base

services/tests/wmtests/Android.mk

+6 −1

Original line number	Diff line number	Diff line
		@@ -14,9 +14,14 @@ LOCAL_SRC_FILES := \
		$(call all-java-files-under, ../servicestests/utils)

		LOCAL_STATIC_JAVA_LIBRARIES := \
		androidx-test \
		frameworks-base-testutils \
		services.core \
		android-support-test \
		mockito-target-minus-junit4 \
		platform-test-annotations \
		truth-prebuilt \
		testables \
		ub-uiautomator \

		LOCAL_JAVA_LIBRARIES := \
		android.test.mock \

services/tests/wmtests/AndroidManifest.xml

+22 −2

Original line number	Diff line number	Diff line
		@@ -22,10 +22,30 @@
		android:minSdkVersion="1"
		android:targetSdkVersion="28" />

		<application android:testOnly="true" />
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
		<uses-permission android:name="android.permission.WAKE_LOCK" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
		<uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />
		<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
		<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
		<uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
		<uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
		<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
		<uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" />
		<uses-permission android:name="android.permission.REORDER_TASKS" />
		<uses-permission android:name="android.permission.MANAGE_USERS" />

		<application android:testOnly="true">
		<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityA" />
		<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityB" />
		<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />
		<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityTaskChangeCallbacks" />
		<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityTaskDescriptionChange" />
		<activity android:name="com.android.server.wm.ScreenDecorWindowTests$TestActivity" />
		</application>

		<instrumentation
		android:name="androidx.test.runner.AndroidJUnitRunner"
		android:name="android.support.test.runner.AndroidJUnitRunner"
		android:label="Window Manager Tests"
		android:targetPackage="com.android.frameworks.wmtests" />
		</manifest>

services/tests/wmtests/AndroidTest.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@
		<option name="test-tag" value="WmTests" />
		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
		<option name="package" value="com.android.frameworks.wmtests" />
		<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
		<option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
		<option name="hidden-api-checks" value="false"/>
		</test>
		</configuration>

services/tests/servicestests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java→services/tests/wmtests/src/com/android/server/am/ActivityLaunchParamsModifierTests.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -16,6 +16,16 @@

		package com.android.server.am;

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;
		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;

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

		import android.app.ActivityOptions;
		import android.content.pm.ActivityInfo;
		import android.graphics.Rect;
		@@ -24,26 +34,16 @@ import android.support.test.filters.MediumTest;
		import android.support.test.runner.AndroidJUnit4;

		import com.android.server.am.LaunchParamsController.LaunchParams;
		import org.junit.runner.RunWith;

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

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.doAnswer;

		import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;
		import org.junit.runner.RunWith;

		/**
		* Tests for exercising resizing bounds due to activity options.
		*
		* Build/Install/Run:
		* atest FrameworksServicesTests:ActivityLaunchParamsModifierTests
		* atest WmTests:ActivityLaunchParamsModifierTests
		*/
		@MediumTest
		@Presubmit

services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java→services/tests/wmtests/src/com/android/server/am/ActivityManagerInternalTest.java

+2 −11

Original line number	Diff line number	Diff line
		@@ -33,17 +33,8 @@ import org.mockito.MockitoAnnotations;
		/**
		* Test class for {@link ActivityManagerInternal}.
		*
		* To run the tests, use
		*
		* runtest -c com.android.server.am.ActivityManagerInternalTest frameworks-services
		*
		* or the following steps:
		*
		* Build: m FrameworksServicesTests
		* Install: adb install -r \
		* ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
		* Run: adb shell am instrument -e class com.android.server.am.ActivityManagerInternalTest -w \
		* com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
		* Build/Install/Run:
		* atest WmTests:ActivityManagerInternalTest
		*/
		@RunWith(AndroidJUnit4.class)
		public class ActivityManagerInternalTest {