Merge "Convert FrameworksCoreTests to use test_module_config for options." into main (b1bb7aa1) · Commits · e / os / android_frameworks_base

core/TEST_MAPPING

+1 −12

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-filter": "android.view.inputmethod"
		},
		{
		"include-filter": "com.android.internal.inputmethod"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		],
		"name": "FrameworksCoreTests_inputmethod",
		"file_patterns": [
		"core/java/com/android/internal/inputmethod/.*",
		"core/java/android/view/inputmethod/.*",

+3 −36

Original line number	Diff line number	Diff line
		@@ -153,18 +153,7 @@
		"file_patterns": ["(/\|^)ContextImpl.java"]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		},
		{
		"include-filter": "android.content.ContextTest"
		}
		],
		"name": "FrameworksCoreTests_context",
		"file_patterns": ["(/\|^)ContextImpl.java"]
		},
		{
		@@ -177,35 +166,13 @@
		]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		},
		{
		"include-filter": "android.app.KeyguardManagerTest"
		}
		],
		"name": "FrameworksCoreTests_keyguard_manager",
		"file_patterns": [
		"(/\|^)KeyguardManager.java"
		]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		},
		{
		"include-filter": "android.app.PropertyInvalidatedCacheTests"
		}
		],
		"name": "FrameworksCoreTests_property_invalidated_cache",
		"file_patterns": [
		"(/\|^)PropertyInvalidatedCache.java"
		]

+1 −18

Original line number	Diff line number	Diff line
		@@ -22,24 +22,7 @@
		"file_patterns": ["(/\|^)Context.java", "(/\|^)ContextWrapper.java"]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		},
		{
		"include-filter": "android.content.ContextTest"
		},
		{
		"include-filter": "android.content.ComponentCallbacksControllerTest"
		},
		{
		"include-filter": "android.content.ContextWrapperTest"
		}
		],
		"name": "FrameworksCoreTests_android_content",
		"file_patterns": ["(/\|^)Context.java", "(/\|^)ContextWrapper.java", "(/\|^)ComponentCallbacksController.java"]
		},
		{

+1 −12

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		},
		{
		"include-filter": "android.database.sqlite.SQLiteRawStatementTest"
		}
		],
		"name": "FrameworksCoreTests_sqlite",
		"file_patterns": [
		"(/\|^)SQLiteRawStatement.java",
		"(/\|^)SQLiteDatabase.java",

+2 −11

Original line number	Diff line number	Diff line
		@@ -73,11 +73,7 @@
		"PowerComponents\\.java",
		"[^/]BatteryConsumer[^/]\\.java"
		],
		"name": "FrameworksCoreTests",
		"options": [
		{ "include-filter": "com.android.internal.os.BatteryStatsTests" },
		{ "exclude-annotation": "com.android.internal.os.SkipPresubmit" }
		]
		"name": "FrameworksCoreTests_battery_stats"
		},
		{
		"file_patterns": [
		@@ -132,12 +128,7 @@
		},
		{
		"file_patterns": ["Environment[^/]*\\.java"],
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-filter": "android.os.EnvironmentTest"
		}
		]
		"name": "FrameworksCoreTests_environment"
		}
		],
		"postsubmit": [