Switch placeholder app in test to another
I'm removing ApkVerityTestApp soon, so switch the placeholder app here
to another (instead of maintaining our own copy) from
frameworks/base/tests/FeatureSplit/.
Bug: 277916185
Test: atest BinaryTransparencyHostTest
Change-Id: Iac0a9bc52221f626fe0eeeadcfebc3ad96d356a3
diff --git a/tests/BinaryTransparencyHostTest/Android.bp b/tests/BinaryTransparencyHostTest/Android.bp
index dc6bdff..615990f 100644
--- a/tests/BinaryTransparencyHostTest/Android.bp
+++ b/tests/BinaryTransparencyHostTest/Android.bp
@@ -35,6 +35,8 @@
data: [
":BinaryTransparencyTestApp",
":EasterEgg",
+ ":FeatureSplitBase",
+ ":FeatureSplit1",
":com.android.apex.cts.shim.v2_rebootless_prebuilt",
],
test_suites: [
diff --git a/tests/BinaryTransparencyHostTest/src/android/transparency/test/BinaryTransparencyHostTest.java b/tests/BinaryTransparencyHostTest/src/android/transparency/test/BinaryTransparencyHostTest.java
index 346622f..6e5f08a 100644
--- a/tests/BinaryTransparencyHostTest/src/android/transparency/test/BinaryTransparencyHostTest.java
+++ b/tests/BinaryTransparencyHostTest/src/android/transparency/test/BinaryTransparencyHostTest.java
@@ -91,20 +91,20 @@
public void testCollectAllSilentInstalledMbaInfo() throws Exception {
try {
new InstallMultiple()
- .addFile("ApkVerityTestApp.apk")
- .addFile("ApkVerityTestAppSplit.apk")
+ .addFile("FeatureSplitBase.apk")
+ .addFile("FeatureSplit1.apk")
.run();
updatePreloadApp();
- assertNotNull(getDevice().getAppPackageInfo("com.android.apkverity"));
+ assertNotNull(getDevice().getAppPackageInfo("com.android.test.split.feature"));
assertNotNull(getDevice().getAppPackageInfo("com.android.egg"));
assertTrue(getDevice().setProperty("debug.transparency.bg-install-apps",
- "com.android.apkverity,com.android.egg"));
+ "com.android.test.split.feature,com.android.egg"));
runDeviceTest("testCollectAllSilentInstalledMbaInfo");
} finally {
// No need to wait until job complete, since we can't verifying very meaningfully.
cancelPendingJob();
- uninstallPackage("com.android.apkverity");
+ uninstallPackage("com.android.test.split.feature");
uninstallPackage("com.android.egg");
}
}
diff --git a/tests/BinaryTransparencyHostTest/test-app/src/android/transparency/test/app/BinaryTransparencyTest.java b/tests/BinaryTransparencyHostTest/test-app/src/android/transparency/test/app/BinaryTransparencyTest.java
index c087a85..2bc056e 100644
--- a/tests/BinaryTransparencyHostTest/test-app/src/android/transparency/test/app/BinaryTransparencyTest.java
+++ b/tests/BinaryTransparencyHostTest/test-app/src/android/transparency/test/app/BinaryTransparencyTest.java
@@ -121,7 +121,7 @@
// Verify
assertThat(appInfoList).isNotEmpty(); // because we just installed from the host side
- var expectedAppNames = Set.of("com.android.apkverity", "com.android.egg");
+ var expectedAppNames = Set.of("com.android.test.split.feature", "com.android.egg");
var actualAppNames = appInfoList.stream().map((appInfo) -> appInfo.packageName)
.collect(Collectors.toList());
assertThat(actualAppNames).containsAtLeastElementsIn(expectedAppNames);
@@ -141,6 +141,6 @@
}
}
}
- assertThat(actualSplitNames).containsExactly("feature_x"); // Name of ApkVerityTestAppSplit
+ assertThat(actualSplitNames).containsExactly("feature1"); // Name of FeatureSplit1
}
}