aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2016-11-09 11:13:47 -0800
committerTina Zhou <tinazh@google.com>2016-12-07 01:02:20 +0000
commit06673ab2301c7d2c83b1fea2f03c73326fe824bd (patch)
treed3cf1e1851750e6554df9c10c88bd9c4bdcb1e3c
parentf1bdb7f572b1e1cb024b65961ecf9b3ec18b1dff (diff)
downloadlibcore-06673ab2301c7d2c83b1fea2f03c73326fe824bd.tar.gz
CertificateTest: explicitly set validity check dateandroid-cts_7.1_r1android-cts-7.1_r1
Since this test uses pre-generated certificates, they will expire eventually given enough time. Instead of regenerating them, just set the date in the PKIXParameters to compare their validity against. (cherry picked from commit 4412830e6a850acf830fda4dbdc3e5da7950c87b) Test: vogar --mode host --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-support-hostx_intermediates/classes.jack --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-hostdex_intermediates/classes.jack libcore/luni/src/test/java/tests/targets/security/cert/CertificateTest.java Bug: 32756119 Bug: 32767302 Change-Id: Id48ecf289277ae9d98642b15aaa17c126bdc43e9 (cherry picked from commit 3fdd10e67cb7b145a148c64941f9bb55dca48e11)
-rw-r--r--luni/src/test/java/tests/targets/security/cert/CertificateTest.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/luni/src/test/java/tests/targets/security/cert/CertificateTest.java b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
index 8044f4f016c..adfe275f2db 100644
--- a/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
@@ -30,6 +30,7 @@ import java.security.cert.PKIXCertPathValidatorResult;
import java.security.cert.PKIXParameters;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
import junit.framework.TestCase;
import libcore.java.security.StandardNames;
@@ -737,6 +738,15 @@ public class CertificateTest extends TestCase {
PKIXParameters params;
params = new PKIXParameters(keyStore);
params.setRevocationEnabled(false);
+
+ // All the tests are using pre-generated certificates with set expirations.
+ // In order to avoid the test failing when the certificates expire,
+ // explicitly set the time to check their validity against.
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(2016, Calendar.JANUARY, 1);
+ params.setDate(calendar.getTime());
+
return params;
}
}