Merge "Move AM/WM unit tests out of FrameworksServicesTests to WmTests" (7e77007f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/TEST_MAPPING

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -36,20 +36,6 @@
	}		}
	]		]
	},		},
	{
	"name": "FrameworksServicesTests",
	"options": [
	{
	"include-filter": "com.android.server.am."
	},
	{
	"include-annotation": "android.platform.test.annotations.Presubmit"
	},
	{
	"exclude-annotation": "androidx.test.filters.FlakyTest"
	}
	]
	},
	{		{
	"name": "WmTests",		"name": "WmTests",
	"options": [		"options": [
	@@ -72,14 +58,6 @@
	{		{
	"name": "CtsActivityManagerDeviceSdk25TestCases"		"name": "CtsActivityManagerDeviceSdk25TestCases"
	},		},
	{
	"name": "FrameworksServicesTests",
	"options": [
	{
	"include-filter": "com.android.server.am."
	}
	]
	},
	{		{
	"name": "WmTests",		"name": "WmTests",
	"options": [		"options": [

services/core/java/com/android/server/policy/TEST_MAPPING

+0 −22

Original line number	Original line	Diff line number	Diff line
	{		{
	"presubmit": [		"presubmit": [
	{
	"name": "FrameworksServicesTests",
	"options": [
	{
	"include-filter": "com.android.server.policy."
	},
	{
	"include-annotation": "android.platform.test.annotations.Presubmit"
	},
	{
	"exclude-annotation": "android.support.test.filters.FlakyTest"
	}
	]
	},
	{		{
	"name": "WmTests",		"name": "WmTests",
	"options": [		"options": [
	@@ -30,14 +16,6 @@
	}		}
	],		],
	"postsubmit": [		"postsubmit": [
	{
	"name": "FrameworksServicesTests",
	"options": [
	{
	"include-filter": "com.android.server.policy."
	}
	]
	},
	{		{
	"name": "WmTests",		"name": "WmTests",
	"options": [		"options": [

services/core/java/com/android/server/wm/TEST_MAPPING

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -11,20 +11,6 @@
	}		}
	]		]
	},		},
	{
	"name": "FrameworksServicesTests",
	"options": [
	{
	"include-filter": "com.android.server.wm."
	},
	{
	"include-annotation": "android.platform.test.annotations.Presubmit"
	},
	{
	"exclude-annotation": "androidx.test.filters.FlakyTest"
	}
	]
	},
	{		{
	"name": "WmTests",		"name": "WmTests",
	"options": [		"options": [
	@@ -44,14 +30,6 @@
	{		{
	"name": "CtsWindowManagerDeviceTestCases"		"name": "CtsWindowManagerDeviceTestCases"
	},		},
	{
	"name": "FrameworksServicesTests",
	"options": [
	{
	"include-filter": "com.android.server.wm."
	}
	]
	},
	{		{
	"name": "WmTests",		"name": "WmTests",
	"options": [		"options": [

services/tests/wmtests/Android.mk

+5 −0

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

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

	LOCAL_JAVA_LIBRARIES := \		LOCAL_JAVA_LIBRARIES := \
	android.test.mock \		android.test.mock \

services/tests/wmtests/AndroidManifest.xml

+21 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,27 @@
	android:minSdkVersion="1"		android:minSdkVersion="1"
	android:targetSdkVersion="28" />		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		<instrumentation
	android:name="androidx.test.runner.AndroidJUnitRunner"		android:name="androidx.test.runner.AndroidJUnitRunner"