diff options
| -rw-r--r-- | tests/StagedInstallTest/Android.bp | 1 | ||||
| -rw-r--r-- | tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/tests/StagedInstallTest/Android.bp b/tests/StagedInstallTest/Android.bp index b001fe105bc1..45c1c73afcb0 100644 --- a/tests/StagedInstallTest/Android.bp +++ b/tests/StagedInstallTest/Android.bp @@ -27,7 +27,6 @@ java_test_host { static_libs: [ "testng", "compatibility-tradefed", - "module_test_util", "frameworks-base-hostutils", "cts-install-lib-host", ], diff --git a/tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java b/tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java index 118df7ca8202..8cfe187d387c 100644 --- a/tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java +++ b/tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java @@ -27,7 +27,6 @@ import android.cts.install.lib.host.InstallUtilsHost; import com.android.ddmlib.Log; import com.android.tests.rollback.host.AbandonSessionsRule; -import com.android.tests.util.ModuleTestUtils; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; @@ -56,7 +55,6 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { private static final String SHIM_V2 = "com.android.apex.cts.shim.v2.apex"; private static final String APK_A = "TestAppAv1.apk"; - private final ModuleTestUtils mTestUtils = new ModuleTestUtils(this); private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this); /** @@ -105,7 +103,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported()); - final File apexFile = mTestUtils.getTestFile(SHIM_V2); + final File apexFile = mHostUtils.getTestFile(SHIM_V2); final String output = getDevice().executeAdbCommand("install", "--staged", "--staged-ready-timeout", "60000", apexFile.getAbsolutePath()); assertThat(output).contains("Reboot device to apply staged session"); @@ -120,7 +118,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported()); - final File apexFile = mTestUtils.getTestFile(SHIM_V2); + final File apexFile = mHostUtils.getTestFile(SHIM_V2); final String output = getDevice().executeAdbCommand("install", "--staged", apexFile.getAbsolutePath()); assertThat(output).contains("Reboot device to apply staged session"); @@ -135,7 +133,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported()); - final File apexFile = mTestUtils.getTestFile(SHIM_V2); + final File apexFile = mHostUtils.getTestFile(SHIM_V2); final String output = getDevice().executeAdbCommand("install", "--staged", "--staged-ready-timeout", "0", apexFile.getAbsolutePath()); assertThat(output).doesNotContain("Reboot device to apply staged session"); @@ -151,7 +149,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported()); - final File apexFile = mTestUtils.getTestFile(SHIM_V2); + final File apexFile = mHostUtils.getTestFile(SHIM_V2); String output = getDevice().executeAdbCommand("install", "--staged", "--enable-rollback", apexFile.getAbsolutePath()); assertThat(output).contains("Reboot device to apply staged session"); @@ -168,8 +166,8 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported()); - final File apexFile = mTestUtils.getTestFile(SHIM_V2); - final File apkFile = mTestUtils.getTestFile(APK_A); + final File apexFile = mHostUtils.getTestFile(SHIM_V2); + final File apkFile = mHostUtils.getTestFile(APK_A); final String output = getDevice().executeAdbCommand("install-multi-package", apexFile.getAbsolutePath(), apkFile.getAbsolutePath()); assertThat(output).contains("Created parent session"); |