Merge "Batch migration of frameworks/base TEST_MAPPING to test_module_config modules" into main (cb650f83) · Commits · e / os / android_frameworks_base

TEST_MAPPING

+18 −156

Original line number	Diff line number	Diff line
		{
		"presubmit-large": [
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "FrameworksServicesTests_Presubmit"
		}
		],
		"presubmit-pm": [
		{
		"name": "PackageManagerServiceServerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "PackageManagerServiceServerTests_Presubmit"
		}
		],
		"presubmit": [
		{
		"name": "ManagedProvisioningTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		"name": "ManagedProvisioningTests"
		},
		{
		"file_patterns": [
		@@ -46,86 +19,28 @@
		"SystemServer\\.java",
		"services/tests/apexsystemservices/.*"
		],
		"name": "ApexSystemServicesTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		},
		{
		"name": "FrameworksUiServicesTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "FrameworksInputMethodSystemServerTests",
		"options": [
		{"include-filter": "com.android.server.inputmethod"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "org.junit.Ignore"}
		]
		},
		{
		"name": "ExtServicesUnitTests-tplus",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "ExtServicesUnitTests-sminus",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		"name": "ApexSystemServicesTestCases"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		"name": "FrameworksUiServicesTests"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "FrameworksInputMethodSystemServerTests_server_inputmethod"
		},
		{
		"name": "FrameworkPermissionTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		"name": "ExtServicesUnitTests-tplus"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		"name": "ExtServicesUnitTests-sminus"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "FrameworksCoreTests_Presubmit"
		},
		{
		"name": "FrameworksInProcessTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		"name": "FrameworkPermissionTests_Presubmit"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "FrameworksInProcessTests"
		},
		{
		"name": "vts_treble_vintf_framework_test"
		@@ -159,78 +74,25 @@
		// infra during the hardening phase.
		// TODO: this tag to be removed once the above is no longer an issue.
		{
		"name": "FrameworksUiServicesTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "ExtServicesUnitTests-tplus",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "ExtServicesUnitTests-sminus",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "TestablesTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		"name": "FrameworksUiServicesTests"
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		"name": "ExtServicesUnitTests-tplus"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		"name": "ExtServicesUnitTests-sminus"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "TestablesTests"
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		"name": "FrameworksCoreTests_Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		"name": "FrameworksServicesTests_presubmit"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		},
		{
		"name": "PackageManagerServiceServerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		"name": "PackageManagerServiceServerTests_Presubmit"
		}
		]
		}

apex/jobscheduler/service/java/com/android/server/TEST_MAPPING

+1 −4

Original line number	Diff line number	Diff line
		@@ -11,10 +11,7 @@
		],
		"postsubmit": [
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server"}
		]
		"name": "FrameworksMockingServicesTests_android_server"
		}
		]
		}

apex/jobscheduler/service/java/com/android/server/deviceidle/TEST_MAPPING

+1 −4

Original line number	Diff line number	Diff line
		@@ -6,10 +6,7 @@
		],
		"postsubmit": [
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server"}
		]
		"name": "FrameworksMockingServicesTests_android_server"
		}
		]
		}

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+4 −18

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsJobSchedulerTestCases",
		"options": [
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"}
		]
		"name": "CtsJobSchedulerTestCases_com_android_server_job"
		},
		{
		"name": "FrameworksMockingServicesTests_com_android_server_job_Presubmit"
		@@ -19,26 +15,16 @@
		"name": "CtsJobSchedulerTestCases"
		},
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{"include-filter": "com.android.server.job"}
		]
		"name": "FrameworksMockingServicesTests_com_android_server_job"
		},
		{
		"name": "FrameworksServicesTests_com_android_server_job"
		},
		{
		"name": "CtsHostsideNetworkPolicyTests",
		"options": [
		{"include-filter": "com.android.cts.netpolicy.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob"},
		{"include-filter": "com.android.cts.netpolicy.HostsideRestrictBackgroundNetworkTests#testNonMeteredNetworkAccess_expeditedJob"}
		]
		"name": "CtsHostsideNetworkPolicyTests_com_android_server_job"
		},
		{
		"name": "CtsStatsdAtomHostTestCases",
		"options": [
		{"include-filter": "android.cts.statsdatom.jobscheduler"}
		]
		"name": "CtsStatsdAtomHostTestCases_statsdatom_jobscheduler"
		}
		]
		}

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+1 −7

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsUsageStatsTestCases",
		"options": [
		{"include-filter": "android.app.usage.cts.UsageStatsTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.MediumTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"}
		]
		"name": "CtsUsageStatsTestCases_cts_usagestatstest"
		},
		{
		"name": "CtsBRSTestCases"