You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2017/06/08 16:25:15 UTC
svn commit: r1798087 - in /santuario/xml-security-java/trunk/src/test/java:
javax/xml/crypto/test/dsig/ org/apache/xml/security/test/dom/algorithms/
org/apache/xml/security/test/dom/encryption/
org/apache/xml/security/test/dom/signature/ org/apache/xml...
Author: coheigea
Date: Thu Jun 8 16:25:14 2017
New Revision: 1798087
URL: http://svn.apache.org/viewvc?rev=1798087&view=rev
Log:
Using junit.Assume when checking if bouncycastle is available or not
Modified:
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java Thu Jun 8 16:25:14 2017
@@ -140,9 +140,7 @@ public class HMACSignatureAlgorithmTest
@org.junit.Test
public void testHMACRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(ripemd160, sha1, null,
TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java Thu Jun 8 16:25:14 2017
@@ -189,54 +189,42 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaRipemd160, sha1, rsaki,
rsaKeyPair.getPrivate(), kvks);
}
@org.junit.Test
public void testRSA_SHA1_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1Mgf1, sha1, rsaki,
rsaKeyPair.getPrivate(), kvks);
}
@org.junit.Test
public void testRSA_SHA224_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha224Mgf1, sha1, rsaki,
rsaKeyPair.getPrivate(), kvks);
}
@org.junit.Test
public void testRSA_SHA256_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha256Mgf1, sha1, rsaki,
rsaKeyPair.getPrivate(), kvks);
}
@org.junit.Test
public void testRSA_SHA384_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha384Mgf1, sha1, rsaki,
rsaKeyPair.getPrivate(), kvks);
}
@org.junit.Test
public void testRSA_SHA512_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha512Mgf1, sha1, rsaki,
rsaKeyPair.getPrivate(), kvks);
}
@@ -278,9 +266,7 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testECDSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
org.junit.Assume.assumeTrue(ecAlgParamsSupport && ecki != null);
test_create_signature_enveloping(ecdsaRipemd160, sha1, ecki,
ecKeyPair.getPrivate(), kvks);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java Thu Jun 8 16:25:14 2017
@@ -154,54 +154,42 @@ public class SignatureDigestMethodTest e
@org.junit.Test
public void testRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1, ripemd160, rsaki,
TestUtils.getPrivateKey("RSA"), kvks);
}
@org.junit.Test
public void testWHIRLPOOL() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1, whirlpool, rsaki,
TestUtils.getPrivateKey("RSA"), kvks);
}
@org.junit.Test
public void testSHA3_224() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1, sha3_224, rsaki,
TestUtils.getPrivateKey("RSA"), kvks);
}
@org.junit.Test
public void testSHA3_256() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1, sha3_256, rsaki,
TestUtils.getPrivateKey("RSA"), kvks);
}
@org.junit.Test
public void testSHA3_384() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1, sha3_384, rsaki,
TestUtils.getPrivateKey("RSA"), kvks);
}
@org.junit.Test
public void testSHA3_512() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(rsaSha1, sha3_512, rsaki,
TestUtils.getPrivateKey("RSA"), kvks);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java Thu Jun 8 16:25:14 2017
@@ -208,9 +208,8 @@ public class HMACSignatureAlgorithmTest
@org.junit.Test
public void testHMACRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java Thu Jun 8 16:25:14 2017
@@ -362,9 +362,8 @@ public class KeyWrapEncryptionAlgorithmT
@org.junit.Test
public void testCamellia128KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -406,9 +405,8 @@ public class KeyWrapEncryptionAlgorithmT
@org.junit.Test
public void testCamellia192KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -450,9 +448,8 @@ public class KeyWrapEncryptionAlgorithmT
@org.junit.Test
public void testCamellia256KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -494,9 +491,8 @@ public class KeyWrapEncryptionAlgorithmT
@org.junit.Test
public void testSEED128KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java Thu Jun 8 16:25:14 2017
@@ -191,9 +191,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -211,9 +210,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_SHA1_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -231,9 +229,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_SHA224_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -251,9 +248,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_SHA256_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -271,9 +267,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_SHA384_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -291,9 +286,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testRSA_SHA512_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -396,9 +390,8 @@ public class PKSignatureAlgorithmTest ex
@org.junit.Test
public void testECDSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java Thu Jun 8 16:25:14 2017
@@ -310,9 +310,8 @@ public class SymmetricEncryptionAlgorith
@org.junit.Test
public void testSEED_128() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -346,9 +345,8 @@ public class SymmetricEncryptionAlgorith
@org.junit.Test
public void testCAMELLIA_128() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -382,9 +380,8 @@ public class SymmetricEncryptionAlgorith
@org.junit.Test
public void testCAMELLIA_192() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -418,9 +415,8 @@ public class SymmetricEncryptionAlgorith
@org.junit.Test
public void testCAMELLIA_256() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Thu Jun 8 16:25:14 2017
@@ -904,9 +904,8 @@ public class XMLCipherTest extends org.j
@org.junit.Test
public void testEecryptToByteArray() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
KeyGenerator keygen = KeyGenerator.getInstance("AES");
keygen.init(128);
Key key = keygen.generateKey();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Thu Jun 8 16:25:14 2017
@@ -97,9 +97,7 @@ public class ECDSASignatureTest extends
@org.junit.Test
public void testOne() throws Exception {
- if (Security.getProvider("BC") == null) {
- return;
- }
+ org.junit.Assume.assumeTrue(Security.getProvider("BC") != null);
//
// This test fails with the IBM JDK
@@ -119,9 +117,7 @@ public class ECDSASignatureTest extends
@org.junit.Test
@org.junit.Ignore
public void testTwo() throws Exception {
- if (Security.getProvider("BC") == null) {
- return;
- }
+ org.junit.Assume.assumeTrue(Security.getProvider("BC") != null);
File file =
makeDataFile("src/test/resources/org/apache/xml/security/samples/input/ecdsaSignature.xml");
@@ -133,9 +129,7 @@ public class ECDSASignatureTest extends
@org.junit.Test
@org.junit.Ignore
public void testThree() throws Exception {
- if (Security.getProvider("BC") == null) {
- return;
- }
+ org.junit.Assume.assumeTrue(Security.getProvider("BC") != null);
File file = makeDataFile("src/test/resources/at/buergerkarte/testresp.xml");
try (InputStream is = new FileInputStream(file)) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java Thu Jun 8 16:25:14 2017
@@ -566,9 +566,8 @@ public class KeyWrapEncryptionCreationTe
@Test
public void testCamellia128KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -637,9 +636,8 @@ public class KeyWrapEncryptionCreationTe
@Test
public void testCamellia192KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -708,9 +706,8 @@ public class KeyWrapEncryptionCreationTe
@Test
public void testCamellia256KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -779,9 +776,8 @@ public class KeyWrapEncryptionCreationTe
@Test
public void testSEED128KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java Thu Jun 8 16:25:14 2017
@@ -508,9 +508,8 @@ public class KeyWrapEncryptionVerificati
@Test
public void testCamellia128KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -571,9 +570,8 @@ public class KeyWrapEncryptionVerificati
@Test
public void testCamellia192KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -634,9 +632,8 @@ public class KeyWrapEncryptionVerificati
@Test
public void testCamellia256KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -697,9 +694,8 @@ public class KeyWrapEncryptionVerificati
@Test
public void testSEED128KW() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java Thu Jun 8 16:25:14 2017
@@ -519,9 +519,8 @@ public class SymmetricEncryptionCreation
@Test
public void testSEED_128() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -582,9 +581,8 @@ public class SymmetricEncryptionCreation
@Test
public void testCAMELLIA_128() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -645,9 +643,8 @@ public class SymmetricEncryptionCreation
@Test
public void testCAMELLIA_192() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -708,9 +705,8 @@ public class SymmetricEncryptionCreation
@Test
public void testCAMELLIA_256() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java Thu Jun 8 16:25:14 2017
@@ -474,9 +474,8 @@ public class SymmetricEncryptionVerifica
@Test
public void testSEED_128() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -530,9 +529,8 @@ public class SymmetricEncryptionVerifica
@Test
public void testCAMELLIA_128() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -586,9 +584,8 @@ public class SymmetricEncryptionVerifica
@Test
public void testCAMELLIA_192() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -642,9 +639,8 @@ public class SymmetricEncryptionVerifica
@Test
public void testCAMELLIA_256() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java Thu Jun 8 16:25:14 2017
@@ -258,9 +258,8 @@ public class PKSignatureCreationTest ext
@Test
public void testRSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -304,9 +303,8 @@ public class PKSignatureCreationTest ext
@Test
public void testRSA_SHA1_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -350,9 +348,8 @@ public class PKSignatureCreationTest ext
@Test
public void testRSA_SHA224_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -396,9 +393,8 @@ public class PKSignatureCreationTest ext
@Test
public void testRSA_SHA256_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -442,9 +438,8 @@ public class PKSignatureCreationTest ext
@Test
public void testRSA_SHA384_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -488,9 +483,8 @@ public class PKSignatureCreationTest ext
@Test
public void testRSA_SHA512_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -749,9 +743,8 @@ public class PKSignatureCreationTest ext
@Test
public void testECDSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java Thu Jun 8 16:25:14 2017
@@ -263,9 +263,8 @@ public class PKSignatureVerificationTest
@Test
public void testRSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -307,9 +306,8 @@ public class PKSignatureVerificationTest
@Test
public void testRSA_SHA1_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -351,9 +349,8 @@ public class PKSignatureVerificationTest
@Test
public void testRSA_SHA224_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -395,9 +392,8 @@ public class PKSignatureVerificationTest
@Test
public void testRSA_SHA256_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -439,9 +435,8 @@ public class PKSignatureVerificationTest
@Test
public void testRSA_SHA384_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -483,9 +478,8 @@ public class PKSignatureVerificationTest
@Test
public void testRSA_SHA512_MGF1() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -732,9 +726,8 @@ public class PKSignatureVerificationTest
@Test
public void testECDSA_RIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java Thu Jun 8 16:25:14 2017
@@ -357,9 +357,8 @@ public class SignatureDigestCreationTest
@Test
public void testRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -415,9 +414,8 @@ public class SignatureDigestCreationTest
@Test
public void testWhirlpool() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -473,9 +471,8 @@ public class SignatureDigestCreationTest
@Test
public void testSHA3_224() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -531,9 +528,8 @@ public class SignatureDigestCreationTest
@Test
public void testSHA3_256() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -589,9 +585,8 @@ public class SignatureDigestCreationTest
@Test
public void testSHA3_384() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
@@ -647,9 +642,8 @@ public class SignatureDigestCreationTest
@Test
public void testSHA3_512() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java Thu Jun 8 16:25:14 2017
@@ -354,9 +354,8 @@ public class SignatureDigestVerification
@Test
public void testRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -409,9 +408,8 @@ public class SignatureDigestVerification
@Test
public void testWhirlpool() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -464,9 +462,8 @@ public class SignatureDigestVerification
@Test
public void testSHA3_224() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -519,9 +516,8 @@ public class SignatureDigestVerification
@Test
public void testSHA3_256() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -574,9 +570,8 @@ public class SignatureDigestVerification
@Test
public void testSHA3_384() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
@@ -629,9 +624,8 @@ public class SignatureDigestVerification
@Test
public void testSHA3_512() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java Thu Jun 8 16:25:14 2017
@@ -303,9 +303,8 @@ public class SignatureHMACCreationTest e
@Test
public void testRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Set up the Configuration
XMLSecurityProperties properties = new XMLSecurityProperties();
List<XMLSecurityConstants.Action> actions = new ArrayList<XMLSecurityConstants.Action>();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java?rev=1798087&r1=1798086&r2=1798087&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java Thu Jun 8 16:25:14 2017
@@ -322,9 +322,8 @@ public class SignatureHMACVerificationTe
@Test
public void testRIPEMD160() throws Exception {
- if (!bcInstalled) {
- return;
- }
+ org.junit.Assume.assumeTrue(bcInstalled);
+
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(