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 2015/12/21 11:01:15 UTC
svn commit: r1721115 - in
/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test:
dom/algorithms/ stax/ stax/encryption/ stax/signature/ stax/transformer/
Author: coheigea
Date: Mon Dec 21 10:01:14 2015
New Revision: 1721115
URL: http://svn.apache.org/viewvc?rev=1721115&view=rev
Log:
Some test PMD work
Modified:
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/stax/IVSplittingOutputStreamTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.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/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.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/PhaosTest.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
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -63,11 +63,11 @@ public class SymmetricEncryptionAlgorith
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java Mon Dec 21 10:01:14 2015
@@ -33,7 +33,7 @@ import java.io.ByteArrayOutputStream;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class IVSplittingOutputStreamTest extends org.junit.Assert {
+public class IVSplittingOutputStreamTest extends Assert {
private final String testString = "Within this class we test if the IVSplittingOutputStream works correctly under different conditions";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java Mon Dec 21 10:01:14 2015
@@ -39,7 +39,7 @@ import java.util.Set;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class InputProcessorChainTest extends org.junit.Assert {
+public class InputProcessorChainTest extends Assert {
@Before
public void setUp() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java Mon Dec 21 10:01:14 2015
@@ -37,7 +37,7 @@ import java.util.Set;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class OutputProcessorChainTest extends org.junit.Assert {
+public class OutputProcessorChainTest extends Assert {
@Before
public void setUp() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java Mon Dec 21 10:01:14 2015
@@ -29,7 +29,7 @@ import java.io.ByteArrayOutputStream;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class TrimmerOutputStreamTest extends org.junit.Assert {
+public class TrimmerOutputStreamTest extends Assert {
private final String testString = "Within this class we test if the TrimmerOutputStream works correctly under different conditions";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java Mon Dec 21 10:01:14 2015
@@ -35,7 +35,7 @@ import java.util.List;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class UncategorizedTest extends org.junit.Assert {
+public class UncategorizedTest extends Assert {
@Test
public void testConfigurationLoadFromUrl() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java Mon Dec 21 10:01:14 2015
@@ -36,7 +36,7 @@ import java.util.Deque;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class XMLSecurityEventReaderTest extends org.junit.Assert {
+public class XMLSecurityEventReaderTest extends Assert {
@Test
public void testConformness() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java Mon Dec 21 10:01:14 2015
@@ -38,7 +38,7 @@ import java.io.StringWriter;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class XMLSecurityEventWriterTest extends org.junit.Assert {
+public class XMLSecurityEventWriterTest extends Assert {
@Test
public void testConformness() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java Mon Dec 21 10:01:14 2015
@@ -51,7 +51,7 @@ import java.util.Set;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class XMLSecurityStreamReaderTest extends org.junit.Assert {
+public class XMLSecurityStreamReaderTest extends Assert {
@Before
public void setUp() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java Mon Dec 21 10:01:14 2015
@@ -44,7 +44,7 @@ import java.util.*;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class XMLSecurityStreamWriterTest extends org.junit.Assert {
+public class XMLSecurityStreamWriterTest extends Assert {
@Before
public void setUp() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java Mon Dec 21 10:01:14 2015
@@ -81,7 +81,7 @@ import org.w3c.dom.*;
* @author $Author: coheigea $
* @version $Revision: 1236690 $ $Date: 2012-01-27 14:07:10 +0000 (Fri, 27 Jan 2012) $
*/
-public class DecryptionTest extends org.junit.Assert {
+public class DecryptionTest extends Assert {
private XMLInputFactory xmlInputFactory;
private TransformerFactory transformerFactory = TransformerFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java Mon Dec 21 10:01:14 2015
@@ -67,7 +67,7 @@ import org.w3c.dom.NodeList;
* @author $Author: coheigea $
* @version $Revision: 1236690 $ $Date: 2012-01-27 14:07:10 +0000 (Fri, 27 Jan 2012) $
*/
-public class EncryptionCreationTest extends org.junit.Assert {
+public class EncryptionCreationTest extends Assert {
private XMLInputFactory xmlInputFactory;
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -59,7 +59,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various KeyWrap Encryption algorithms are working
*/
-public class KeyWrapEncryptionCreationTest extends org.junit.Assert {
+public class KeyWrapEncryptionCreationTest extends Assert {
private XMLInputFactory xmlInputFactory;
private KeyPair rsaKeyPair;
@@ -81,11 +81,11 @@ public class KeyWrapEncryptionCreationTe
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -65,7 +65,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various KeyWrap Decryption algorithms are working
*/
-public class KeyWrapEncryptionVerificationTest extends org.junit.Assert {
+public class KeyWrapEncryptionVerificationTest extends Assert {
private boolean bcInstalled;
private XMLInputFactory xmlInputFactory;
@@ -88,11 +88,11 @@ public class KeyWrapEncryptionVerificati
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -54,7 +54,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various Symmetric Encryption algorithms are working
*/
-public class SymmetricEncryptionCreationTest extends org.junit.Assert {
+public class SymmetricEncryptionCreationTest extends Assert {
private XMLInputFactory xmlInputFactory;
private boolean bcInstalled;
@@ -75,11 +75,11 @@ public class SymmetricEncryptionCreation
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -64,7 +64,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various Symmetric Encryption algorithms are working
*/
-public class SymmetricEncryptionVerificationTest extends org.junit.Assert {
+public class SymmetricEncryptionVerificationTest extends Assert {
private boolean bcInstalled;
private XMLInputFactory xmlInputFactory;
@@ -86,11 +86,11 @@ public class SymmetricEncryptionVerifica
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Mon Dec 21 10:01:14 2015
@@ -28,7 +28,6 @@ import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.Provider;
import java.security.Security;
-import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.HashMap;
@@ -78,7 +77,7 @@ import org.w3c.dom.NodeList;
* @author $Author: $
* @version $Revision: $ $Date: $
*/
-public class XMLEncryption11Test extends org.junit.Assert {
+public class XMLEncryption11Test extends Assert {
private String cardNumber;
private int nodeCount = 0;
@@ -98,11 +97,11 @@ public class XMLEncryption11Test extends
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
}
}
@@ -134,15 +133,13 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
String filename = "org/w3c/www/interop/xmlenc-core-11/cipherText__RSA-2048__aes128-gcm__rsa-oaep-mgf1p.xml";
- Document dd = decryptElement(filename, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(filename, rsaKey);
checkDecryptedDoc(dd, true);
}
@@ -155,8 +152,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -179,7 +174,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(ed.getFirstChild(), System.out);
// Perform decryption
- Document dd = decryptElement(ed, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(ed, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -193,8 +188,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -202,7 +195,7 @@ public class XMLEncryption11Test extends
// Perform encryption
String filename = "org/w3c/www/interop/xmlenc-core-11/cipherText__RSA-3072__aes192-gcm__rsa-oaep-mgf1p__Sha256.xml";
- Document dd = decryptElement(filename, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(filename, rsaKey);
checkDecryptedDoc(dd, true);
}
@@ -215,8 +208,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -241,7 +232,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(ed.getFirstChild(), System.out);
// Perform decryption
- Document dd = decryptElement(ed, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(ed, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -255,15 +246,13 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
String filename = "org/w3c/www/interop/xmlenc-core-11/cipherText__RSA-3072__aes256-gcm__rsa-oaep__Sha384-MGF_Sha1.xml";
- Document dd = decryptElement(filename, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(filename, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -277,8 +266,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -303,7 +290,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(ed.getFirstChild(), System.out);
// Perform decryption
- Document dd = decryptElement(ed, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(ed, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -317,15 +304,13 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
String filename = "org/w3c/www/interop/xmlenc-core-11/cipherText__RSA-4096__aes256-gcm__rsa-oaep__Sha512-MGF_Sha1_PSource.xml";
- Document dd = decryptElement(filename, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(filename, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -340,8 +325,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -366,7 +349,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(ed.getFirstChild(), System.out);
// Perform decryption
- Document dd = decryptElement(ed, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(ed, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -381,8 +364,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -407,7 +388,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(ed.getFirstChild(), System.out);
// Perform decryption
- Document dd = decryptElement(ed, rsaKey, (X509Certificate) cert);
+ Document dd = decryptElement(ed, rsaKey);
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
}
@@ -423,8 +404,6 @@ public class XMLEncryption11Test extends
KeyStore keyStore = KeyStore.getInstance("jks");
keyStore.load(this.getClass().getClassLoader().getResourceAsStream(keystore), "passwd".toCharArray());
- Certificate cert = keyStore.getCertificate("importkey");
-
KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry)
keyStore.getEntry("importkey", new KeyStore.PasswordProtection("passwd".toCharArray()));
PrivateKey rsaKey = pkEntry.getPrivateKey();
@@ -456,7 +435,7 @@ public class XMLEncryption11Test extends
// Perform decryption
try {
- decryptElementStAX(ed, rsaKey, (X509Certificate) cert);
+ decryptElementStAX(ed, rsaKey);
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof IOException);
@@ -472,11 +451,11 @@ public class XMLEncryption11Test extends
* Take a key, encryption type and a file, find an encrypted element
* decrypt it and return the resulting document
*/
- private Document decryptElement(String filename, Key rsaKey, X509Certificate rsaCert) throws Exception {
+ private Document decryptElement(String filename, Key rsaKey) throws Exception {
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.parse(this.getClass().getClassLoader().getResourceAsStream(filename));
- return decryptElement(doc, rsaKey, rsaCert);
+ return decryptElement(doc, rsaKey);
}
/**
@@ -485,16 +464,16 @@ public class XMLEncryption11Test extends
* Take a key, encryption type and a document, find an encrypted element
* decrypt it and return the resulting document
*/
- private Document decryptElement(Document doc, Key rsaKey, X509Certificate rsaCert) throws Exception {
+ private Document decryptElement(Document doc, Key rsaKey) throws Exception {
Document clonedDocument = (Document) doc.cloneNode(true);
- decryptElementDOM(doc, rsaKey, rsaCert);
- return decryptElementStAX(clonedDocument, rsaKey, rsaCert);
+ decryptElementDOM(doc, rsaKey);
+ return decryptElementStAX(clonedDocument, rsaKey);
}
/**
* Decrypt using StAX API
*/
- private Document decryptElementStAX(Document doc, Key rsaKey, X509Certificate rsaCert) throws Exception {
+ private Document decryptElementStAX(Document doc, Key rsaKey) throws Exception {
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(rsaKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -512,7 +491,7 @@ public class XMLEncryption11Test extends
/**
* Decrypt using DOM API
*/
- private Document decryptElementDOM(Document doc, Key rsaKey, X509Certificate rsaCert) throws Exception {
+ private Document decryptElementDOM(Document doc, Key rsaKey) throws Exception {
// Create the XMLCipher element
XMLCipher cipher = XMLCipher.getInstance();
@@ -670,15 +649,14 @@ public class XMLEncryption11Test extends
private void checkDecryptedDoc(Document d, boolean doNodeCheck) throws Exception {
String cc = retrieveCCNumber(d);
- assertTrue(cc, ((cc != null) && (cc.equals(cardNumber))));
+ assertTrue(cc, cc != null && cc.equals(cardNumber));
// Test cc numbers
if (doNodeCheck) {
int myNodeCount = countNodes(d);
assertTrue(
- "Node count mismatches",
- ((myNodeCount > 0) && myNodeCount == nodeCount)
+ "Node count mismatches", myNodeCount > 0 && myNodeCount == nodeCount
);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureCreationTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureCreationTest.java Mon Dec 21 10:01:14 2015
@@ -43,7 +43,7 @@ import org.w3c.dom.Element;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class AbstractSignatureCreationTest extends org.junit.Assert {
+public class AbstractSignatureCreationTest extends Assert {
protected static String BASEDIR;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java Mon Dec 21 10:01:14 2015
@@ -53,7 +53,7 @@ import java.util.UUID;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class AbstractSignatureVerificationTest extends org.junit.Assert {
+public class AbstractSignatureVerificationTest extends Assert {
protected static String BASEDIR;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Mon Dec 21 10:01:14 2015
@@ -76,7 +76,7 @@ import org.w3c.dom.Document;
* from Baltimore using KeyTools XML. These test vectors are located in the directory
* <CODE>data/ie/baltimore/merlin-examples/</CODE>.
*/
-public class BaltimoreTest extends org.junit.Assert {
+public class BaltimoreTest extends Assert {
// Define the Keys
private static final String DSA_Y_15 =
@@ -1532,7 +1532,7 @@ public class BaltimoreTest extends org.j
Key key,
SecurityTokenConstants.KeyIdentifier keyIdentifier
) throws XMLSecurityException {
- if (SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) {
+ if (SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) { //NOPMD
} else if (SecurityTokenConstants.KeyIdentifier_NoKeyInfo.equals(keyIdentifier)) {
DefaultTokenSecurityEvent tokenEvent =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Mon Dec 21 10:01:14 2015
@@ -70,7 +70,7 @@ import org.w3c.dom.Document;
* XML Signature implementation. Thanks to Gregor Karlinger who provided these
* test vectors. They are located in the directory <CODE>data/at/iaik/ixsil/</CODE>.
*/
-public class IAIKTest extends org.junit.Assert {
+public class IAIKTest extends Assert {
// Define the Keys
private static final String DSA_Y =
@@ -365,7 +365,7 @@ public class IAIKTest extends org.junit.
Key key,
SecurityTokenConstants.KeyIdentifier keyIdentifier
) throws XMLSecurityException {
- if (SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) {
+ if (SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) { //NOPMD
} else if (SecurityTokenConstants.KeyIdentifier_NoKeyInfo.equals(keyIdentifier)) {
DefaultTokenSecurityEvent tokenEvent =
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -62,11 +62,11 @@ public class PKSignatureCreationTest ext
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -75,11 +75,11 @@ public class PKSignatureVerificationTest
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java Mon Dec 21 10:01:14 2015
@@ -55,7 +55,7 @@ import java.net.Proxy;
* This is a testcase to validate all "phaos-xmldsig-three"
* testcases from Phaos
*/
-public class PhaosTest extends org.junit.Assert {
+public class PhaosTest extends Assert {
private XMLInputFactory xmlInputFactory;
private TransformerFactory transformerFactory = TransformerFactory.newInstance();
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -64,11 +64,11 @@ public class SignatureDigestCreationTest
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -76,11 +76,11 @@ public class SignatureDigestVerification
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -60,11 +60,11 @@ public class SignatureHMACCreationTest e
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
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=1721115&r1=1721114&r2=1721115&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 Mon Dec 21 10:01:14 2015
@@ -74,11 +74,11 @@ public class SignatureHMACVerificationTe
try {
Class<?> c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
cons = c.getConstructor(new Class[] {});
- } catch (Exception e) {
+ } catch (Exception e) { //NOPMD
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java Mon Dec 21 10:01:14 2015
@@ -52,7 +52,7 @@ import org.w3c.dom.Document;
* org.apache.xml.security.samples.signature.CreateEnvelopingSignature</code>
* </p>
*/
-public class UnknownAlgoSignatureTest extends org.junit.Assert {
+public class UnknownAlgoSignatureTest extends Assert {
private XMLInputFactory xmlInputFactory;
private TransformerFactory transformerFactory = TransformerFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java Mon Dec 21 10:01:14 2015
@@ -47,7 +47,7 @@ import java.util.Map;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class TransformBase64DecodeTest extends org.junit.Assert {
+public class TransformBase64DecodeTest extends Assert {
private XMLInputFactory xmlInputFactory;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java Mon Dec 21 10:01:14 2015
@@ -44,7 +44,7 @@ import java.util.Map;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class TransformCanonicalizerTest extends org.junit.Assert {
+public class TransformCanonicalizerTest extends Assert {
private XMLInputFactory xmlInputFactory;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java Mon Dec 21 10:01:14 2015
@@ -46,7 +46,7 @@ import java.util.Map;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class TransformEnvelopedSignatureTest extends org.junit.Assert {
+public class TransformEnvelopedSignatureTest extends Assert {
private XMLInputFactory xmlInputFactory;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java?rev=1721115&r1=1721114&r2=1721115&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java Mon Dec 21 10:01:14 2015
@@ -48,7 +48,7 @@ import java.util.Map;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class TransformIdentityTest extends org.junit.Assert {
+public class TransformIdentityTest extends Assert {
private XMLInputFactory xmlInputFactory;