From 10e3b06fe1583ac348565b9ef69c0b1a11e045e8 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Mon, 16 Aug 2021 15:44:14 +0800 Subject: [PATCH] Remove tests Remove tests that have been migrated to cts-root. Bug: 194981157 Test: m Change-Id: I9ebb411f66293534dd91a7992c93799c9aedf791 --- .../tests/rollback/StagedRollbackTest.java | 44 ------------------- .../rollback/host/StagedRollbackTest.java | 19 -------- 2 files changed, 63 deletions(-) diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java index e874782c71839..a283aa9d07226 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java @@ -292,50 +292,6 @@ public class StagedRollbackTest { assertThat(RollbackUtils.getAvailableRollback(getModuleMetadataPackageName())).isNotNull(); } - @Test - public void testRollbackDataPolicy_Phase1_Install() throws Exception { - Install.multi(TestApp.A1, TestApp.B1, TestApp.C1).commit(); - // Write user data version = 1 - InstallUtils.processUserData(TestApp.A); - InstallUtils.processUserData(TestApp.B); - InstallUtils.processUserData(TestApp.C); - - Install a2 = Install.single(TestApp.A2).setStaged() - .setEnableRollback(PackageManager.ROLLBACK_DATA_POLICY_WIPE); - Install b2 = Install.single(TestApp.B2).setStaged() - .setEnableRollback(PackageManager.ROLLBACK_DATA_POLICY_RESTORE); - // The rollback data policy of C2 is specified in the manifest - Install c2 = Install.single(TestApp.C2).setStaged().setEnableRollback(); - Install.multi(a2, b2, c2).setEnableRollback().setStaged().commit(); - } - - @Test - public void testRollbackDataPolicy_Phase2_Rollback() throws Exception { - assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2); - assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(2); - // Write user data version = 2 - InstallUtils.processUserData(TestApp.A); - InstallUtils.processUserData(TestApp.B); - InstallUtils.processUserData(TestApp.C); - - RollbackInfo info = RollbackUtils.getAvailableRollback(TestApp.A); - RollbackUtils.rollback(info.getRollbackId()); - } - - @Test - public void testRollbackDataPolicy_Phase3_VerifyRollback() throws Exception { - assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1); - assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(1); - assertThat(InstallUtils.getInstalledVersion(TestApp.C)).isEqualTo(1); - // Read user data version from userdata.txt - // A's user data version is -1 for user data is wiped. - // B's user data version is 1 as rollback committed. - // C's user data version is -1 for user data is wiped. - assertThat(InstallUtils.getUserDataVersion(TestApp.A)).isEqualTo(-1); - assertThat(InstallUtils.getUserDataVersion(TestApp.B)).isEqualTo(1); - assertThat(InstallUtils.getUserDataVersion(TestApp.C)).isEqualTo(-1); - } - @Test public void expireRollbacks() throws Exception { // testNativeWatchdogTriggersRollback will fail if multiple staged sessions are diff --git a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java index 1aa5c249ff182..1c2f2449ed8c3 100644 --- a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java +++ b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java @@ -267,25 +267,6 @@ public class StagedRollbackTest extends BaseHostJUnit4Test { runPhase("testRollbackAllowlistedApp_Phase2_VerifyInstall"); } - @Test - public void testRollbackDataPolicy() throws Exception { - List before = getSnapshotDirectories("/data/misc_ce/0/rollback"); - - runPhase("testRollbackDataPolicy_Phase1_Install"); - getDevice().reboot(); - runPhase("testRollbackDataPolicy_Phase2_Rollback"); - getDevice().reboot(); - runPhase("testRollbackDataPolicy_Phase3_VerifyRollback"); - - // Verify snapshots are deleted after restoration - List after = getSnapshotDirectories("/data/misc_ce/0/rollback"); - // Only check directories newly created during the test - after.removeAll(before); - // There should be only one /data/misc_ce/0/rollback/ created during test - assertThat(after).hasSize(1); - assertDirectoryIsEmpty(after.get(0)); - } - /** * Tests that userdata of apk-in-apex is restored when apex is rolled back. */