Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ddb616c authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Minor refactor to make HACK easier to apply. 

Bug: 275409981
Test: atest com.android.server.pm.parsing.PackageParserLegacyCoreTest
Change-Id: If37d676c2e3f68e758864f1ee3db5b740e48d1a2
parent 52664bd1

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java

+33 −22
Original line number Original line Diff line number Diff line
@@ -93,6 +93,9 @@ public class PackageParserLegacyCoreTest { 
    private static final int PLATFORM_VERSION = 20;

    private static final int PLATFORM_VERSION = 20;

    private static final int NEWER_VERSION = 30;

    private static final int NEWER_VERSION = 30;





    private static final int DISALLOW_PRERELEASE = -1;

    private static final int DISALLOW_RELEASED = -1;



    @Rule public final Expect expect = Expect.create();

    @Rule public final Expect expect = Expect.create();





    private void verifyComputeMinSdkVersion(int minSdkVersion, String minSdkCodename,

    private void verifyComputeMinSdkVersion(int minSdkVersion, String minSdkCodename,
@@ -149,8 +152,10 @@ public class PackageParserLegacyCoreTest { 
        // Don't allow newer pre-release minSdkVersion on pre-release platform.

        // Don't allow newer pre-release minSdkVersion on pre-release platform.

        // APP: Pre-release API 30

        // APP: Pre-release API 30

        // DEV: Pre-release API 20

        // DEV: Pre-release API 20

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, false, -1);

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, false,

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, false, -1);

                DISALLOW_PRERELEASE);

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, false,

                DISALLOW_PRERELEASE);

    }

    }





    @Test

    @Test
@@ -173,21 +178,27 @@ public class PackageParserLegacyCoreTest { 
        // Don't allow older pre-release minSdkVersion on released platform.

        // Don't allow older pre-release minSdkVersion on released platform.

        // APP: Pre-release API 10

        // APP: Pre-release API 10

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeMinSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE, true, -1);

        verifyComputeMinSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE, true,

        verifyComputeMinSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE_WITH_FINGERPRINT, true, -1);

                DISALLOW_RELEASED);

        verifyComputeMinSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE_WITH_FINGERPRINT, true,

                DISALLOW_RELEASED);





        // Don't allow same pre-release minSdkVersion on released platform.

        // Don't allow same pre-release minSdkVersion on released platform.

        // APP: Pre-release API 20

        // APP: Pre-release API 20

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeMinSdkVersion(PLATFORM_VERSION, PRE_RELEASE, true, -1);

        verifyComputeMinSdkVersion(PLATFORM_VERSION, PRE_RELEASE, true,

        verifyComputeMinSdkVersion(PLATFORM_VERSION, PRE_RELEASE_WITH_FINGERPRINT, true, -1);

                DISALLOW_RELEASED);

        verifyComputeMinSdkVersion(PLATFORM_VERSION, PRE_RELEASE_WITH_FINGERPRINT, true,

                DISALLOW_RELEASED);









        // Don't allow newer pre-release minSdkVersion on released platform.

        // Don't allow newer pre-release minSdkVersion on released platform.

        // APP: Pre-release API 30

        // APP: Pre-release API 30

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, true, -1);

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, true,

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, true, -1);

                DISALLOW_RELEASED);

        verifyComputeMinSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, true,

                DISALLOW_RELEASED);

    }

    }





    private void verifyComputeTargetSdkVersion(int targetSdkVersion, String targetSdkCodename,

    private void verifyComputeTargetSdkVersion(int targetSdkVersion, String targetSdkCodename,
@@ -254,10 +265,10 @@ public class PackageParserLegacyCoreTest { 
        // Don't allow newer pre-release targetSdkVersion on pre-release platform.

        // Don't allow newer pre-release targetSdkVersion on pre-release platform.

        // APP: Pre-release API 30

        // APP: Pre-release API 30

        // DEV: Pre-release API 20

        // DEV: Pre-release API 20

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, false, false, -1);

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, false, false,

                DISALLOW_PRERELEASE);

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, false,

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, false,

                false, -1

                false, DISALLOW_PRERELEASE);

        );





        // Do allow newer pre-release targetSdkVersion on pre-release platform when

        // Do allow newer pre-release targetSdkVersion on pre-release platform when

        // allowUnknownCodenames is true.

        // allowUnknownCodenames is true.
@@ -290,35 +301,35 @@ public class PackageParserLegacyCoreTest { 
        // Don't allow older pre-release targetSdkVersion on released platform.

        // Don't allow older pre-release targetSdkVersion on released platform.

        // APP: Pre-release API 10

        // APP: Pre-release API 10

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeTargetSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE, true, false, -1);

        verifyComputeTargetSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE, true, false,

                DISALLOW_RELEASED);

        verifyComputeTargetSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE_WITH_FINGERPRINT, true,

        verifyComputeTargetSdkVersion(OLDER_VERSION, OLDER_PRE_RELEASE_WITH_FINGERPRINT, true,

                false, -1

                false, DISALLOW_RELEASED);

        );





        // Don't allow same pre-release targetSdkVersion on released platform.

        // Don't allow same pre-release targetSdkVersion on released platform.

        // APP: Pre-release API 20

        // APP: Pre-release API 20

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE, true, false, -1);

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE, true, false,

                DISALLOW_RELEASED);

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE_WITH_FINGERPRINT, true, false,

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE_WITH_FINGERPRINT, true, false,

                -1

                DISALLOW_RELEASED);

        );





        // Don't allow same pre-release targetSdkVersion on released platform when

        // Don't allow same pre-release targetSdkVersion on released platform when

        // allowUnknownCodenames is true.

        // allowUnknownCodenames is true.

        // APP: Pre-release API 20

        // APP: Pre-release API 20

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE, true, true,

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE, true, true,

                -1);

                DISALLOW_RELEASED);

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE_WITH_FINGERPRINT, true, true,

        verifyComputeTargetSdkVersion(PLATFORM_VERSION, PRE_RELEASE_WITH_FINGERPRINT, true, true,

                -1);

                DISALLOW_RELEASED);





        // Don't allow newer pre-release targetSdkVersion on released platform.

        // Don't allow newer pre-release targetSdkVersion on released platform.

        // APP: Pre-release API 30

        // APP: Pre-release API 30

        // DEV: Released API 20

        // DEV: Released API 20

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, true, false, -1);

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE, true, false,

                DISALLOW_RELEASED);

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, true,

        verifyComputeTargetSdkVersion(NEWER_VERSION, NEWER_PRE_RELEASE_WITH_FINGERPRINT, true,

                false, -1

                false, DISALLOW_RELEASED);

        );

        // Do allow newer pre-release targetSdkVersion on released platform when

        // Do allow newer pre-release targetSdkVersion on released platform when

        // allowUnknownCodenames is true.

        // allowUnknownCodenames is true.

        // APP: Pre-release API 30

        // APP: Pre-release API 30