Merge "Split up FrameworksUiServicesTests" into main (5d42182b) · Commits · e / os / android_frameworks_base

TEST_MAPPING

+6 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,12 @@
		{
		"name": "FrameworksUiServicesTests"
		},
		{
		"name": "FrameworksUiServicesNotificationTests"
		},
		{
		"name": "FrameworksUiServicesZenTests"
		},
		{
		"name": "FrameworksInputMethodSystemServerTests_server_inputmethod"
		},

core/java/android/service/notification/TEST_MAPPING

+4 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,10 @@
		"name": "CtsNotificationTestCases_notification"
		},
		{
		"name": "FrameworksUiServicesTests_notification"
		"name": "FrameworksUiServicesNotificationTests"
		},
		{
		"name": "FrameworksUiServicesZenTests"
		}
		],
		"postsubmit": [

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,10 @@
		"name": "CtsNotificationTestCases_notification"
		},
		{
		"name": "FrameworksUiServicesTests_notification"
		"name": "FrameworksUiServicesNotificationTests"
		},
		{
		"name": "FrameworksUiServicesZenTests"
		}
		],
		"postsubmit": [

services/tests/uiservicestests/Android.bp

+69 −14

Original line number	Diff line number	Diff line
		@@ -11,13 +11,8 @@ package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		android_test {
		name: "FrameworksUiServicesTests",

		// Include test java files
		srcs: [
		"src/*/.java",
		],
		java_defaults {
		name: "FrameworksUiServicesTests-defaults",

		static_libs: [
		"compatibility-device-util-axt-minus-dexmaker",
		@@ -95,12 +90,72 @@ android_test {
		javacflags: ["-parameters"],
		}

		test_module_config {
		name: "FrameworksUiServicesTests_notification",
		base: "FrameworksUiServicesTests",
		test_suites: [
		"automotive-tests",
		"device-tests",
		// Utility files used by multiple tests
		filegroup {
		name: "shared-srcs",
		srcs: [
		"src/android/app/ExampleActivity.java",
		"src/android/app/NotificationSystemUtil.java",
		"src/com/android/frameworks/tests/uiservices/DummyProvider.java",
		"src/com/android/internal/logging/InstanceIdSequenceFake.java",
		"src/com/android/server/UiServiceTestCase.java",
		"src/com/android/server/notification/ZenChangeOrigin.java",
		"src/com/android/server/notification/ZenModeEventLoggerFake.java",
		],
		visibility: ["//visibility:private"],
		}

		filegroup {
		name: "notification-srcs",
		srcs: [
		"src/*/Notification.java",
		"src/com/android/server/notification/*.java",
		],
		visibility: ["//visibility:private"],
		}

		filegroup {
		name: "notification-zen-srcs",
		srcs: [
		"src/android/app/NotificationManagerZenTest.java",
		"src/com/android/server/notification/Zen*Test.java",
		],
		visibility: ["//visibility:private"],
		}

		android_test {
		name: "FrameworksUiServicesTests",

		// Include test java files but not the notification & zen ones which are separated
		srcs: [
		"src/*/.java",
		],

		exclude_srcs: [
		":notification-srcs",
		":notification-zen-srcs",
		],

		defaults: ["FrameworksUiServicesTests-defaults"],
		}

		android_test {
		name: "FrameworksUiServicesNotificationTests",
		srcs: [
		":notification-srcs",
		":shared-srcs",
		],
		exclude_srcs: [":notification-zen-srcs"],
		defaults: ["FrameworksUiServicesTests-defaults"],
		test_config: "notification-tests.xml",
		}

		android_test {
		name: "FrameworksUiServicesZenTests",
		srcs: [
		":notification-zen-srcs",
		":shared-srcs",
		],
		exclude_annotations: ["androidx.test.filters.LargeTest"],
		defaults: ["FrameworksUiServicesTests-defaults"],
		test_config: "notification-zen-tests.xml",
		}

services/tests/uiservicestests/AndroidTest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		-->
		<configuration description="Runs Frameworks UI Services Tests.">
		<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
		<option name="cleanup-apks" value="true" />
		<option name="test-file-name" value="FrameworksUiServicesTests.apk" />
		</target_preparer>