Use Assumptions to skip tests when BouncyCastle is not available

Author: coheigea

src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java

@@ -45,6 +45,7 @@
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -104,9 +105,10 @@ void testConstructionWithProvider() throws Exception {
         assertFalse(algorithmHash.isEmpty());
 
         Document doc = TestUtils.newDocument();
+        Provider provider = null;
         try {
             Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
-            Provider provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+            provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
 
             for (String algorithmURI : algorithmHash.keySet()) {
                 try {
@@ -120,7 +122,8 @@ void testConstructionWithProvider() throws Exception {
                 }
             }
         } catch (ReflectiveOperationException e) {
-            // BouncyCastle not installed, ignore
+            // BouncyCastle not installed, skip
+            assumeFalse(provider == null);
         }
     }
 

src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java

@@ -36,6 +36,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 class SignatureTest {
     public static final String DS_NS = "http://www.w3.org/2000/09/xmldsig#";
@@ -66,9 +67,10 @@ void testSigningVerifyingFromRebuildSignature() throws Throwable {
 
     @Test
     void testSigningVerifyingFromRebuildSignatureWithProvider() throws Throwable {
+        Provider provider = null;
         try {
             Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
-            Provider provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+            provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
 
             Document doc = getOriginalDocument();
             XMLSignature signature = signDocument(doc, provider);
@@ -81,7 +83,8 @@ void testSigningVerifyingFromRebuildSignatureWithProvider() throws Throwable {
             PublicKey pubKey = getPublicKey();
             assertTrue(signature.checkSignatureValue(pubKey));
         } catch (ReflectiveOperationException e) {
-            // BouncyCastle not installed, ignore
+            // BouncyCastle not installed, skip
+            assumeFalse(provider == null);
         }
     }
 
@@ -96,17 +99,19 @@ void testSigningVerifyingFromExistingSignature() throws Throwable {
 
     @Test
     void testSigningVerifyingFromExistingSignatureWithProvider() throws Throwable {
+        Provider provider = null;
         try {
             Class<?> bouncyCastleProviderClass = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
-            Provider provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
+            provider = (Provider)bouncyCastleProviderClass.getConstructor().newInstance();
             Document doc = getOriginalDocument();
             XMLSignature signature = signDocument(doc, provider);
             assertEquals(provider.getName(), signature.getSignedInfo().getSignatureAlgorithm().getJCEProviderName());
 
             PublicKey pubKey = getPublicKey();
             assertTrue(signature.checkSignatureValue(pubKey));
         } catch (ReflectiveOperationException e) {
-            // BouncyCastle not installed, ignore
+            // BouncyCastle not installed, skip
+            assumeFalse(provider == null);
         }
     }