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

Commit 0f0b3e52 authored by Alan Stokes's avatar Alan Stokes
Browse files

Extend unit tests to cover InstallSource. 

We were testing installer package name, add the other InstallSource
fields. Add getter to facilitate test.

Test: atest PackageInstallerSessionTest
Bug: 137951074
Bug: 134746019
Change-Id: Ic7483e3a90978248f5384f78f548e1c839dc562a
parent 4a8fc13d

services/core/java/com/android/server/pm/PackageInstallerSession.java

+5 −1
Original line number Diff line number Diff line
@@ -2145,8 +2145,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    }



    String getInstallerPackageName() {

        return getInstallSource().installerPackageName;

    }



    InstallSource getInstallSource() {

        synchronized (mLock) {

            return mInstallSource.installerPackageName;

            return mInstallSource;

        }

    }

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

+10 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ public class PackageInstallerSessionTest { 
        if (isMultiPackage) {

            params.isMultiPackage = true;

        }

        InstallSource installSource = InstallSource.create("testInstaller", null, "testInstaller");

        InstallSource installSource = InstallSource.create("testInstallInitiator",

                "testInstallOriginator", "testInstaller");

        return new PackageInstallerSession(

                /* callback */ null,

                /* context */null,
@@ -297,6 +298,8 @@ public class PackageInstallerSessionTest { 
        assertEquals(expected.userId, actual.userId);

        assertSessionParamsEquivalent(expected.params, actual.params);

        assertEquals(expected.getInstallerUid(), actual.getInstallerUid());

        assertEquals(expected.getInstallerPackageName(), actual.getInstallerPackageName());

        assertInstallSourcesEquivalent(expected.getInstallSource(), actual.getInstallSource());

        assertEquals(expected.stageDir.getAbsolutePath(), actual.stageDir.getAbsolutePath());

        assertEquals(expected.stageCid, actual.stageCid);

        assertEquals(expected.isPrepared(), actual.isPrepared());
@@ -316,4 +319,10 @@ public class PackageInstallerSessionTest { 
        assertEquals(expected.getParentSessionId(), actual.getParentSessionId());

        assertArrayEquals(expected.getChildSessionIds(), actual.getChildSessionIds());

    }



    private void assertInstallSourcesEquivalent(InstallSource expected, InstallSource actual) {

        assertEquals(expected.installerPackageName, actual.installerPackageName);

        assertEquals(expected.initiatingPackageName, actual.initiatingPackageName);

        assertEquals(expected.originatingPackageName, actual.originatingPackageName);

    }

}