Merge "[cts content tests] use v4 flag instead of prebuilt APKs" into rvc-dev
diff --git a/tests/tests/content/Android.bp b/tests/tests/content/Android.bp
index 7bb3024..a21e136 100644
--- a/tests/tests/content/Android.bp
+++ b/tests/tests/content/Android.bp
@@ -65,16 +65,6 @@
"src/**/*.java",
"BinderPermissionTestService/**/I*.aidl",
],
- data: [
- // v4 signed version of android.appsecurity.cts.tinyapp
- // TODO(b/149354175): use built APKs instead - after soong gets v4 support
- "data/v4-digest-v2.apk",
- "data/v4-digest-v2.apk.idsig",
- "data/v4-digest-v2v3.apk",
- "data/v4-digest-v2v3.apk.idsig",
- "data/v4-digest-v3.apk",
- "data/v4-digest-v3.apk.idsig",
- ],
platform_apis: true,
// Tag this module as a cts test artifact
test_suites: [
diff --git a/tests/tests/content/AndroidTest.xml b/tests/tests/content/AndroidTest.xml
index e0261b2..80986b5 100644
--- a/tests/tests/content/AndroidTest.xml
+++ b/tests/tests/content/AndroidTest.xml
@@ -56,12 +56,18 @@
<!-- Incremental installation test files -->
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
- <option name="push" value="v4-digest-v2.apk->/data/local/tmp/cts/content/v4-digest-v2.apk" />
- <option name="push" value="v4-digest-v2.apk.idsig->/data/local/tmp/cts/content/v4-digest-v2.apk.idsig" />
- <option name="push" value="v4-digest-v3.apk->/data/local/tmp/cts/content/v4-digest-v3.apk" />
- <option name="push" value="v4-digest-v3.apk.idsig->/data/local/tmp/cts/content/v4-digest-v3.apk.idsig" />
- <option name="push" value="v4-digest-v2v3.apk->/data/local/tmp/cts/content/v4-digest-v2v3.apk" />
- <option name="push" value="v4-digest-v2v3.apk.idsig->/data/local/tmp/cts/content/v4-digest-v2v3.apk.idsig" />
+ <option name="push" value="HelloWorld5.apk.idsig->/data/local/tmp/cts/content/HelloWorld5.apk.idsig" />
+ <option name="push" value="HelloWorld5_hdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_hdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld5_mdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_mdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld5_xhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_xhdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld5_xxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_xxhdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld5_xxxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld5_xxxhdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld7.apk.idsig->/data/local/tmp/cts/content/HelloWorld7.apk.idsig" />
+ <option name="push" value="HelloWorld7_hdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_hdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld7_mdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_mdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld7_xhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_xhdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld7_xxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_xxhdpi-v4.apk.idsig" />
+ <option name="push" value="HelloWorld7_xxxhdpi-v4.apk.idsig->/data/local/tmp/cts/content/HelloWorld7_xxxhdpi-v4.apk.idsig" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/tests/tests/content/HelloWorldApp/Android.bp b/tests/tests/content/HelloWorldApp/Android.bp
index 7bbe2a7..c656036 100644
--- a/tests/tests/content/HelloWorldApp/Android.bp
+++ b/tests/tests/content/HelloWorldApp/Android.bp
@@ -43,6 +43,7 @@
"vts10",
"general-tests",
],
+ v4_signature: true,
}
//-----------------------------------------------------------
@@ -57,4 +58,5 @@
"vts10",
"general-tests",
],
+ v4_signature: true,
}
diff --git a/tests/tests/content/data/v4-digest-v2.apk b/tests/tests/content/data/v4-digest-v2.apk
deleted file mode 100644
index 22b05b1..0000000
--- a/tests/tests/content/data/v4-digest-v2.apk
+++ /dev/null
Binary files differ
diff --git a/tests/tests/content/data/v4-digest-v2.apk.idsig b/tests/tests/content/data/v4-digest-v2.apk.idsig
deleted file mode 100644
index 16eaf23..0000000
--- a/tests/tests/content/data/v4-digest-v2.apk.idsig
+++ /dev/null
Binary files differ
diff --git a/tests/tests/content/data/v4-digest-v2v3.apk b/tests/tests/content/data/v4-digest-v2v3.apk
deleted file mode 100644
index 31591fa..0000000
--- a/tests/tests/content/data/v4-digest-v2v3.apk
+++ /dev/null
Binary files differ
diff --git a/tests/tests/content/data/v4-digest-v2v3.apk.idsig b/tests/tests/content/data/v4-digest-v2v3.apk.idsig
deleted file mode 100644
index dc1b378..0000000
--- a/tests/tests/content/data/v4-digest-v2v3.apk.idsig
+++ /dev/null
Binary files differ
diff --git a/tests/tests/content/data/v4-digest-v3.apk b/tests/tests/content/data/v4-digest-v3.apk
deleted file mode 100644
index 08ae9eae..0000000
--- a/tests/tests/content/data/v4-digest-v3.apk
+++ /dev/null
Binary files differ
diff --git a/tests/tests/content/data/v4-digest-v3.apk.idsig b/tests/tests/content/data/v4-digest-v3.apk.idsig
deleted file mode 100644
index e225504ef..0000000
--- a/tests/tests/content/data/v4-digest-v3.apk.idsig
+++ /dev/null
Binary files differ
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
index 216d59b..6722dda 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
@@ -47,12 +47,10 @@
@RunWith(AndroidJUnit4.class)
@AppModeFull
public class PackageManagerShellCommandIncrementalTest {
- private static final String TEST_APP_PACKAGE = "android.appsecurity.cts.tinyapp";
+ private static final String TEST_APP_PACKAGE = "com.example.helloworld";
private static final String TEST_APK_PATH = "/data/local/tmp/cts/content/";
- private static final String TEST_APK_V2 = "v4-digest-v2.apk";
- private static final String TEST_APK_V3 = "v4-digest-v3.apk";
- private static final String TEST_APK_V2_V3 = "v4-digest-v2v3.apk";
+ private static final String TEST_APK = "HelloWorld5.apk";
private static String executeShellCommand(String command) throws IOException {
final ParcelFileDescriptor stdout =
@@ -124,21 +122,10 @@
PackageManager.FEATURE_INCREMENTAL_DELIVERY));
}
+ // TODO(b/152563692): move v2/v3 tests to appsecurity
@Test
- public void testInstallWithIdSigAndV2Digest() throws Exception {
- installPackage(TEST_APK_V2);
- assertTrue(isAppInstalled(TEST_APP_PACKAGE));
- }
-
- @Test
- public void testInstallWithIdSigAndV3Digest() throws Exception {
- installPackage(TEST_APK_V3);
- assertTrue(isAppInstalled(TEST_APP_PACKAGE));
- }
-
- @Test
- public void testInstallWithIdSigAndV2V3Digest() throws Exception {
- installPackage(TEST_APK_V2_V3);
+ public void testInstallWithIdSig() throws Exception {
+ installPackage(TEST_APK);
assertTrue(isAppInstalled(TEST_APP_PACKAGE));
}
