Skip to content

Commit 21501b2

Browse files
committed
cleared up some colliding tests
1 parent f00ed63 commit 21501b2

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

prov/src/test/java/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -532,17 +532,18 @@ private void testNoKeyUsageCRLSigner()
532532
fail("path should have failed");
533533
}
534534
catch (CertPathValidatorException e)
535-
{ e.printStackTrace();
535+
{
536536
isTrue("No CRLs found for issuer \"o=Certs 'r Us,c=XX\"".equals(e.getMessage()));
537537
}
538+
539+
System.clearProperty("org.bouncycastle.x509.allow_ca_without_crl_sign");
538540
}
539541

540542
public void performTest()
541543
throws Exception
542544
{
543-
// constraintTest();
545+
constraintTest();
544546
testNoKeyUsageCRLSigner();
545-
System.exit(0);
546547
CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
547548

548549
// initialise CertStore
@@ -663,6 +664,8 @@ public void performTest()
663664
}
664665
}
665666

667+
System.clearProperty("org.bouncycastle.x509.allow_ca_without_crl_sign");
668+
666669
checkCircProcessing();
667670
checkPolicyProcessingAtDomainMatch();
668671
validateWithExtendedKeyUsage();

prov/src/test/java/org/bouncycastle/jce/provider/test/SimpleTestTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class SimpleTestTest
1111
{
1212
public void testJCE()
1313
{
14+
System.setProperty("org.bouncycastle.bks.enable_v1", "true");
1415

1516
if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null)
1617
{

0 commit comments

Comments
 (0)