cleared up some colliding tests

bcgit · May 1, 2024 · 21501b2 · 21501b2
1 parent f00ed63
commit 21501b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java
@@ -532,17 +532,18 @@ private void testNoKeyUsageCRLSigner()
             fail("path should have failed");
         }
         catch (CertPathValidatorException e)
-        {                                  e.printStackTrace();
+        {                   
             isTrue("No CRLs found for issuer \"o=Certs 'r Us,c=XX\"".equals(e.getMessage()));
         }
+
+        System.clearProperty("org.bouncycastle.x509.allow_ca_without_crl_sign");
     }
 
     public void performTest()
         throws Exception
     {
-//        constraintTest();
+        constraintTest();
         testNoKeyUsageCRLSigner();
-           System.exit(0);
         CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
 
         // initialise CertStore
@@ -663,6 +664,8 @@ public void performTest()
             }
         }
 
+        System.clearProperty("org.bouncycastle.x509.allow_ca_without_crl_sign");
+
         checkCircProcessing();
         checkPolicyProcessingAtDomainMatch();
         validateWithExtendedKeyUsage();

diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/SimpleTestTest.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/SimpleTestTest.java
@@ -11,6 +11,7 @@ public class SimpleTestTest
 {
     public void testJCE()
     {
+        System.setProperty("org.bouncycastle.bks.enable_v1", "true");
 
         if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null)
         {