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

Commit 3574194d authored by JW Wang's avatar JW Wang
Browse files

Code cleanup: StagedRollbackTest (4/n) 

Add device side methods with names like testFoo_PhaseN to show they are
grouped and coordinated by the same host side method testFoo.

Bug: 142697546
Test: atest StagedRollbackTest
Change-Id: Ic001c94075cbf5fc455188f5ecbaf73d58306e5f
parent 6e57d003

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

+3 −3
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ public class StagedRollbackTest { 
    }



    @Test

    public void testPreviouslyAbandonedRollbacksEnableRollback() throws Exception {

    public void testPreviouslyAbandonedRollbacks_Phase1() throws Exception {

        Uninstall.packages(TestApp.A);

        Install.single(TestApp.A1).commit();

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
@@ -275,7 +275,7 @@ public class StagedRollbackTest { 
    }



    @Test

    public void testPreviouslyAbandonedRollbacksCommitRollback() throws Exception {

    public void testPreviouslyAbandonedRollbacks_Phase2() throws Exception {

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);

        InstallUtils.processUserData(TestApp.A);
@@ -286,7 +286,7 @@ public class StagedRollbackTest { 
    }



    @Test

    public void testPreviouslyAbandonedRollbacksCheckUserdataRollback() throws Exception {

    public void testPreviouslyAbandonedRollbacks_Phase3() throws Exception {

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

        InstallUtils.processUserData(TestApp.A);

        Uninstall.packages(TestApp.A);

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

+3 −3
Original line number Diff line number Diff line
@@ -204,11 +204,11 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { 
     */

    @Test

    public void testPreviouslyAbandonedRollbacks() throws Exception {

        runPhase("testPreviouslyAbandonedRollbacksEnableRollback");

        runPhase("testPreviouslyAbandonedRollbacks_Phase1");

        getDevice().reboot();

        runPhase("testPreviouslyAbandonedRollbacksCommitRollback");

        runPhase("testPreviouslyAbandonedRollbacks_Phase2");

        getDevice().reboot();

        runPhase("testPreviouslyAbandonedRollbacksCheckUserdataRollback");

        runPhase("testPreviouslyAbandonedRollbacks_Phase3");

    }



    private void crashProcess(String processName, int numberOfCrashes) throws Exception {