From d4e51d102f9179103f577eee619b893912f19221 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Sun, 20 Nov 2022 22:01:24 +0000 Subject: [PATCH 1/2] Moving PackageManagerServiceTests to their own suite. Bug: 238141698 Fixes: 238141698 Bug: 262254794 Test: atest PackageManagerServiceServerTests FrameworksServicesTests Change-Id: Iacc89c7525d8d9beec39c242bfc305ad08844580 Merged-In: Iacc89c7525d8d9beec39c242bfc305ad08844580 --- .../PackageManagerServiceTests/TEST_MAPPING | 34 ++++ .../apks/Android.bp | 0 .../apks/OWNERS | 0 .../apks/install-split-base/Android.bp | 0 .../install-split-base/AndroidManifest.xml | 0 .../dexapis/splitapp/BaseActivity.java | 0 .../apks/install-split-feature-a/Android.bp | 0 .../AndroidManifest.xml | 0 .../splitapp/feature_a/FeatureAActivity.java | 0 .../apks/install/Android.bp | 0 .../apks/install/AndroidManifest.xml | 0 .../apks/install/res/values/strings.xml | 0 .../apks/install_bad_dex/Android.bp | 0 .../apks/install_bad_dex/AndroidManifest.xml | 0 .../apks/install_bad_dex/classes.dex | 0 .../install_bad_dex/res/values/strings.xml | 0 .../frameworks/coretests/TestActivity.java | 0 .../install_complete_package_info/Android.bp | 0 .../AndroidManifest.xml | 0 .../frameworks/coretests/TestActivity.java | 0 .../frameworks/coretests/TestProvider.java | 0 .../frameworks/coretests/TestReceiver.java | 0 .../frameworks/coretests/TestService.java | 0 .../apks/install_decl_perm/Android.bp | 0 .../install_decl_perm/AndroidManifest.xml | 0 .../install_decl_perm/res/values/strings.xml | 0 .../apks/install_intent_filters/Android.bp | 0 .../AndroidManifest.xml | 0 .../servicestests/TestActivity.java | 0 .../apks/install_loc_auto/Android.bp | 0 .../apks/install_loc_auto/AndroidManifest.xml | 0 .../install_loc_auto/res/values/strings.xml | 0 .../apks/install_loc_internal/Android.bp | 0 .../install_loc_internal/AndroidManifest.xml | 0 .../res/values/strings.xml | 0 .../apks/install_loc_sdcard/Android.bp | 0 .../install_loc_sdcard/AndroidManifest.xml | 0 .../install_loc_sdcard/res/values/strings.xml | 0 .../apks/install_loc_unspecified/Android.bp | 0 .../AndroidManifest.xml | 0 .../res/values/strings.xml | 0 .../apks/install_use_perm_good/Android.bp | 0 .../install_use_perm_good/AndroidManifest.xml | 0 .../res/values/strings.xml | 0 .../apks/install_uses_feature/Android.bp | 0 .../install_uses_feature/AndroidManifest.xml | 0 .../res/values/strings.xml | 0 .../apks/install_uses_sdk/Android.bp | 12 ++ .../install_uses_sdk/AndroidManifest-0.xml | 0 .../AndroidManifest-q0-r0.xml | 0 .../install_uses_sdk/AndroidManifest-q0.xml | 0 .../AndroidManifest-r-none.xml | 0 .../AndroidManifest-r0-s0.xml | 0 .../AndroidManifest-r0-s1000.xml} | 0 .../AndroidManifest-r0-s5.xml | 27 +++ .../install_uses_sdk/AndroidManifest-r0.xml | 0 .../AndroidManifest-r1000.xml} | 0 .../install_uses_sdk/AndroidManifest-r5.xml | 26 +++ .../install_uses_sdk/res/values/strings.xml | 0 .../apks/keyset/Android.bp | 0 .../apks/keyset/api_test/AndroidManifest.xml | 0 .../apks/keyset/permDef/AndroidManifest.xml | 0 .../apks/keyset/permUse/AndroidManifest.xml | 0 .../apks/keyset/res/values/strings.xml | 0 .../apks/keyset/uA/AndroidManifest.xml | 0 .../apks/keyset/uAB/AndroidManifest.xml | 0 .../apks/keyset/uAuB/AndroidManifest.xml | 0 .../apks/keyset/uB/AndroidManifest.xml | 0 .../apks/keyset/uNone/AndroidManifest.xml | 0 .../server/Android.bp | 160 ++++++++++++++++++ .../server/AndroidManifest.xml | 126 ++++++++++++++ .../server/AndroidTest.xml | 33 ++++ .../certs/ec-p256-lineage-2-signers | Bin .../certs/ec-p256-lineage-3-signers | Bin .../PackageSignaturesTest/certs/ec-p256.pk8 | Bin .../certs/ec-p256.x509.der | Bin .../PackageSignaturesTest/certs/ec-p256_2.pk8 | Bin .../certs/ec-p256_2.x509.der | Bin .../PackageSignaturesTest/certs/ec-p256_3.pk8 | Bin .../certs/ec-p256_3.x509.der | Bin .../assets/PackageSignaturesTest/xml/README | 0 .../xml/one-signer-extra-cert-tag.xml | 0 .../xml/one-signer-invalid-cert-index.xml | 0 .../xml/one-signer-invalid-cert-key.xml | 0 ...one-signer-invalid-public-key-cert-key.xml | 0 .../xml/one-signer-invalid-tag.xml | 0 .../xml/one-signer-missing-cert-index.xml | 0 .../xml/one-signer-missing-cert-key.xml | 0 .../xml/one-signer-missing-cert-tag.xml | 0 .../xml/one-signer-missing-scheme-version.xml | 0 .../xml/one-signer-missing-sigs-count.xml | 0 .../xml/one-signer-previous-cert.xml | 0 .../PackageSignaturesTest/xml/one-signer.xml | 0 ...ners-in-lineage-invalid-pastSigs-count.xml | 0 ...s-in-lineage-missing-pastSigs-cert-tag.xml | 0 ...ners-in-lineage-missing-pastSigs-count.xml | 0 ...ners-in-lineage-missing-scheme-version.xml | 0 .../xml/three-signers-in-lineage.xml | 0 ...signers-in-lineage-invalid-certs-flags.xml | 0 ...in-lineage-invalid-pastSigs-cert-index.xml | 0 ...signers-in-lineage-missing-certs-flags.xml | 0 ...in-lineage-missing-pastSigs-cert-index.xml | 0 ...ners-in-lineage-multiple-pastSigs-tags.xml | 0 .../xml/two-signers-in-lineage-no-caps.xml | 0 ...rs-in-lineage-undefined-pastSigs-index.xml | 0 .../xml/two-signers-in-lineage.xml | 0 .../xml/two-signers-v1v2-missing-cert-tag.xml | 0 .../xml/two-signers-v1v2.xml | 0 .../PackageParsingTestAppEmptyActionSdkQ.apk | Bin .../PackageParsingTestAppEmptyActionSdkR.apk | Bin ...PackageParsingTestAppEmptyCategorySdkQ.apk | Bin ...PackageParsingTestAppEmptyCategorySdkR.apk | Bin .../PackageParsingTestAppMissingAppSdkQ.apk | Bin .../PackageParsingTestAppMissingAppSdkR.apk | Bin .../server}/res/raw/com_android_tzdata.apex | Bin .../server}/res/raw/install_app1_cert1 | Bin .../server}/res/raw/install_app1_cert1_cert2 | Bin .../server}/res/raw/install_app1_cert2 | Bin .../server}/res/raw/install_app1_cert3 | Bin .../server}/res/raw/install_app1_cert3_cert4 | Bin .../server}/res/raw/install_app1_cert5 | Bin .../res/raw/install_app1_cert5_rotated_cert6 | Bin .../server}/res/raw/install_app1_cert6 | Bin .../server}/res/raw/install_app1_unsigned | Bin .../server}/res/raw/install_app2_cert1 | Bin .../server}/res/raw/install_app2_cert1_cert2 | Bin .../server}/res/raw/install_app2_cert2 | Bin .../server}/res/raw/install_app2_cert3 | Bin .../res/raw/install_app2_cert5_rotated_cert6 | Bin .../server}/res/raw/install_app2_unsigned | Bin .../server}/res/raw/install_shared1_cert1 | Bin .../res/raw/install_shared1_cert1_cert2 | Bin .../server}/res/raw/install_shared1_cert2 | Bin .../server}/res/raw/install_shared1_unsigned | Bin .../server}/res/raw/install_shared2_cert1 | Bin .../res/raw/install_shared2_cert1_cert2 | Bin .../server}/res/raw/install_shared2_cert2 | Bin .../server}/res/raw/install_shared2_unsigned | Bin .../server/res/values/values.xml | 20 +++ .../server}/res/xml/unparseable_metadata1.xml | 0 .../server}/res/xml/unparseable_metadata2.xml | 0 .../server}/res/xml/well_formed_metadata.xml | 0 .../android/server}/AppsFilterImplTest.java | 0 .../com/android/server}/BundleUtilsTest.java | 0 .../server}/CompatibilityModeTest.java | 0 .../CrossProfileAppsServiceImplTest.java | 2 +- .../com/android/server}/InstallerTest.java | 0 .../server}/KeySetManagerServiceTest.java | 0 .../com/android/server}/KeySetStrings.java | 0 .../src/com/android/server}/KeySetUtils.java | 0 .../server}/ModuleInfoProviderTest.java | 2 +- .../server}/PackageInstallerSessionTest.java | 0 .../server}/PackageManagerServiceTest.java | 2 - .../server}/PackageManagerSettingsTests.java | 0 .../android/server}/PackageManagerTests.java | 2 +- .../android/server}/PackageParserTest.java | 0 .../server}/PackageSignaturesTest.java | 0 .../android/server}/PackageUserStateTest.java | 0 .../server}/PackageVerificationStateTest.java | 0 .../server}/ParallelPackageParserTest.java | 0 .../server}/PreferredComponentTest.java | 0 .../android/server}/RestrictionsSetTest.java | 0 .../android/server}/ScanRequestBuilder.java | 0 .../src/com/android/server}/ScanTests.java | 0 .../android/server}/UserDataPreparerTest.java | 10 +- .../server}/WatchedIntentHandlingTest.java | 0 .../parsing/PackageParserLegacyCoreTest.java | 2 +- .../parsing/PackageParsingDeferErrorTest.kt | 3 +- .../parsing/SystemPartitionParseTest.kt | 0 .../library/AndroidHidlUpdaterTest.java | 0 .../AndroidNetIpSecIkeUpdaterTest.java | 0 .../library/AndroidTestBaseUpdaterTest.java | 0 .../AndroidTestRunnerSplitUpdaterTest.java | 0 .../library/ApexSharedLibraryUpdaterTest.java | 0 .../ComGoogleAndroidMapsUpdaterTest.java | 0 .../parsing/library/OptionalClassRunner.java | 0 .../OrgApacheHttpLegacyUpdaterTest.java | 0 .../PackageBackwardCompatibilityTest.java | 0 .../PackageSharedLibraryUpdaterTest.java | 0 ...UnnecessaryAndroidTestBaseLibraryTest.java | 0 ...cessaryOrgApacheHttpLegacyLibraryTest.java | 0 .../src/com/android/server/utils/OWNERS | 4 + .../android/server/utils/WatchableTester.java | 0 .../com/android/server/utils/WatcherTest.java | 2 +- services/tests/servicestests/Android.bp | 72 ++++---- .../tests/servicestests/AndroidManifest.xml | 7 - .../backup/UserBackupManagerServiceTest.java | 2 + .../DevicePolicyManagerServiceTestable.java | 12 +- .../devicepolicy/DevicePolicyManagerTest.java | 8 +- .../src/com/android/server/utils/OWNERS | 6 +- 190 files changed, 503 insertions(+), 71 deletions(-) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/OWNERS (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install-split-base/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install-split-base/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install-split-base/src/com/google/android/dexapis/splitapp/BaseActivity.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install-split-feature-a/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install-split-feature-a/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install-split-feature-a/src/com/google/android/dexapis/splitapp/feature_a/FeatureAActivity.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_bad_dex/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_bad_dex/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_bad_dex/classes.dex (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_bad_dex/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_bad_dex/src/com/android/frameworks/coretests/TestActivity.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_complete_package_info/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_complete_package_info/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestActivity.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestProvider.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestReceiver.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestService.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_decl_perm/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_decl_perm/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_decl_perm/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_intent_filters/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_intent_filters/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_intent_filters/src/com/android/frameworks/servicestests/TestActivity.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_auto/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_auto/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_auto/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_internal/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_internal/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_internal/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_sdcard/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_sdcard/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_sdcard/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_unspecified/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_unspecified/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_loc_unspecified/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_use_perm_good/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_use_perm_good/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_use_perm_good/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_feature/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_feature/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_feature/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/Android.bp (82%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/AndroidManifest-0.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/AndroidManifest-q0-r0.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/AndroidManifest-q0.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/AndroidManifest-r-none.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/AndroidManifest-r0-s0.xml (100%) rename services/tests/{servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml => PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml} (100%) create mode 100644 services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/AndroidManifest-r0.xml (100%) rename services/tests/{servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml => PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml} (100%) create mode 100644 services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r5.xml rename services/tests/{servicestests => PackageManagerServiceTests}/apks/install_uses_sdk/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/Android.bp (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/api_test/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/permDef/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/permUse/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/res/values/strings.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/uA/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/uAB/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/uAuB/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/uB/AndroidManifest.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests}/apks/keyset/uNone/AndroidManifest.xml (100%) create mode 100644 services/tests/PackageManagerServiceTests/server/Android.bp create mode 100644 services/tests/PackageManagerServiceTests/server/AndroidManifest.xml create mode 100644 services/tests/PackageManagerServiceTests/server/AndroidTest.xml rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256-lineage-2-signers (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256-lineage-3-signers (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256.pk8 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256.x509.der (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256_2.pk8 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256_2.x509.der (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256_3.pk8 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/certs/ec-p256_3.x509.der (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/README (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-extra-cert-tag.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-index.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-key.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-invalid-public-key-cert-key.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-invalid-tag.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-missing-cert-index.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-missing-cert-key.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-missing-cert-tag.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-missing-scheme-version.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-missing-sigs-count.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer-previous-cert.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/one-signer.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/three-signers-in-lineage-invalid-pastSigs-count.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-cert-tag.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-count.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-scheme-version.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/three-signers-in-lineage.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-certs-flags.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-pastSigs-cert-index.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-certs-flags.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-pastSigs-cert-index.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-multiple-pastSigs-tags.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-no-caps.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage-undefined-pastSigs-index.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-in-lineage.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-v1v2-missing-cert-tag.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/assets/PackageSignaturesTest/xml/two-signers-v1v2.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/PackageParsingTestAppEmptyActionSdkQ.apk (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/PackageParsingTestAppEmptyActionSdkR.apk (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/PackageParsingTestAppEmptyCategorySdkQ.apk (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/PackageParsingTestAppEmptyCategorySdkR.apk (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/PackageParsingTestAppMissingAppSdkQ.apk (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/PackageParsingTestAppMissingAppSdkR.apk (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/com_android_tzdata.apex (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert1 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert1_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert3 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert3_cert4 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert5 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert5_rotated_cert6 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_cert6 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app1_unsigned (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app2_cert1 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app2_cert1_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app2_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app2_cert3 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app2_cert5_rotated_cert6 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_app2_unsigned (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared1_cert1 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared1_cert1_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared1_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared1_unsigned (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared2_cert1 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared2_cert1_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared2_cert2 (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/raw/install_shared2_unsigned (100%) create mode 100644 services/tests/PackageManagerServiceTests/server/res/values/values.xml rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/xml/unparseable_metadata1.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/xml/unparseable_metadata2.xml (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/res/xml/well_formed_metadata.xml (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/AppsFilterImplTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/BundleUtilsTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/CompatibilityModeTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/CrossProfileAppsServiceImplTest.java (99%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/InstallerTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/KeySetManagerServiceTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/KeySetStrings.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/KeySetUtils.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/ModuleInfoProviderTest.java (98%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageInstallerSessionTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageManagerServiceTest.java (99%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageManagerSettingsTests.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageManagerTests.java (99%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageParserTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageSignaturesTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageUserStateTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PackageVerificationStateTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/ParallelPackageParserTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/PreferredComponentTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/RestrictionsSetTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/ScanRequestBuilder.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/ScanTests.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/UserDataPreparerTest.java (96%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/WatchedIntentHandlingTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/PackageParserLegacyCoreTest.java (99%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/PackageParsingDeferErrorTest.kt (97%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/SystemPartitionParseTest.kt (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/AndroidHidlUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/AndroidNetIpSecIkeUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/AndroidTestBaseUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/AndroidTestRunnerSplitUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/ApexSharedLibraryUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/ComGoogleAndroidMapsUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/OptionalClassRunner.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/OrgApacheHttpLegacyUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/PackageBackwardCompatibilityTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/PackageSharedLibraryUpdaterTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/RemoveUnnecessaryAndroidTestBaseLibraryTest.java (100%) rename services/tests/{servicestests/src/com/android/server/pm => PackageManagerServiceTests/server/src/com/android/server}/parsing/library/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java (100%) create mode 100644 services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/OWNERS rename services/tests/{servicestests => PackageManagerServiceTests/server}/src/com/android/server/utils/WatchableTester.java (100%) rename services/tests/{servicestests => PackageManagerServiceTests/server}/src/com/android/server/utils/WatcherTest.java (99%) diff --git a/services/tests/PackageManagerServiceTests/TEST_MAPPING b/services/tests/PackageManagerServiceTests/TEST_MAPPING index af0008c29aafa..fe27a3777ee84 100644 --- a/services/tests/PackageManagerServiceTests/TEST_MAPPING +++ b/services/tests/PackageManagerServiceTests/TEST_MAPPING @@ -2,11 +2,45 @@ "presubmit": [ { "name": "AppEnumerationInternalTests" + }, + { + "name": "PackageManagerServiceServerTests", + "options": [ + { + "include-filter": "com.android.server.pm." + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] } ], "postsubmit": [ { "name": "PackageManagerServiceHostTests" + }, + { + "name": "PackageManagerServiceServerTests", + "options": [ + { + "include-filter": "com.android.server.pm." + }, + { + "include-annotation": "android.platform.test.annotations.Postsubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] } ], "imports": [ diff --git a/services/tests/servicestests/apks/Android.bp b/services/tests/PackageManagerServiceTests/apks/Android.bp similarity index 100% rename from services/tests/servicestests/apks/Android.bp rename to services/tests/PackageManagerServiceTests/apks/Android.bp diff --git a/services/tests/servicestests/apks/OWNERS b/services/tests/PackageManagerServiceTests/apks/OWNERS similarity index 100% rename from services/tests/servicestests/apks/OWNERS rename to services/tests/PackageManagerServiceTests/apks/OWNERS diff --git a/services/tests/servicestests/apks/install-split-base/Android.bp b/services/tests/PackageManagerServiceTests/apks/install-split-base/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install-split-base/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install-split-base/Android.bp diff --git a/services/tests/servicestests/apks/install-split-base/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install-split-base/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install-split-base/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install-split-base/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install-split-base/src/com/google/android/dexapis/splitapp/BaseActivity.java b/services/tests/PackageManagerServiceTests/apks/install-split-base/src/com/google/android/dexapis/splitapp/BaseActivity.java similarity index 100% rename from services/tests/servicestests/apks/install-split-base/src/com/google/android/dexapis/splitapp/BaseActivity.java rename to services/tests/PackageManagerServiceTests/apks/install-split-base/src/com/google/android/dexapis/splitapp/BaseActivity.java diff --git a/services/tests/servicestests/apks/install-split-feature-a/Android.bp b/services/tests/PackageManagerServiceTests/apks/install-split-feature-a/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install-split-feature-a/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install-split-feature-a/Android.bp diff --git a/services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install-split-feature-a/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install-split-feature-a/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install-split-feature-a/src/com/google/android/dexapis/splitapp/feature_a/FeatureAActivity.java b/services/tests/PackageManagerServiceTests/apks/install-split-feature-a/src/com/google/android/dexapis/splitapp/feature_a/FeatureAActivity.java similarity index 100% rename from services/tests/servicestests/apks/install-split-feature-a/src/com/google/android/dexapis/splitapp/feature_a/FeatureAActivity.java rename to services/tests/PackageManagerServiceTests/apks/install-split-feature-a/src/com/google/android/dexapis/splitapp/feature_a/FeatureAActivity.java diff --git a/services/tests/servicestests/apks/install/Android.bp b/services/tests/PackageManagerServiceTests/apks/install/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install/Android.bp diff --git a/services/tests/servicestests/apks/install/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_bad_dex/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_bad_dex/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_bad_dex/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_bad_dex/Android.bp diff --git a/services/tests/servicestests/apks/install_bad_dex/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_bad_dex/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_bad_dex/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_bad_dex/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_bad_dex/classes.dex b/services/tests/PackageManagerServiceTests/apks/install_bad_dex/classes.dex similarity index 100% rename from services/tests/servicestests/apks/install_bad_dex/classes.dex rename to services/tests/PackageManagerServiceTests/apks/install_bad_dex/classes.dex diff --git a/services/tests/servicestests/apks/install_bad_dex/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_bad_dex/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_bad_dex/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_bad_dex/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_bad_dex/src/com/android/frameworks/coretests/TestActivity.java b/services/tests/PackageManagerServiceTests/apks/install_bad_dex/src/com/android/frameworks/coretests/TestActivity.java similarity index 100% rename from services/tests/servicestests/apks/install_bad_dex/src/com/android/frameworks/coretests/TestActivity.java rename to services/tests/PackageManagerServiceTests/apks/install_bad_dex/src/com/android/frameworks/coretests/TestActivity.java diff --git a/services/tests/servicestests/apks/install_complete_package_info/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_complete_package_info/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_complete_package_info/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_complete_package_info/Android.bp diff --git a/services/tests/servicestests/apks/install_complete_package_info/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_complete_package_info/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_complete_package_info/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_complete_package_info/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestActivity.java b/services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestActivity.java similarity index 100% rename from services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestActivity.java rename to services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestActivity.java diff --git a/services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestProvider.java b/services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestProvider.java similarity index 100% rename from services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestProvider.java rename to services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestProvider.java diff --git a/services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestReceiver.java b/services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestReceiver.java similarity index 100% rename from services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestReceiver.java rename to services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestReceiver.java diff --git a/services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestService.java b/services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestService.java similarity index 100% rename from services/tests/servicestests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestService.java rename to services/tests/PackageManagerServiceTests/apks/install_complete_package_info/src/com/android/frameworks/coretests/TestService.java diff --git a/services/tests/servicestests/apks/install_decl_perm/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_decl_perm/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_decl_perm/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_decl_perm/Android.bp diff --git a/services/tests/servicestests/apks/install_decl_perm/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_decl_perm/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_decl_perm/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_decl_perm/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_decl_perm/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_decl_perm/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_decl_perm/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_decl_perm/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_intent_filters/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_intent_filters/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_intent_filters/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_intent_filters/Android.bp diff --git a/services/tests/servicestests/apks/install_intent_filters/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_intent_filters/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_intent_filters/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_intent_filters/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_intent_filters/src/com/android/frameworks/servicestests/TestActivity.java b/services/tests/PackageManagerServiceTests/apks/install_intent_filters/src/com/android/frameworks/servicestests/TestActivity.java similarity index 100% rename from services/tests/servicestests/apks/install_intent_filters/src/com/android/frameworks/servicestests/TestActivity.java rename to services/tests/PackageManagerServiceTests/apks/install_intent_filters/src/com/android/frameworks/servicestests/TestActivity.java diff --git a/services/tests/servicestests/apks/install_loc_auto/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_loc_auto/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_loc_auto/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_loc_auto/Android.bp diff --git a/services/tests/servicestests/apks/install_loc_auto/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_auto/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_auto/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_auto/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_loc_auto/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_auto/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_auto/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_auto/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_loc_internal/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_loc_internal/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_loc_internal/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_loc_internal/Android.bp diff --git a/services/tests/servicestests/apks/install_loc_internal/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_internal/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_internal/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_internal/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_loc_internal/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_internal/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_internal/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_internal/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_loc_sdcard/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_loc_sdcard/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_loc_sdcard/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_loc_sdcard/Android.bp diff --git a/services/tests/servicestests/apks/install_loc_sdcard/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_sdcard/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_sdcard/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_sdcard/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_loc_sdcard/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_sdcard/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_sdcard/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_sdcard/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_loc_unspecified/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_loc_unspecified/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_loc_unspecified/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_loc_unspecified/Android.bp diff --git a/services/tests/servicestests/apks/install_loc_unspecified/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_unspecified/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_unspecified/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_unspecified/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_loc_unspecified/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_loc_unspecified/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_loc_unspecified/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_loc_unspecified/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_use_perm_good/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_use_perm_good/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_use_perm_good/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_use_perm_good/Android.bp diff --git a/services/tests/servicestests/apks/install_use_perm_good/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_use_perm_good/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_use_perm_good/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_use_perm_good/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_use_perm_good/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_use_perm_good/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_use_perm_good/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_use_perm_good/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_uses_feature/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_uses_feature/Android.bp similarity index 100% rename from services/tests/servicestests/apks/install_uses_feature/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_uses_feature/Android.bp diff --git a/services/tests/servicestests/apks/install_uses_feature/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_feature/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_feature/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_feature/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/install_uses_feature/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_feature/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_feature/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_feature/res/values/strings.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/Android.bp b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp similarity index 82% rename from services/tests/servicestests/apks/install_uses_sdk/Android.bp rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp index a51293dc19974..9f96256078f3f 100644 --- a/services/tests/servicestests/apks/install_uses_sdk/Android.bp +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/Android.bp @@ -37,12 +37,24 @@ android_test_helper_app { manifest: "AndroidManifest-r5.xml", } +android_test_helper_app { + name: "FrameworksServicesTests_install_uses_sdk_r1000", + defaults: ["FrameworksServicesTests_apks_defaults"], + manifest: "AndroidManifest-r1000.xml", +} + android_test_helper_app { name: "FrameworksServicesTests_install_uses_sdk_r0_s0", defaults: ["FrameworksServicesTests_apks_defaults"], manifest: "AndroidManifest-r0-s0.xml", } +android_test_helper_app { + name: "FrameworksServicesTests_install_uses_sdk_r0_s1000", + defaults: ["FrameworksServicesTests_apks_defaults"], + manifest: "AndroidManifest-r0-s1000.xml", +} + android_test_helper_app { name: "FrameworksServicesTests_install_uses_sdk_r0_s5", defaults: ["FrameworksServicesTests_apks_defaults"], diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-0.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-0.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-0.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-0.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-q0-r0.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-q0-r0.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-q0-r0.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-q0-r0.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-q0.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-q0.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-q0.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-q0.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r-none.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r-none.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r-none.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r-none.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s0.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s0.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s0.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s0.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s1000.xml diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml new file mode 100644 index 0000000000000..bafe4c4faa3f6 --- /dev/null +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0-s5.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r0.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r0.xml diff --git a/services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r5.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r1000.xml diff --git a/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r5.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r5.xml new file mode 100644 index 0000000000000..7723d051a0418 --- /dev/null +++ b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/AndroidManifest-r5.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/services/tests/servicestests/apks/install_uses_sdk/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/install_uses_sdk/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/install_uses_sdk/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/install_uses_sdk/res/values/strings.xml diff --git a/services/tests/servicestests/apks/keyset/Android.bp b/services/tests/PackageManagerServiceTests/apks/keyset/Android.bp similarity index 100% rename from services/tests/servicestests/apks/keyset/Android.bp rename to services/tests/PackageManagerServiceTests/apks/keyset/Android.bp diff --git a/services/tests/servicestests/apks/keyset/api_test/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/api_test/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/api_test/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/api_test/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/permDef/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/permDef/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/permDef/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/permDef/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/permUse/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/permUse/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/permUse/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/permUse/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/res/values/strings.xml b/services/tests/PackageManagerServiceTests/apks/keyset/res/values/strings.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/res/values/strings.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/res/values/strings.xml diff --git a/services/tests/servicestests/apks/keyset/uA/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/uA/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/uA/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/uA/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/uAB/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/uAB/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/uAB/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/uAB/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/uAuB/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/uAuB/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/uAuB/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/uAuB/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/uB/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/uB/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/uB/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/uB/AndroidManifest.xml diff --git a/services/tests/servicestests/apks/keyset/uNone/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/apks/keyset/uNone/AndroidManifest.xml similarity index 100% rename from services/tests/servicestests/apks/keyset/uNone/AndroidManifest.xml rename to services/tests/PackageManagerServiceTests/apks/keyset/uNone/AndroidManifest.xml diff --git a/services/tests/PackageManagerServiceTests/server/Android.bp b/services/tests/PackageManagerServiceTests/server/Android.bp new file mode 100644 index 0000000000000..f1edd96d1adcb --- /dev/null +++ b/services/tests/PackageManagerServiceTests/server/Android.bp @@ -0,0 +1,160 @@ +//######################################################################## +// Build PackageManagerServiceServerTests package +//######################################################################## + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +android_test { + name: "PackageManagerServiceServerTests", + + // Include all test java files. + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], + static_libs: [ + "frameworks-base-testutils", + "services.accessibility", + "services.appwidget", + "services.autofill", + "services.backup", + "services.companion", + "services.core", + "services.devicepolicy", + "services.net", + "services.people", + "services.usage", + "guava", + "guava-android-testlib", + "androidx.test.core", + "androidx.test.ext.truth", + "androidx.test.runner", + "androidx.test.rules", + "cts-wm-util", + "platform-compat-test-rules", + "mockito-target-minus-junit4", + "platform-test-annotations", + "ShortcutManagerTestUtils", + "truth-prebuilt", + "testables", + "ub-uiautomator", + "platformprotosnano", + "framework-protos", + "hamcrest-library", + "servicestests-core-utils", + "servicestests-dpm-utils", + "servicestests-utils", + "service-permission.impl", + "testng", + "truth-prebuilt", + "junit", + "junit-params", + "platform-compat-test-rules", + "ActivityContext", + "coretests-aidl", + ], + + libs: [ + "android.hardware.power-V1-java", + "android.hardware.tv.cec-V1.0-java", + "android.hardware.vibrator-V2-java", + "android.hidl.manager-V1.0-java", + "android.test.mock", + "android.test.base", + "android.test.runner", + ], + + platform_apis: true, + + test_suites: [ + "device-tests", + "automotive-tests", + ], + + certificate: "platform", + + // These are not normally accessible from apps so they must be explicitly included. + jni_libs: [ + "libbase", + "libbinder", + "libc++", + "libcutils", + "liblog", + "liblzma", + "libnativehelper", + "libpsi", + "libui", + "libunwindstack", + "libutils", + "netd_aidl_interface-V5-cpp", + ], + + dxflags: ["--multi-dex"], + + java_resources: [ + ":PackageParserTestApp1", + ":PackageParserTestApp2", + ":PackageParserTestApp3", + ":PackageParserTestApp4", + ":PackageParserTestApp5", + ], + resource_zips: [":PackageManagerServiceServerTests_apks_as_resources"], +} + +// Rules to copy all the test apks to the intermediate raw resource directory +java_genrule { + name: "PackageManagerServiceServerTests_apks_as_resources", + srcs: [ + ":FrameworksServicesTests_install", + ":FrameworksServicesTests_install_bad_dex", + ":FrameworksServicesTests_install_complete_package_info", + ":FrameworksServicesTests_install_decl_perm", + ":FrameworksServicesTests_install_intent_filters", + ":FrameworksServicesTests_install_loc_auto", + ":FrameworksServicesTests_install_loc_internal", + ":FrameworksServicesTests_install_loc_sdcard", + ":FrameworksServicesTests_install_loc_unspecified", + ":FrameworksServicesTests_install_use_perm_good", + ":FrameworksServicesTests_install_uses_feature", + ":FrameworksServicesTests_install_uses_sdk_0", + ":FrameworksServicesTests_install_uses_sdk_q0", + ":FrameworksServicesTests_install_uses_sdk_q0_r0", + ":FrameworksServicesTests_install_uses_sdk_r0", + ":FrameworksServicesTests_install_uses_sdk_r5", + ":FrameworksServicesTests_install_uses_sdk_r1000", + ":FrameworksServicesTests_install_uses_sdk_r_none", + ":FrameworksServicesTests_install_uses_sdk_r0_s0", + ":FrameworksServicesTests_install_uses_sdk_r0_s5", + ":FrameworksServicesTests_install_uses_sdk_r0_s1000", + ":FrameworksServicesTests_keyset_permdef_sa_unone", + ":FrameworksServicesTests_keyset_permuse_sa_ua_ub", + ":FrameworksServicesTests_keyset_permuse_sb_ua_ub", + ":FrameworksServicesTests_keyset_sa_ua", + ":FrameworksServicesTests_keyset_sa_ua_ub", + ":FrameworksServicesTests_keyset_sa_uab", + ":FrameworksServicesTests_keyset_sa_ub", + ":FrameworksServicesTests_keyset_sa_unone", + ":FrameworksServicesTests_keyset_sab_ua", + ":FrameworksServicesTests_keyset_sau_ub", + ":FrameworksServicesTests_keyset_sb_ua", + ":FrameworksServicesTests_keyset_sb_ub", + ":FrameworksServicesTests_keyset_splat_api", + ":FrameworksServicesTests_keyset_splata_api", + ], + out: ["PackageManagerServiceServerTests_apks_as_resources.res.zip"], + tools: ["soong_zip"], + + cmd: "mkdir -p $(genDir)/res/raw && " + + "for i in $(in); do " + + " x=$${i##*FrameworksCoreTests_}; cp $$i $(genDir)/res/raw/$${x%.apk};" + + " x=$${i##*FrameworksServicesTests_}; cp $$i $(genDir)/res/raw/$${x%.apk};" + + "done && " + + "$(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res", +} diff --git a/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml b/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml new file mode 100644 index 0000000000000..c383197792b0f --- /dev/null +++ b/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/tests/PackageManagerServiceTests/server/AndroidTest.xml b/services/tests/PackageManagerServiceTests/server/AndroidTest.xml new file mode 100644 index 0000000000000..869d60ead3a1e --- /dev/null +++ b/services/tests/PackageManagerServiceTests/server/AndroidTest.xml @@ -0,0 +1,33 @@ + + + + diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256-lineage-2-signers b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256-lineage-2-signers similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256-lineage-2-signers rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256-lineage-2-signers diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256-lineage-3-signers b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256-lineage-3-signers similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256-lineage-3-signers rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256-lineage-3-signers diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256.pk8 b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256.pk8 similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256.pk8 rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256.pk8 diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256.x509.der b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256.x509.der similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256.x509.der rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256.x509.der diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_2.pk8 b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_2.pk8 similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_2.pk8 rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_2.pk8 diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_2.x509.der b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_2.x509.der similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_2.x509.der rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_2.x509.der diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_3.pk8 b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_3.pk8 similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_3.pk8 rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_3.pk8 diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_3.x509.der b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_3.x509.der similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/certs/ec-p256_3.x509.der rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/certs/ec-p256_3.x509.der diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/README b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/README similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/README rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/README diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-extra-cert-tag.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-extra-cert-tag.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-extra-cert-tag.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-extra-cert-tag.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-index.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-index.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-index.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-index.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-key.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-key.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-key.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-cert-key.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-public-key-cert-key.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-public-key-cert-key.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-public-key-cert-key.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-public-key-cert-key.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-tag.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-tag.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-invalid-tag.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-invalid-tag.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-cert-index.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-cert-index.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-cert-index.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-cert-index.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-cert-key.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-cert-key.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-cert-key.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-cert-key.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-cert-tag.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-cert-tag.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-cert-tag.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-cert-tag.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-scheme-version.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-scheme-version.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-scheme-version.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-scheme-version.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-sigs-count.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-sigs-count.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-missing-sigs-count.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-missing-sigs-count.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-previous-cert.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-previous-cert.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer-previous-cert.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer-previous-cert.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/one-signer.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/one-signer.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-invalid-pastSigs-count.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-invalid-pastSigs-count.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-invalid-pastSigs-count.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-invalid-pastSigs-count.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-cert-tag.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-cert-tag.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-cert-tag.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-cert-tag.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-count.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-count.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-count.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-pastSigs-count.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-scheme-version.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-scheme-version.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-scheme-version.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage-missing-scheme-version.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/three-signers-in-lineage.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/three-signers-in-lineage.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-certs-flags.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-certs-flags.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-certs-flags.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-certs-flags.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-pastSigs-cert-index.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-pastSigs-cert-index.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-pastSigs-cert-index.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-invalid-pastSigs-cert-index.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-certs-flags.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-certs-flags.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-certs-flags.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-certs-flags.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-pastSigs-cert-index.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-pastSigs-cert-index.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-pastSigs-cert-index.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-missing-pastSigs-cert-index.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-multiple-pastSigs-tags.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-multiple-pastSigs-tags.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-multiple-pastSigs-tags.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-multiple-pastSigs-tags.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-no-caps.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-no-caps.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-no-caps.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-no-caps.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-undefined-pastSigs-index.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-undefined-pastSigs-index.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage-undefined-pastSigs-index.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage-undefined-pastSigs-index.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-in-lineage.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-in-lineage.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-v1v2-missing-cert-tag.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-v1v2-missing-cert-tag.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-v1v2-missing-cert-tag.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-v1v2-missing-cert-tag.xml diff --git a/services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-v1v2.xml b/services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-v1v2.xml similarity index 100% rename from services/tests/servicestests/assets/PackageSignaturesTest/xml/two-signers-v1v2.xml rename to services/tests/PackageManagerServiceTests/server/assets/PackageSignaturesTest/xml/two-signers-v1v2.xml diff --git a/services/tests/servicestests/res/raw/PackageParsingTestAppEmptyActionSdkQ.apk b/services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyActionSdkQ.apk similarity index 100% rename from services/tests/servicestests/res/raw/PackageParsingTestAppEmptyActionSdkQ.apk rename to services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyActionSdkQ.apk diff --git a/services/tests/servicestests/res/raw/PackageParsingTestAppEmptyActionSdkR.apk b/services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyActionSdkR.apk similarity index 100% rename from services/tests/servicestests/res/raw/PackageParsingTestAppEmptyActionSdkR.apk rename to services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyActionSdkR.apk diff --git a/services/tests/servicestests/res/raw/PackageParsingTestAppEmptyCategorySdkQ.apk b/services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyCategorySdkQ.apk similarity index 100% rename from services/tests/servicestests/res/raw/PackageParsingTestAppEmptyCategorySdkQ.apk rename to services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyCategorySdkQ.apk diff --git a/services/tests/servicestests/res/raw/PackageParsingTestAppEmptyCategorySdkR.apk b/services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyCategorySdkR.apk similarity index 100% rename from services/tests/servicestests/res/raw/PackageParsingTestAppEmptyCategorySdkR.apk rename to services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppEmptyCategorySdkR.apk diff --git a/services/tests/servicestests/res/raw/PackageParsingTestAppMissingAppSdkQ.apk b/services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppMissingAppSdkQ.apk similarity index 100% rename from services/tests/servicestests/res/raw/PackageParsingTestAppMissingAppSdkQ.apk rename to services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppMissingAppSdkQ.apk diff --git a/services/tests/servicestests/res/raw/PackageParsingTestAppMissingAppSdkR.apk b/services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppMissingAppSdkR.apk similarity index 100% rename from services/tests/servicestests/res/raw/PackageParsingTestAppMissingAppSdkR.apk rename to services/tests/PackageManagerServiceTests/server/res/raw/PackageParsingTestAppMissingAppSdkR.apk diff --git a/services/tests/servicestests/res/raw/com_android_tzdata.apex b/services/tests/PackageManagerServiceTests/server/res/raw/com_android_tzdata.apex similarity index 100% rename from services/tests/servicestests/res/raw/com_android_tzdata.apex rename to services/tests/PackageManagerServiceTests/server/res/raw/com_android_tzdata.apex diff --git a/services/tests/servicestests/res/raw/install_app1_cert1 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert1 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert1 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert1 diff --git a/services/tests/servicestests/res/raw/install_app1_cert1_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert1_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert1_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert1_cert2 diff --git a/services/tests/servicestests/res/raw/install_app1_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert2 diff --git a/services/tests/servicestests/res/raw/install_app1_cert3 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert3 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert3 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert3 diff --git a/services/tests/servicestests/res/raw/install_app1_cert3_cert4 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert3_cert4 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert3_cert4 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert3_cert4 diff --git a/services/tests/servicestests/res/raw/install_app1_cert5 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert5 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert5 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert5 diff --git a/services/tests/servicestests/res/raw/install_app1_cert5_rotated_cert6 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert5_rotated_cert6 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert5_rotated_cert6 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert5_rotated_cert6 diff --git a/services/tests/servicestests/res/raw/install_app1_cert6 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert6 similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_cert6 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_cert6 diff --git a/services/tests/servicestests/res/raw/install_app1_unsigned b/services/tests/PackageManagerServiceTests/server/res/raw/install_app1_unsigned similarity index 100% rename from services/tests/servicestests/res/raw/install_app1_unsigned rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app1_unsigned diff --git a/services/tests/servicestests/res/raw/install_app2_cert1 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert1 similarity index 100% rename from services/tests/servicestests/res/raw/install_app2_cert1 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert1 diff --git a/services/tests/servicestests/res/raw/install_app2_cert1_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert1_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_app2_cert1_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert1_cert2 diff --git a/services/tests/servicestests/res/raw/install_app2_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_app2_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert2 diff --git a/services/tests/servicestests/res/raw/install_app2_cert3 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert3 similarity index 100% rename from services/tests/servicestests/res/raw/install_app2_cert3 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert3 diff --git a/services/tests/servicestests/res/raw/install_app2_cert5_rotated_cert6 b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert5_rotated_cert6 similarity index 100% rename from services/tests/servicestests/res/raw/install_app2_cert5_rotated_cert6 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app2_cert5_rotated_cert6 diff --git a/services/tests/servicestests/res/raw/install_app2_unsigned b/services/tests/PackageManagerServiceTests/server/res/raw/install_app2_unsigned similarity index 100% rename from services/tests/servicestests/res/raw/install_app2_unsigned rename to services/tests/PackageManagerServiceTests/server/res/raw/install_app2_unsigned diff --git a/services/tests/servicestests/res/raw/install_shared1_cert1 b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_cert1 similarity index 100% rename from services/tests/servicestests/res/raw/install_shared1_cert1 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_cert1 diff --git a/services/tests/servicestests/res/raw/install_shared1_cert1_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_cert1_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_shared1_cert1_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_cert1_cert2 diff --git a/services/tests/servicestests/res/raw/install_shared1_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_shared1_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_cert2 diff --git a/services/tests/servicestests/res/raw/install_shared1_unsigned b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_unsigned similarity index 100% rename from services/tests/servicestests/res/raw/install_shared1_unsigned rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared1_unsigned diff --git a/services/tests/servicestests/res/raw/install_shared2_cert1 b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_cert1 similarity index 100% rename from services/tests/servicestests/res/raw/install_shared2_cert1 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_cert1 diff --git a/services/tests/servicestests/res/raw/install_shared2_cert1_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_cert1_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_shared2_cert1_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_cert1_cert2 diff --git a/services/tests/servicestests/res/raw/install_shared2_cert2 b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_cert2 similarity index 100% rename from services/tests/servicestests/res/raw/install_shared2_cert2 rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_cert2 diff --git a/services/tests/servicestests/res/raw/install_shared2_unsigned b/services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_unsigned similarity index 100% rename from services/tests/servicestests/res/raw/install_shared2_unsigned rename to services/tests/PackageManagerServiceTests/server/res/raw/install_shared2_unsigned diff --git a/services/tests/PackageManagerServiceTests/server/res/values/values.xml b/services/tests/PackageManagerServiceTests/server/res/values/values.xml new file mode 100644 index 0000000000000..79c66537a06a9 --- /dev/null +++ b/services/tests/PackageManagerServiceTests/server/res/values/values.xml @@ -0,0 +1,20 @@ + + + + + module_1_name + module_2_name + diff --git a/services/tests/servicestests/res/xml/unparseable_metadata1.xml b/services/tests/PackageManagerServiceTests/server/res/xml/unparseable_metadata1.xml similarity index 100% rename from services/tests/servicestests/res/xml/unparseable_metadata1.xml rename to services/tests/PackageManagerServiceTests/server/res/xml/unparseable_metadata1.xml diff --git a/services/tests/servicestests/res/xml/unparseable_metadata2.xml b/services/tests/PackageManagerServiceTests/server/res/xml/unparseable_metadata2.xml similarity index 100% rename from services/tests/servicestests/res/xml/unparseable_metadata2.xml rename to services/tests/PackageManagerServiceTests/server/res/xml/unparseable_metadata2.xml diff --git a/services/tests/servicestests/res/xml/well_formed_metadata.xml b/services/tests/PackageManagerServiceTests/server/res/xml/well_formed_metadata.xml similarity index 100% rename from services/tests/servicestests/res/xml/well_formed_metadata.xml rename to services/tests/PackageManagerServiceTests/server/res/xml/well_formed_metadata.xml diff --git a/services/tests/servicestests/src/com/android/server/pm/AppsFilterImplTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/AppsFilterImplTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/AppsFilterImplTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/AppsFilterImplTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/BundleUtilsTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/BundleUtilsTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/BundleUtilsTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/BundleUtilsTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/CompatibilityModeTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/CompatibilityModeTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/CompatibilityModeTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/CompatibilityModeTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/CrossProfileAppsServiceImplTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/CrossProfileAppsServiceImplTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/pm/CrossProfileAppsServiceImplTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/CrossProfileAppsServiceImplTest.java index 8bd6fcdbb9c2a..129efc630be6e 100644 --- a/services/tests/servicestests/src/com/android/server/pm/CrossProfileAppsServiceImplTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/CrossProfileAppsServiceImplTest.java @@ -66,7 +66,7 @@ import java.util.List; /** * Build/Install/Run: - * atest FrameworksServicesTests:com.android.server.pm.CrossProfileAppsServiceImplTest + * atest PackageManagerServiceServerTests:com.android.server.pm.CrossProfileAppsServiceImplTest */ @Presubmit @RunWith(MockitoJUnitRunner.class) diff --git a/services/tests/servicestests/src/com/android/server/pm/InstallerTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/InstallerTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/InstallerTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/InstallerTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/KeySetManagerServiceTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/KeySetManagerServiceTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/KeySetManagerServiceTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/KeySetManagerServiceTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/KeySetStrings.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/KeySetStrings.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/KeySetStrings.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/KeySetStrings.java diff --git a/services/tests/servicestests/src/com/android/server/pm/KeySetUtils.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/KeySetUtils.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/KeySetUtils.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/KeySetUtils.java diff --git a/services/tests/servicestests/src/com/android/server/pm/ModuleInfoProviderTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/ModuleInfoProviderTest.java similarity index 98% rename from services/tests/servicestests/src/com/android/server/pm/ModuleInfoProviderTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/ModuleInfoProviderTest.java index 9ea7907ef4d0f..ad58507522a97 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ModuleInfoProviderTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/ModuleInfoProviderTest.java @@ -24,7 +24,7 @@ import android.content.pm.PackageManager; import android.platform.test.annotations.Presubmit; import android.test.InstrumentationTestCase; -import com.android.frameworks.servicestests.R; +import com.android.server.pm.test.service.server.R; import org.mockito.Mock; diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageInstallerSessionTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageInstallerSessionTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java index 1877d45e5ce3f..b82ffb4d0b397 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java @@ -66,8 +66,6 @@ import java.util.List; import java.util.regex.Pattern; // atest PackageManagerServiceTest -// runtest -c com.android.server.pm.PackageManagerServiceTest frameworks-services -// bit FrameworksServicesTests:com.android.server.pm.PackageManagerServiceTest @Postsubmit @RunWith(AndroidJUnit4.class) public class PackageManagerServiceTest { diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerSettingsTests.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerSettingsTests.java diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerTests.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerTests.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/pm/PackageManagerTests.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerTests.java index 869ac8877d6de..d288d41ae96c3 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerTests.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerTests.java @@ -69,7 +69,7 @@ import androidx.test.filters.LargeTest; import androidx.test.filters.SmallTest; import androidx.test.filters.Suppress; -import com.android.frameworks.servicestests.R; +import com.android.server.pm.test.service.server.R; import com.android.internal.content.InstallLocationUtils; import com.android.server.pm.pkg.parsing.ParsingPackage; import com.android.server.pm.pkg.parsing.ParsingPackageUtils; diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageParserTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageParserTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageSignaturesTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageSignaturesTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PackageSignaturesTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageSignaturesTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageUserStateTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageUserStateTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PackageUserStateTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageUserStateTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageVerificationStateTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageVerificationStateTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PackageVerificationStateTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageVerificationStateTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/ParallelPackageParserTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/ParallelPackageParserTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/ParallelPackageParserTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/ParallelPackageParserTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/PreferredComponentTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PreferredComponentTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/PreferredComponentTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/PreferredComponentTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/RestrictionsSetTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/RestrictionsSetTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/RestrictionsSetTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/RestrictionsSetTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/ScanRequestBuilder.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/ScanRequestBuilder.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/ScanRequestBuilder.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/ScanRequestBuilder.java diff --git a/services/tests/servicestests/src/com/android/server/pm/ScanTests.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/ScanTests.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/ScanTests.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/ScanTests.java diff --git a/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/UserDataPreparerTest.java similarity index 96% rename from services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/UserDataPreparerTest.java index c489cf0a138d4..2d09ef78ecbc5 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserDataPreparerTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/UserDataPreparerTest.java @@ -46,15 +46,7 @@ import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; -/** - *

Run with:

- * m FrameworksServicesTests &&
- * adb install \
- * -r out/target/product/hammerhead/data/app/FrameworksServicesTests/FrameworksServicesTests.apk &&
- * adb shell am instrument -e class com.android.server.pm.UserDataPreparerTest \
- * -w com.android.frameworks.servicestests/androidx.test.runner.AndroidJUnitRunner
- *
- */ +// atest PackageManagerServiceTest:com.android.server.pm.UserDataPreparerTest @RunWith(AndroidJUnit4.class) @Presubmit @SmallTest diff --git a/services/tests/servicestests/src/com/android/server/pm/WatchedIntentHandlingTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/WatchedIntentHandlingTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/WatchedIntentHandlingTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/WatchedIntentHandlingTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java index 07cca0ca6ba0f..c6a634056087d 100644 --- a/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParserLegacyCoreTest.java @@ -42,7 +42,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; -import com.android.frameworks.servicestests.R; +import com.android.server.pm.test.service.server.R; import com.android.internal.util.ArrayUtils; import com.android.server.pm.PackageManagerException; import com.android.server.pm.parsing.pkg.AndroidPackage; diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParsingDeferErrorTest.kt b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParsingDeferErrorTest.kt similarity index 97% rename from services/tests/servicestests/src/com/android/server/pm/parsing/PackageParsingDeferErrorTest.kt rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParsingDeferErrorTest.kt index bb094ba897e6b..d8cc5aaa59445 100644 --- a/services/tests/servicestests/src/com/android/server/pm/parsing/PackageParsingDeferErrorTest.kt +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/PackageParsingDeferErrorTest.kt @@ -23,7 +23,8 @@ import com.android.server.pm.pkg.parsing.ParsingPackageUtils import android.content.pm.parsing.result.ParseResult import android.platform.test.annotations.Presubmit import androidx.test.InstrumentationRegistry -import com.android.frameworks.servicestests.R +import com.android.server.pm.parsing.pkg.ParsedPackage +import com.android.server.pm.test.service.server.R import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage import org.junit.Rule diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/SystemPartitionParseTest.kt b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/SystemPartitionParseTest.kt similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/SystemPartitionParseTest.kt rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/SystemPartitionParseTest.kt diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidHidlUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidHidlUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidHidlUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidHidlUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidNetIpSecIkeUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidNetIpSecIkeUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidNetIpSecIkeUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidNetIpSecIkeUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidTestBaseUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidTestBaseUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidTestBaseUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidTestBaseUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidTestRunnerSplitUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidTestRunnerSplitUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/AndroidTestRunnerSplitUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/AndroidTestRunnerSplitUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/ApexSharedLibraryUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/ApexSharedLibraryUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/ApexSharedLibraryUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/ApexSharedLibraryUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/ComGoogleAndroidMapsUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/ComGoogleAndroidMapsUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/ComGoogleAndroidMapsUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/ComGoogleAndroidMapsUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/OptionalClassRunner.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/OptionalClassRunner.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/OptionalClassRunner.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/OptionalClassRunner.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/OrgApacheHttpLegacyUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/OrgApacheHttpLegacyUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/OrgApacheHttpLegacyUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/OrgApacheHttpLegacyUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/PackageBackwardCompatibilityTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/PackageBackwardCompatibilityTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/PackageBackwardCompatibilityTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/PackageBackwardCompatibilityTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/PackageSharedLibraryUpdaterTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/PackageSharedLibraryUpdaterTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/PackageSharedLibraryUpdaterTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/PackageSharedLibraryUpdaterTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/RemoveUnnecessaryAndroidTestBaseLibraryTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/RemoveUnnecessaryAndroidTestBaseLibraryTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/RemoveUnnecessaryAndroidTestBaseLibraryTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/RemoveUnnecessaryAndroidTestBaseLibraryTest.java diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/library/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/pm/parsing/library/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/parsing/library/RemoveUnnecessaryOrgApacheHttpLegacyLibraryTest.java diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/OWNERS b/services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/OWNERS new file mode 100644 index 0000000000000..1853220b94337 --- /dev/null +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/OWNERS @@ -0,0 +1,4 @@ +per-file WatchableTester.java = file:/services/core/java/com/android/server/pm/OWNERS +per-file WatchableTester.java = shombert@google.com +per-file WatcherTest.java = file:/services/core/java/com/android/server/pm/OWNERS +per-file WatcherTest.java = shombert@google.com diff --git a/services/tests/servicestests/src/com/android/server/utils/WatchableTester.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/WatchableTester.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/utils/WatchableTester.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/WatchableTester.java diff --git a/services/tests/servicestests/src/com/android/server/utils/WatcherTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/WatcherTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/utils/WatcherTest.java rename to services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/WatcherTest.java index 37c95f735d893..74d491dbf87c9 100644 --- a/services/tests/servicestests/src/com/android/server/utils/WatcherTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/utils/WatcherTest.java @@ -44,7 +44,7 @@ import java.util.Random; * {@link WatchedSparseBooleanArray}. * * Build/Install/Run: - * atest FrameworksServicesTests:WatcherTest + * atest PackageManagerServiceTest:WatcherTest */ @SmallTest public class WatcherTest { diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 16df5deb2e5c2..c48ae58d52e24 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -107,17 +107,12 @@ android_test { ], java_resources: [ - ":PackageParserTestApp1", - ":PackageParserTestApp2", - ":PackageParserTestApp3", - ":PackageParserTestApp4", - ":PackageParserTestApp5", - ":apex.test", - ":test.rebootless_apex_v1", - ":test.rebootless_apex_v2", ":com.android.apex.cts.shim.v1_prebuilt", ":com.android.apex.cts.shim.v2_different_certificate_prebuilt", ":com.android.apex.cts.shim.v2_unsigned_apk_container_prebuilt", + ":apex.test", + ":test.rebootless_apex_v1", + ":test.rebootless_apex_v2", ], resource_zips: [":FrameworksServicesTests_apks_as_resources"], } @@ -127,6 +122,7 @@ java_library { srcs: [ "src/com/android/server/pm/PackageSettingBuilder.java", "src/com/android/server/am/DeviceConfigSession.java", + "src/com/android/server/pm/parsing/TestPackageParser2.kt", ], static_libs: [ "services.core", @@ -134,6 +130,33 @@ java_library { ], } +java_library { + name: "servicestests-dpm-utils", + srcs: [ + "src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java", + "src/com/android/server/devicepolicy/DevicePolicyManagerTestable.java", + "src/com/android/server/devicepolicy/DpmMockContext.java", + "src/com/android/server/devicepolicy/DpmTestBase.java", + "src/com/android/server/devicepolicy/DpmTestUtils.java", + "src/com/android/server/devicepolicy/DummyDeviceAdmins.java", + "src/com/android/server/devicepolicy/MockSystemServices.java", + "src/com/android/server/devicepolicy/MockUtils.java", + ], + libs: [ + "android.test.mock", + "android.test.base", + "mockito-target-minus-junit4", + ], + static_libs: [ + "frameworks-base-testutils", + "androidx.test.core", + "androidx.test.ext.truth", + "androidx.test.rules", + "services.core", + "services.devicepolicy", + ], +} + java_library { name: "servicestests-utils", srcs: [ @@ -177,41 +200,8 @@ filegroup { java_genrule { name: "FrameworksServicesTests_apks_as_resources", srcs: [ - ":FrameworksServicesTests_install", - ":FrameworksServicesTests_install_bad_dex", - ":FrameworksServicesTests_install_complete_package_info", - ":FrameworksServicesTests_install_decl_perm", - ":FrameworksServicesTests_install_intent_filters", - ":FrameworksServicesTests_install_loc_auto", - ":FrameworksServicesTests_install_loc_internal", - ":FrameworksServicesTests_install_loc_sdcard", - ":FrameworksServicesTests_install_loc_unspecified", ":FrameworksServicesTests_install_split_base", ":FrameworksServicesTests_install_split_feature_a", - ":FrameworksServicesTests_install_use_perm_good", - ":FrameworksServicesTests_install_uses_feature", - ":FrameworksServicesTests_install_uses_sdk_0", - ":FrameworksServicesTests_install_uses_sdk_q0", - ":FrameworksServicesTests_install_uses_sdk_q0_r0", - ":FrameworksServicesTests_install_uses_sdk_r0", - ":FrameworksServicesTests_install_uses_sdk_r5", - ":FrameworksServicesTests_install_uses_sdk_r_none", - ":FrameworksServicesTests_install_uses_sdk_r0_s0", - ":FrameworksServicesTests_install_uses_sdk_r0_s5", - ":FrameworksServicesTests_keyset_permdef_sa_unone", - ":FrameworksServicesTests_keyset_permuse_sa_ua_ub", - ":FrameworksServicesTests_keyset_permuse_sb_ua_ub", - ":FrameworksServicesTests_keyset_sa_ua", - ":FrameworksServicesTests_keyset_sa_ua_ub", - ":FrameworksServicesTests_keyset_sa_uab", - ":FrameworksServicesTests_keyset_sa_ub", - ":FrameworksServicesTests_keyset_sa_unone", - ":FrameworksServicesTests_keyset_sab_ua", - ":FrameworksServicesTests_keyset_sau_ub", - ":FrameworksServicesTests_keyset_sb_ua", - ":FrameworksServicesTests_keyset_sb_ub", - ":FrameworksServicesTests_keyset_splat_api", - ":FrameworksServicesTests_keyset_splata_api", ], out: ["FrameworkServicesTests_apks_as_resources.res.zip"], tools: ["soong_zip"], diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index 0afb1829f9d49..6c03cb9d56e3d 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -287,11 +287,4 @@ - - - - - - diff --git a/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java index bccd8a0b14b48..bc8670f3b98ee 100644 --- a/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -37,6 +37,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.platform.test.annotations.Presubmit; +import androidx.test.filters.FlakyTest; import androidx.test.runner.AndroidJUnit4; import com.android.server.backup.internal.LifecycleOperationStorage; @@ -172,6 +173,7 @@ public class UserBackupManagerServiceTest { } @Test + @FlakyTest public void testAgentDisconnected_cancelsCurrentOperations() throws Exception { when(mOperationStorage.operationTokensForPackage(eq("com.android.foo"))).thenReturn( ImmutableSet.of(123, 456, 789) diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java index c771998de8626..9a73dd3ac3d48 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java @@ -35,6 +35,7 @@ import android.media.IAudioService; import android.net.IIpConnectivityMetrics; import android.net.Uri; import android.os.Bundle; +import android.os.Environment; import android.os.Looper; import android.os.PowerManagerInternal; import android.os.UserHandle; @@ -57,6 +58,7 @@ import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.pm.UserManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal; +import java.io.File; import java.io.IOException; import java.util.Map; @@ -443,7 +445,7 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi @Override public TransferOwnershipMetadataManager newTransferOwnershipMetadataManager() { return new TransferOwnershipMetadataManager( - new TransferOwnershipMetadataManagerTest.MockInjector()); + new TransferOwnershipMetadataManagerMockInjector()); } @Override @@ -496,4 +498,12 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi return context; } } + + static class TransferOwnershipMetadataManagerMockInjector extends + TransferOwnershipMetadataManager.Injector { + @Override + public File getOwnerTransferMetadataDir() { + return Environment.getExternalStorageDirectory(); + } + } } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 388170bd24cbd..7e5033200210a 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -132,7 +132,6 @@ import android.os.IpcDataCache; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import android.platform.test.annotations.FlakyTest; import android.platform.test.annotations.Presubmit; import android.provider.Settings; import android.security.KeyChain; @@ -144,6 +143,7 @@ import android.util.ArraySet; import android.util.Log; import android.util.Pair; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import com.android.internal.R; @@ -4782,6 +4782,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + @FlakyTest(bugId = 260145949) public void testLockTaskPolicyForProfileOwner() throws Exception { mockPolicyExemptApps(); mockVendorPolicyExemptApps(); @@ -4817,6 +4818,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + @FlakyTest(bugId = 260145949) public void testLockTaskFeatures_IllegalArgumentException() throws Exception { // Setup a device owner. mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; @@ -7812,6 +7814,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + @FlakyTest(bugId = 260145949) public void testSetLockTaskFeatures_financeDo_validLockTaskFeatures_lockTaskFeaturesSet() throws Exception { int validLockTaskFeatures = LOCK_TASK_FEATURE_SYSTEM_INFO | LOCK_TASK_FEATURE_KEYGUARD @@ -7827,6 +7830,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + @FlakyTest(bugId = 260145949) public void testSetLockTaskFeatures_financeDo_invalidLockTaskFeatures_throwsException() throws Exception { int invalidLockTaskFeatures = LOCK_TASK_FEATURE_NONE | LOCK_TASK_FEATURE_OVERVIEW @@ -7843,6 +7847,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + @FlakyTest(bugId = 260145949) public void testIsUninstallBlocked_financeDo_success() throws Exception { String packageName = "com.android.foo.package"; setDeviceOwner(); @@ -7943,6 +7948,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + @FlakyTest(bugId = 260145949) public void testSetLockTaskPackages_financeDo_success() throws Exception { String[] packages = {"com.android.foo.package"}; mockEmptyPolicyExemptApps(); diff --git a/services/tests/servicestests/src/com/android/server/utils/OWNERS b/services/tests/servicestests/src/com/android/server/utils/OWNERS index 1853220b94337..5e2482825c740 100644 --- a/services/tests/servicestests/src/com/android/server/utils/OWNERS +++ b/services/tests/servicestests/src/com/android/server/utils/OWNERS @@ -1,4 +1,2 @@ -per-file WatchableTester.java = file:/services/core/java/com/android/server/pm/OWNERS -per-file WatchableTester.java = shombert@google.com -per-file WatcherTest.java = file:/services/core/java/com/android/server/pm/OWNERS -per-file WatcherTest.java = shombert@google.com +per-file EventLoggerTest.java = file:/platform/frameworks/av:/media/janitors/media_solutions_OWNERS +per-file EventLoggerTest.java = jmtrivi@google.com From b7833028438d1a7ccd86a9a1e3480cc81fc4c389 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Wed, 23 Nov 2022 20:40:38 +0000 Subject: [PATCH 2/2] Cleanup after test suite split. Bug: 238141698 Bug: 262254794 Test: presubmit Change-Id: I3d99829a735bc09b52ef77d75d875ca547d53f01 Merged-In: I3d99829a735bc09b52ef77d75d875ca547d53f01 --- TEST_MAPPING | 30 +++++++++++++++++++++++++ services/tests/servicestests/Android.bp | 1 - 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index e178583bca784..a48ce0ce1b6c3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -15,6 +15,22 @@ ] } ], + "presubmit-pm": [ + { + "name": "PackageManagerServiceServerTests", + "options": [ + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ], "presubmit": [ { "name": "ManagedProvisioningTests", @@ -167,6 +183,20 @@ "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" + } + ] } ] } diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index c48ae58d52e24..d622a80324851 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -55,7 +55,6 @@ android_test { "hamcrest-library", "servicestests-utils", "service-jobscheduler", - "service-permission.impl", // TODO: remove once Android migrates to JUnit 4.12, // which provides assertThrows "testng",