Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dependency on ModuleTestUtils"

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-03 14:58:46 +00:00
committed by Gerrit Code Review
parent f5d8e97da6 3a2612c9d2
commit b8fca94cfe
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/StagedInstallTest/Android.bp
View File

@@ -27,7 +27,6 @@ java_test_host {
static_libs: [ static_libs: [
"testng", "testng",
"compatibility-tradefed", "compatibility-tradefed",
"module_test_util",
"frameworks-base-hostutils", "frameworks-base-hostutils",
"cts-install-lib-host", "cts-install-lib-host",
], ],

14
tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java
View File

@@ -27,7 +27,6 @@ import android.cts.install.lib.host.InstallUtilsHost;
import com.android.ddmlib.Log; import com.android.ddmlib.Log;
import com.android.tests.rollback.host.AbandonSessionsRule; import com.android.tests.rollback.host.AbandonSessionsRule;
import com.android.tests.util.ModuleTestUtils;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.util.ProcessInfo; import com.android.tradefed.util.ProcessInfo;
@@ -52,7 +51,6 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
private static final String SHIM_V2 = "com.android.apex.cts.shim.v2.apex"; private static final String SHIM_V2 = "com.android.apex.cts.shim.v2.apex";
private static final String APK_A = "TestAppAv1.apk"; private static final String APK_A = "TestAppAv1.apk";
private final ModuleTestUtils mTestUtils = new ModuleTestUtils(this);
private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this); private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this);
/** /**
@@ -101,7 +99,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assumeTrue("Device does not support updating APEX", assumeTrue("Device does not support updating APEX",
mHostUtils.isApexUpdateSupported()); mHostUtils.isApexUpdateSupported());
final File apexFile = mTestUtils.getTestFile(SHIM_V2); final File apexFile = mHostUtils.getTestFile(SHIM_V2);
final String output = getDevice().executeAdbCommand("install", "--staged", final String output = getDevice().executeAdbCommand("install", "--staged",
"--staged-ready-timeout", "60000", apexFile.getAbsolutePath()); "--staged-ready-timeout", "60000", apexFile.getAbsolutePath());
assertThat(output).contains("Reboot device to apply staged session"); assertThat(output).contains("Reboot device to apply staged session");
@@ -116,7 +114,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assumeTrue("Device does not support updating APEX", assumeTrue("Device does not support updating APEX",
mHostUtils.isApexUpdateSupported()); mHostUtils.isApexUpdateSupported());
final File apexFile = mTestUtils.getTestFile(SHIM_V2); final File apexFile = mHostUtils.getTestFile(SHIM_V2);
final String output = getDevice().executeAdbCommand("install", "--staged", final String output = getDevice().executeAdbCommand("install", "--staged",
apexFile.getAbsolutePath()); apexFile.getAbsolutePath());
assertThat(output).contains("Reboot device to apply staged session"); assertThat(output).contains("Reboot device to apply staged session");
@@ -131,7 +129,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assumeTrue("Device does not support updating APEX", assumeTrue("Device does not support updating APEX",
mHostUtils.isApexUpdateSupported()); mHostUtils.isApexUpdateSupported());
final File apexFile = mTestUtils.getTestFile(SHIM_V2); final File apexFile = mHostUtils.getTestFile(SHIM_V2);
final String output = getDevice().executeAdbCommand("install", "--staged", final String output = getDevice().executeAdbCommand("install", "--staged",
"--staged-ready-timeout", "0", apexFile.getAbsolutePath()); "--staged-ready-timeout", "0", apexFile.getAbsolutePath());
assertThat(output).doesNotContain("Reboot device to apply staged session"); assertThat(output).doesNotContain("Reboot device to apply staged session");
@@ -147,7 +145,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assumeTrue("Device does not support updating APEX", assumeTrue("Device does not support updating APEX",
mHostUtils.isApexUpdateSupported()); mHostUtils.isApexUpdateSupported());
final File apexFile = mTestUtils.getTestFile(SHIM_V2); final File apexFile = mHostUtils.getTestFile(SHIM_V2);
String output = getDevice().executeAdbCommand("install", "--staged", String output = getDevice().executeAdbCommand("install", "--staged",
"--enable-rollback", apexFile.getAbsolutePath()); "--enable-rollback", apexFile.getAbsolutePath());
assertThat(output).contains("Reboot device to apply staged session"); assertThat(output).contains("Reboot device to apply staged session");
@@ -164,8 +162,8 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
assumeTrue("Device does not support updating APEX", assumeTrue("Device does not support updating APEX",
mHostUtils.isApexUpdateSupported()); mHostUtils.isApexUpdateSupported());
final File apexFile = mTestUtils.getTestFile(SHIM_V2); final File apexFile = mHostUtils.getTestFile(SHIM_V2);
final File apkFile = mTestUtils.getTestFile(APK_A); final File apkFile = mHostUtils.getTestFile(APK_A);
final String output = getDevice().executeAdbCommand("install-multi-package", final String output = getDevice().executeAdbCommand("install-multi-package",
apexFile.getAbsolutePath(), apkFile.getAbsolutePath()); apexFile.getAbsolutePath(), apkFile.getAbsolutePath());
assertThat(output).contains("Created parent session"); assertThat(output).contains("Created parent session");