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

Commit c2eb8b0e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Verify staged session remain unchanged on system server reboot" into... 

Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156f am: b54c17b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838108

Change-Id: I0490d1aa914d4075d2146a77fe5534c7831c7966
parents a7004a53 b54c17b2

tests/StagedInstallTest/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



android_test_helper_app {

    name: "StagedInstallInternalTestApp",

    manifest: "app/AndroidManifest.xml",

    srcs: ["app/src/**/*.java"],

    static_libs: ["androidx.test.rules", "cts-install-lib"],

    test_suites: ["general-tests"],

}



java_test_host {

    name: "StagedInstallInternalTest",

    srcs: ["src/**/*.java"],

    libs: ["tradefed"],

    static_libs: ["testng", "compatibility-tradefed"],

    test_suites: ["general-tests"],

    test_config: "StagedInstallInternalTest.xml",

}

tests/StagedInstallTest/StagedInstallInternalTest.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<configuration description="Runs the internal staged install tests">

    <option name="test-suite-tag" value="StagedInstallTest" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="StagedInstallInternalTestApp.apk" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />

        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />

        <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />

        <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.HostTest" >

        <option name="class"

                value="com.android.tests.stagedinstallinternal.host.StagedInstallInternalTest" />

    </test>

</configuration>

tests/StagedInstallTest/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "StagedInstallInternalTest"

    }

  ]

}

tests/StagedInstallTest/app/AndroidManifest.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.tests.stagedinstallinternal" >



    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />

    <application>

        <receiver android:name="com.android.cts.install.lib.LocalIntentSender"

                  android:exported="true" />

        <uses-library android:name="android.test.runner" />

    </application>





    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.tests.stagedinstallinternal"

                     android:label="StagedInstallInternal Test"/>



</manifest>

tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java

0 → 100644
+135 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.tests.stagedinstallinternal;



import static com.android.cts.install.lib.InstallUtils.getPackageInstaller;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;



import android.Manifest;

import android.content.pm.PackageInstaller;



import androidx.test.platform.app.InstrumentationRegistry;



import com.android.cts.install.lib.Install;

import com.android.cts.install.lib.InstallUtils;

import com.android.cts.install.lib.TestApp;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



import java.io.BufferedReader;

import java.io.BufferedWriter;

import java.io.File;

import java.io.FileReader;

import java.io.FileWriter;

import java.nio.file.Files;

import java.util.List;

import java.util.function.Consumer;



@RunWith(JUnit4.class)

public class StagedInstallInternalTest {



    private static final String TAG = StagedInstallInternalTest.class.getSimpleName();



    private File mTestStateFile = new File(

            InstrumentationRegistry.getInstrumentation().getContext().getFilesDir(),

            "stagedinstall_state");



    /**

     * Adopts common shell permissions needed for staged install tests.

     */

    @Before

    public void adoptShellPermissions() {

        InstallUtils.adoptShellPermissionIdentity(

                Manifest.permission.INSTALL_PACKAGES,

                Manifest.permission.DELETE_PACKAGES

        );

    }



    /**

     * Drops shell permissions needed for staged install tests.

     */

    @After

    public void dropShellPermissions() {

        InstallUtils.dropShellPermissionIdentity();

    }



    // This is marked as @Test to take advantage of @Before/@After methods of this class. Actual

    // purpose of this method to be called before and after each test case of

    // com.android.test.stagedinstall.host.StagedInstallTest to reduce tests flakiness.

    @Test

    public void cleanUp() throws Exception {

        Files.deleteIfExists(mTestStateFile.toPath());

    }



    @Test

    public void testSystemServerRestartDoesNotAffectStagedSessions_Commit() throws Exception {

        int sessionId = Install.single(TestApp.A1).setStaged().commit();

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1);

        assertSessionReady(sessionId);

        storeSessionId(sessionId);

    }



    @Test

    public void testSystemServerRestartDoesNotAffectStagedSessions_Verify() throws Exception {

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1);

        int sessionId = retrieveLastSessionId();

        assertSessionReady(sessionId);

    }



    private static void assertSessionReady(int sessionId) {

        assertSessionState(sessionId,

                (session) -> assertThat(session.isStagedSessionReady()).isTrue());

    }



    private static void assertSessionState(

            int sessionId, Consumer<PackageInstaller.SessionInfo> assertion) {

        PackageInstaller packageInstaller = getPackageInstaller();



        List<PackageInstaller.SessionInfo> sessions = packageInstaller.getStagedSessions();

        boolean found = false;

        for (PackageInstaller.SessionInfo session : sessions) {

            if (session.getSessionId() == sessionId) {

                assertion.accept(session);

                found = true;

            }

        }

        assertWithMessage("Expecting to find session in getStagedSession()")

                .that(found).isTrue();



        // Test also that getSessionInfo correctly returns the session.

        PackageInstaller.SessionInfo sessionInfo = packageInstaller.getSessionInfo(sessionId);

        assertion.accept(sessionInfo);

    }



    private void storeSessionId(int sessionId) throws Exception {

        try (BufferedWriter writer = new BufferedWriter(new FileWriter(mTestStateFile))) {

            writer.write("" + sessionId);

        }

    }



    private int retrieveLastSessionId() throws Exception {

        try (BufferedReader reader = new BufferedReader(new FileReader(mTestStateFile))) {

            return Integer.parseInt(reader.readLine());

        }

    }

}