diff options
Diffstat (limited to 'src/test/java/com/android/apksig/SigningCertificateLineageTest.java')
-rw-r--r-- | src/test/java/com/android/apksig/SigningCertificateLineageTest.java | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/test/java/com/android/apksig/SigningCertificateLineageTest.java b/src/test/java/com/android/apksig/SigningCertificateLineageTest.java index 07a48f1..d5dc71d 100644 --- a/src/test/java/com/android/apksig/SigningCertificateLineageTest.java +++ b/src/test/java/com/android/apksig/SigningCertificateLineageTest.java @@ -397,21 +397,6 @@ public class SigningCertificateLineageTest { assertLineageContainsExpectedSigners(lineageFromApk, expectedSigners); } - @Test - public void testLineageFromAPKWithV31BlockContainsExpectedSigners() throws Exception { - SignerConfig firstSigner = getSignerConfigFromResources( - FIRST_RSA_2048_SIGNER_RESOURCE_NAME); - SignerConfig secondSigner = getSignerConfigFromResources( - SECOND_RSA_2048_SIGNER_RESOURCE_NAME); - List<SignerConfig> expectedSigners = Arrays.asList(firstSigner, secondSigner); - DataSource apkDataSource = Resources.toDataSource(getClass(), - "v31-rsa-2048_2-tgt-34-1-tgt-28.apk"); - SigningCertificateLineage lineageFromApk = SigningCertificateLineage.readFromApkDataSource( - apkDataSource); - assertLineageContainsExpectedSigners(lineageFromApk, expectedSigners); - - } - @Test(expected = ApkFormatException.class) public void testLineageFromAPKWithInvalidZipCDSizeFails() throws Exception { // This test verifies that attempting to read the lineage from an APK where the zip @@ -550,20 +535,7 @@ public class SigningCertificateLineageTest { return lineage.spawnDescendant(oldSignerConfig, newSignerConfig); } - /** - * Asserts the provided {@code lineage} contains the {@code expectedSigners} from the test's - * resources. - */ - static void assertLineageContainsExpectedSigners(SigningCertificateLineage lineage, - String... expectedSigners) throws Exception { - List<SignerConfig> signers = new ArrayList<>(); - for (String expectedSigner : expectedSigners) { - signers.add(getSignerConfigFromResources(expectedSigner)); - } - assertLineageContainsExpectedSigners(lineage, signers); - } - - private static void assertLineageContainsExpectedSigners(SigningCertificateLineage lineage, + private void assertLineageContainsExpectedSigners(SigningCertificateLineage lineage, List<SignerConfig> signers) { assertEquals("The lineage does not contain the expected number of signers", signers.size(), lineage.size()); |