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

Commit 67c3746c authored by Richard Uhler's avatar Richard Uhler
Browse files

Rename "Basic" staged rollback test to "ApkOnly" 

In preparation for adding Apex and Apex + Apk tests.

Bug: 124043688
Test: atest StagedRollbackTest
Change-Id: Iaf7398370c65403373bf4e7c2f82c8eb9cc0930c
parent 218c9e7d

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java

+11 −8
Original line number Diff line number Diff line
@@ -68,10 +68,11 @@ public class StagedRollbackTest { 




    /**

     * Test basic rollbacks. Enable rollback phase.

     * Test rollbacks of staged installs involving only apks.

     * Enable rollback phase.

     */

    @Test

    public void testBasicEnableRollback() throws Exception {

    public void testApkOnlyEnableRollback() throws Exception {

        RollbackTestUtils.uninstall(TEST_APP_A);

        assertEquals(-1, RollbackTestUtils.getInstalledVersion(TEST_APP_A));
@@ -81,14 +82,15 @@ public class StagedRollbackTest { 
        RollbackTestUtils.installStaged(true, "RollbackTestAppAv2.apk");



        // At this point, the host test driver will reboot the device and run

        // testBasicCommitRollback().

        // testApkOnlyCommitRollback().

    }



    /**

     * Test basic rollbacks. Commit rollback phase.

     * Test rollbacks of staged installs involving only apks.

     * Commit rollback phase.

     */

    @Test

    public void testBasicCommitRollback() throws Exception {

    public void testApkOnlyCommitRollback() throws Exception {

        assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A));



        RollbackManager rm = RollbackTestUtils.getRollbackManager();
@@ -111,14 +113,15 @@ public class StagedRollbackTest { 
        assertEquals(2, RollbackTestUtils.getInstalledVersion(TEST_APP_A));



        // At this point, the host test driver will reboot the device and run

        // testBasicConfirmRollback().

        // testApkOnlyConfirmRollback().

    }



    /**

     * Test basic rollbacks. Confirm rollback phase.

     * Test rollbacks of staged installs involving only apks.

     * Confirm rollback phase.

     */

    @Test

    public void testBasicConfirmRollback() throws Exception {

    public void testApkOnlyConfirmRollback() throws Exception {

        assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A));



        RollbackManager rm = RollbackTestUtils.getRollbackManager();

tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java

+6 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
     * Runs the given phase of a test by calling into the device.

     * Throws an exception if the test phase fails.

     * <p>

     * For example, <code>runPhase("testBasicEnableRollback");</code>

     * For example, <code>runPhase("testApkOnlyEnableRollback");</code>

     */

    private void runPhase(String phase) throws Exception {

        assertTrue(runDeviceTests("com.android.tests.rollback",
@@ -43,14 +43,14 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
    }



    /**

     * Tests staged rollbacks.

     * Tests staged rollbacks involving only apks.

     */

    @Test

    public void testBasic() throws Exception {

        runPhase("testBasicEnableRollback");

    public void testApkOnly() throws Exception {

        runPhase("testApkOnlyEnableRollback");

        getDevice().reboot();

        runPhase("testBasicCommitRollback");

        runPhase("testApkOnlyCommitRollback");

        getDevice().reboot();

        runPhase("testBasicConfirmRollback");

        runPhase("testApkOnlyConfirmRollback");

    }

}