diff options
| author | Kenny Root <kroot@google.com> | 2014-04-30 17:15:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 17:15:58 +0000 |
| commit | ddc91700a5bed8e2b7214d6ca1e317929e378bc7 (patch) | |
| tree | 6515c77b68d47df156bdc7ee6368f934a881cad7 /luni | |
| parent | 4bbd5d45bffa91f41136709ed6ce45c56192711c (diff) | |
| parent | 0a0379d45726c4cac1505167095d763068f900ae (diff) | |
| download | libcore-ddc91700a5bed8e2b7214d6ca1e317929e378bc7.zip libcore-ddc91700a5bed8e2b7214d6ca1e317929e378bc7.tar.gz libcore-ddc91700a5bed8e2b7214d6ca1e317929e378bc7.tar.bz2 | |
am 0a0379d4: am 297a7de2: am 183efbb4: am 4629f94a: am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev
* commit '0a0379d45726c4cac1505167095d763068f900ae':
JarFile: make test chain 3 long
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java index 7b39706..0281d02 100644 --- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java +++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java @@ -30,6 +30,7 @@ import java.io.InputStream; import java.net.URL; import java.security.Permission; import java.security.cert.Certificate; +import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Enumeration; import java.util.Vector; @@ -663,25 +664,36 @@ public class JarFileTest extends TestCase { public void testJarFile_Signed_ValidChain_NoCheck() throws Exception { Certificate[] certs = getSignedJarCerts(VALID_CHAIN_JAR, false); assertNotNull(certs); - assertEquals(Arrays.deepToString(certs), 2, certs.length); + assertEquals(Arrays.deepToString(certs), 3, certs.length); + assertEquals("CN=fake-chain", ((X509Certificate) certs[0]).getSubjectDN().toString()); + assertEquals("CN=intermediate1", ((X509Certificate) certs[1]).getSubjectDN().toString()); + assertEquals("CN=root1", ((X509Certificate) certs[2]).getSubjectDN().toString()); } public void testJarFile_Signed_ValidChain_Check() throws Exception { Certificate[] certs = getSignedJarCerts(VALID_CHAIN_JAR, true); assertNotNull(certs); - assertEquals(Arrays.deepToString(certs), 2, certs.length); + assertEquals(Arrays.deepToString(certs), 3, certs.length); + assertEquals("CN=fake-chain", ((X509Certificate) certs[0]).getSubjectDN().toString()); + assertEquals("CN=intermediate1", ((X509Certificate) certs[1]).getSubjectDN().toString()); + assertEquals("CN=root1", ((X509Certificate) certs[2]).getSubjectDN().toString()); } public void testJarFile_Signed_InvalidChain_NoCheck() throws Exception { Certificate[] certs = getSignedJarCerts(INVALID_CHAIN_JAR, false); assertNotNull(certs); - assertEquals(Arrays.deepToString(certs), 2, certs.length); + assertEquals(Arrays.deepToString(certs), 3, certs.length); + assertEquals("CN=fake-chain", ((X509Certificate) certs[0]).getSubjectDN().toString()); + assertEquals("CN=intermediate1", ((X509Certificate) certs[1]).getSubjectDN().toString()); + assertEquals("CN=root1", ((X509Certificate) certs[2]).getSubjectDN().toString()); } public void testJarFile_Signed_InvalidChain_Check() throws Exception { Certificate[] certs = getSignedJarCerts(INVALID_CHAIN_JAR, true); assertNotNull(certs); - assertEquals(Arrays.deepToString(certs), 1, certs.length); + assertEquals(Arrays.deepToString(certs), 2, certs.length); + assertEquals("CN=fake-chain", ((X509Certificate) certs[0]).getSubjectDN().toString()); + assertEquals("CN=intermediate1", ((X509Certificate) certs[1]).getSubjectDN().toString()); } /* |