From 679ee7cbe7f5b2d08b7035580dd57084a41fe77f Mon Sep 17 00:00:00 2001 From: Adam Vartanian Date: Fri, 27 Jul 2018 11:44:06 +0100 Subject: [PATCH] CTS test for SslCertificate.getX509Certificate Bug: 111696337 Bug: 36984840 Test: cts -m CtsNetTestCases -t android.net.http Change-Id: I778a18fd3636efc1e60d61e6d2b78685635c07f8 --- .../android/net/http/cts/SslCertificateTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/cts/net/src/android/net/http/cts/SslCertificateTest.java b/tests/cts/net/src/android/net/http/cts/SslCertificateTest.java index 70ae496356..95f415c58c 100644 --- a/tests/cts/net/src/android/net/http/cts/SslCertificateTest.java +++ b/tests/cts/net/src/android/net/http/cts/SslCertificateTest.java @@ -230,6 +230,19 @@ public class SslCertificateTest extends TestCase { final String EXPECTED = "Issued to: c=ccc,o=testOName,ou=testUName,cn=testCName;\n" + "Issued by: e=aeei,c=adb,o=testOName,ou=testUName,cn=testCName;\n"; assertEquals(EXPECTED, ssl.toString()); + assertNull(ssl.getX509Certificate()); } + public void testGetX509Certificate() { + final String TO = "c=ccc,o=testOName,ou=testUName,cn=testCName"; + final String BY = "e=aeei,c=adb,o=testOName,ou=testUName,cn=testCName"; + Date validNotBefore = new Date(System.currentTimeMillis() - 1000); + Date validNotAfter = new Date(System.currentTimeMillis()); + SslCertificate ssl = new SslCertificate(TO, BY, validNotBefore, validNotAfter); + assertNull(ssl.getX509Certificate()); + + X509Certificate cert = new MockX509Certificate(); + ssl = new SslCertificate(cert); + assertSame(cert, ssl.getX509Certificate()); + } }