Merge "Add FrameworksServicesTests into PackageManager's test plan" (2b22592e) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,9 @@
		{
		"path": "frameworks/base/services/tests/PackageManagerComponentOverrideTests"
		},
		{
		"path": "frameworks/base/services/tests/servicestests/src/com/android/server/pm"
		},
		{
		"path": "cts/tests/tests/packageinstaller"
		},

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

+0 −94

Original line number	Diff line number	Diff line
		@@ -23,20 +23,6 @@
		{
		"name": "CtsMatchFlagTestCases"
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.pm."
		},
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		@@ -45,45 +31,6 @@
		}
		]
		},
		{
		"name": "FrameworksServicesTests",
		"file_patterns": ["(/\|^)ShortcutService\\.java"],
		"options": [
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest1"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest2"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest3"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest4"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest5"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest6"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest7"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest8"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest9"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest10"
		},
		{
		"include-filter": "com.android.server.pm.ShortcutManagerTest11"
		}
		]
		},
		{
		"name": "CtsShortcutHostTestCases",
		"file_patterns": ["(/\|^)ShortcutService\\.java"]
		@@ -188,47 +135,6 @@
		},
		{
		"name": "PackageManagerServiceHostTests"
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{
		"install-arg": "-t"
		},
		{
		"include-filter": "com.android.server.pm.UserDataPreparerTest"
		},
		{
		"include-filter": "com.android.server.pm.UserLifecycleStressTest"
		},
		{
		"include-filter": "com.android.server.pm.UserManagerServiceCreateProfileTest"
		},
		{
		"include-filter": "com.android.server.pm.UserManagerServiceIdRecyclingTest"
		},
		{
		"include-filter": "com.android.server.pm.UserManagerServiceTest"
		},
		{
		"include-filter": "com.android.server.pm.UserManagerServiceUserInfoTest"
		},
		{
		"include-filter": "com.android.server.pm.UserManagerServiceUserTypeTest"
		},
		{
		"include-filter": "com.android.server.pm.UserManagerTest"
		},
		{
		"include-filter": "com.android.server.pm.UserRestrictionsUtilsTest"
		},
		{
		"include-filter": "com.android.server.pm.UserSystemPackageInstallerTest"
		},
		{
		"include-filter": "com.android.server.pm.parsing.SystemPartitionParseTest"
		}
		]
		}
		],
		"imports": [

services/tests/servicestests/src/com/android/server/pm/BundleUtilsTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,9 @@ import static com.android.server.devicepolicy.DpmTestUtils.newRestrictions;
		import static com.google.common.truth.Truth.assertThat;

		import android.os.Bundle;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.platform.test.annotations.Presubmit;

		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.server.BundleUtils;
		@@ -35,6 +36,7 @@ import org.junit.runner.RunWith;
		* Build/Install/Run:
		* atest com.android.server.pm.BundleUtilsTest
		*/
		@Presubmit
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class BundleUtilsTest {

services/tests/servicestests/src/com/android/server/pm/CompatibilityModeTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.content.pm.ApplicationInfo;
		import android.content.pm.parsing.PackageInfoWithoutStateUtils;
		import android.content.pm.parsing.ParsingPackageUtils;
		import android.os.Build;
		import android.platform.test.annotations.Presubmit;

		import com.android.server.pm.parsing.pkg.PackageImpl;
		import com.android.server.pm.pkg.PackageUserStateImpl;
		@@ -40,6 +41,7 @@ import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;

		@Presubmit
		public class CompatibilityModeTest {

		private boolean mCompatibilityModeEnabled;;

services/tests/servicestests/src/com/android/server/pm/KeySetManagerServiceTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package com.android.server.pm;
		import static android.content.pm.parsing.ParsingPackageUtils.parsePublicKey;

		import android.content.pm.Signature;
		import android.platform.test.annotations.Presubmit;
		import android.test.AndroidTestCase;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		@@ -33,6 +34,7 @@ import java.io.IOException;
		import java.security.PublicKey;
		import java.security.cert.CertificateException;

		@Presubmit
		public class KeySetManagerServiceTest extends AndroidTestCase {

		private WatchedArrayMap<String, PackageSetting> mPackagesMap;