Merge "Fix broken test."
diff --git a/compos/tests/java/android/compos/test/ComposKeyTestCase.java b/compos/tests/java/android/compos/test/ComposKeyTestCase.java
index d59d3d9..49235fe 100644
--- a/compos/tests/java/android/compos/test/ComposKeyTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposKeyTestCase.java
@@ -38,13 +38,25 @@
@RunWith(DeviceJUnit4ClassRunner.class)
public final class ComposKeyTestCase extends VirtualizationTestCaseBase {
- /** Wait time for service to be ready on boot */
+ /**
+ * Wait time for service to be ready on boot
+ */
private static final int READY_LATENCY_MS = 10 * 1000; // 10 seconds
- /** Path to compos_key_cmd tool */
+ /**
+ * Path to compos_key_cmd tool
+ */
private static final String COMPOS_KEY_CMD_BIN = "/apex/com.android.compos/bin/compos_key_cmd";
- /** Config of the test VM. This is a path inside the APK. */
+ /**
+ * Path to the com.android.compos.payload APK
+ */
+ private static final String COMPOS_PAYLOAD_APK_PATH =
+ "/apex/com.android.compos/app/CompOSPayloadApp/CompOSPayloadApp.apk";
+
+ /**
+ * Config of the test VM. This is a path inside the APK.
+ */
private static final String VM_TEST_CONFIG_PATH = "assets/vm_test_config.json";
private String mCid;
@@ -134,7 +146,9 @@
getDevice(),
getBuild(),
/* apkName, no need to install */ null,
- packageName,
+ COMPOS_PAYLOAD_APK_PATH,
+ /* packageName - not needed, we know the path */ null,
+ /* extraIdSigPaths */ null,
VM_TEST_CONFIG_PATH,
/* debug */ true,
/* use default memoryMib */ 0,
diff --git a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
index 678fe84..e15f1ae 100644
--- a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
+++ b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
@@ -204,6 +204,24 @@
Optional<Integer> numCpus,
Optional<String> cpuAffinity)
throws DeviceNotAvailableException {
+ return startMicrodroid(androidDevice, buildInfo, apkName, null, packageName,
+ extraIdsigPaths, configPath, debug,
+ memoryMib, numCpus, cpuAffinity);
+ }
+
+ public static String startMicrodroid(
+ ITestDevice androidDevice,
+ IBuildInfo buildInfo,
+ String apkName,
+ String apkPath,
+ String packageName,
+ String[] extraIdsigPaths,
+ String configPath,
+ boolean debug,
+ int memoryMib,
+ Optional<Integer> numCpus,
+ Optional<String> cpuAffinity)
+ throws DeviceNotAvailableException {
CommandRunner android = new CommandRunner(androidDevice);
// Install APK if necessary
@@ -215,9 +233,11 @@
// Get the path to the installed apk. Note that
// getDevice().getAppPackageInfo(...).getCodePath() doesn't work due to the incorrect
// parsing of the "=" character. (b/190975227). So we use the `pm path` command directly.
- String apkPath = android.run("pm", "path", packageName);
- assertTrue(apkPath.startsWith("package:"));
- apkPath = apkPath.substring("package:".length());
+ if (apkPath == null) {
+ apkPath = android.run("pm", "path", packageName);
+ assertTrue(apkPath.startsWith("package:"));
+ apkPath = apkPath.substring("package:".length());
+ }
android.run("mkdir", "-p", TEST_ROOT);