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/10/10 09:14:35 UTC
svn commit: r1811650 [2/2] - in
/santuario/xml-security-java/trunk/src/test/java: javax/xml/crypto/test/
javax/xml/crypto/test/dsig/ javax/xml/crypto/test/dsig/dom/
javax/xml/crypto/test/dsig/keyinfo/
org/apache/xml/security/test/dom/algorithms/ org/ap...
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=1811650&r1=1811649&r2=1811650&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 Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.encryption;
+import static org.junit.Assert.*;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -61,7 +63,7 @@ import org.w3c.dom.NodeList;
/**
*
*/
-public class XMLCipherTest extends org.junit.Assert {
+public class XMLCipherTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLCipherTest.class);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Tue Oct 10 09:14:33 2017
@@ -53,6 +53,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import static org.junit.Assert.assertTrue;
+
/**
* This is a set of tests that use the test vectors associated with the W3C XML Encryption 1.1 specification:
*
@@ -62,7 +64,7 @@ import org.w3c.dom.Node;
*
* TODO As of now all of the KeyWrapping tests are supported, but none of the KeyAgreement tests.
*/
-public class XMLEncryption11Test extends org.junit.Assert {
+public class XMLEncryption11Test {
private static String cardNumber;
private static int nodeCount = 0;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@ package org.apache.xml.security.test.dom
import org.apache.xml.security.test.dom.utils.resolver.OfflineResolver;
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
+import static org.junit.Assert.*;
+
import java.nio.charset.StandardCharsets;
import org.apache.xml.security.signature.XMLSignatureException;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java Tue Oct 10 09:14:33 2017
@@ -20,6 +20,8 @@ package org.apache.xml.security.test.dom
import org.apache.xml.security.test.dom.utils.resolver.OfflineResolver;
+import static org.junit.Assert.*;
+
import java.nio.charset.StandardCharsets;
import org.apache.xml.security.signature.XMLSignatureException;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.interop;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import org.apache.xml.security.test.dom.utils.resolver.OfflineResolver;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java Tue Oct 10 09:14:33 2017
@@ -40,7 +40,9 @@ import org.apache.xml.security.utils.res
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-public class InteropTestBase extends org.junit.Assert {
+import static org.junit.Assert.*;
+
+public class InteropTestBase {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(InteropTestBase.class);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java Tue Oct 10 09:14:33 2017
@@ -19,6 +19,8 @@
package org.apache.xml.security.test.dom.interop;
+import static org.junit.Assert.assertTrue;
+
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java Tue Oct 10 09:14:33 2017
@@ -32,7 +32,7 @@ import org.apache.xml.security.utils.XML
* Certificate parsing test.
*
*/
-public class XMLX509CertificateTest extends org.junit.Assert {
+public class XMLX509CertificateTest {
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.keys.content.x509;
+import static org.junit.Assert.assertEquals;
+
import org.apache.xml.security.keys.content.x509.XMLX509IssuerSerial;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -26,7 +28,7 @@ import org.w3c.dom.Document;
* XMLX509IssuerSerial tests.
*
*/
-public class XMLX509IssuerSerialTest extends org.junit.Assert {
+public class XMLX509IssuerSerialTest {
private Document doc;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.keys.content.x509;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileInputStream;
import java.security.cert.CertStore;
@@ -33,7 +35,7 @@ import org.apache.xml.security.keys.cont
/**
* Test bugfix 41892: XML Security 1.4.0 does not build with IBM's JDK
*/
-public class XMLX509SKITest extends org.junit.Assert {
+public class XMLX509SKITest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.keys.keyresolver;
+import static org.junit.Assert.*;
+
import java.io.FileInputStream;
import java.math.BigInteger;
import java.security.KeyFactory;
@@ -64,7 +66,7 @@ import org.w3c.dom.Text;
/**
* KeyResolver test.
*/
-public class KeyResolverTest extends org.junit.Assert {
+public class KeyResolverTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java Tue Oct 10 09:14:33 2017
@@ -32,7 +32,7 @@ import org.w3c.dom.Document;
/**
* Some tests on attacks against the RetrievalMethodResolver.
*/
-public class RetrievalMethodResolverTest extends org.junit.Assert {
+public class RetrievalMethodResolverTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.keys.storage;
+import static org.junit.Assert.*;
+
import java.io.FileInputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
@@ -29,7 +31,7 @@ import org.apache.xml.security.keys.stor
/**
* KeyStore StorageResolver test.
*/
-public class KeyStoreResolverTest extends org.junit.Assert {
+public class KeyStoreResolverTest {
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.keys.storage;
+import static org.junit.Assert.*;
+
import java.io.FileInputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
@@ -29,7 +31,7 @@ import org.apache.xml.security.keys.stor
/**
* KeyStore StorageResolver test.
*/
-public class StorageResolverTest extends org.junit.Assert {
+public class StorageResolverTest {
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.secure_val;
+import static org.junit.Assert.*;
+
import java.io.File;
import org.apache.xml.security.signature.XMLSignature;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.secure_val;
+import static org.junit.Assert.*;
+
import java.io.File;
import org.apache.xml.security.exceptions.XMLSecurityException;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.secure_val;
+import static org.junit.Assert.*;
+
import java.io.File;
import org.apache.xml.security.signature.Manifest;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.secure_val;
+import static org.junit.Assert.assertNull;
+
import java.io.FileInputStream;
import javax.xml.parsers.DocumentBuilder;
@@ -31,7 +33,7 @@ import org.w3c.dom.Document;
* This is a test for a Retrieval Method pointing to another Retrieval Method (forbidden under
* secure validation).
*/
-public class ForbiddenRetrievalMethodTest extends org.junit.Assert {
+public class ForbiddenRetrievalMethodTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.secure_val;
+import static org.junit.Assert.*;
+
import java.io.File;
import org.apache.xml.security.signature.XMLSignature;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
@@ -54,7 +56,7 @@ import org.w3c.dom.Element;
* Tests that create signatures.
*
*/
-public class CreateSignatureTest extends org.junit.Assert {
+public class CreateSignatureTest {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(CreateSignatureTest.class);
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=1811650&r1=1811649&r2=1811650&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 Tue Oct 10 09:14:33 2017
@@ -41,11 +41,13 @@ import org.apache.xml.security.utils.Con
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests that creates and verifies ECDSA signatures.
*
*/
-public class ECDSASignatureTest extends org.junit.Assert {
+public class ECDSASignatureTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.nio.charset.StandardCharsets;
@@ -33,7 +35,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
-public class HMACOutputLengthTest extends org.junit.Assert {
+public class HMACOutputLengthTest {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java Tue Oct 10 09:14:33 2017
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
* fixed: "No installed provider supports this key" when checking a RSA
* signature against a DSA key before RSA key.
*/
-public class InvalidKeyTest extends org.junit.Assert {
+public class InvalidKeyTest {
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.assertNotNull;
+
import java.io.File;
import java.io.FileInputStream;
import java.security.PublicKey;
@@ -34,7 +36,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
-public class KeyValueTest extends org.junit.Assert {
+public class KeyValueTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.assertNull;
+
import java.io.File;
import java.io.FileInputStream;
@@ -32,7 +34,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
-public class NoKeyInfoTest extends org.junit.Assert {
+public class NoKeyInfoTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java Tue Oct 10 09:14:33 2017
@@ -44,7 +44,7 @@ import org.apache.xml.security.utils.res
/**
* A test-case for Bugzilla bug 45744 - "XPath transform and xml-stylesheet".
*/
-public class ProcessingInstructionTest extends org.junit.Assert {
+public class ProcessingInstructionTest {
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.*;
+
import java.io.FileInputStream;
import java.io.InputStream;
import java.security.KeyStore;
@@ -49,7 +51,7 @@ import org.apache.xml.security.utils.res
* Test a Signature and Validation, and check that we have access to the Element(s) that was
* validated.
*/
-public class SignatureReferenceTest extends org.junit.Assert {
+public class SignatureReferenceTest {
public static final String DS_NS = "http://www.w3.org/2000/09/xmldsig#";
private static final String BASEDIR =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java Tue Oct 10 09:14:33 2017
@@ -19,6 +19,9 @@
package org.apache.xml.security.test.dom.signature;
import java.io.InputStream;
+
+import static org.junit.Assert.assertTrue;
+
import java.io.FileInputStream;
import java.security.KeyStore;
import java.security.PrivateKey;
@@ -38,7 +41,7 @@ import org.apache.xml.security.utils.res
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class SignatureTest extends org.junit.Assert {
+public class SignatureTest {
public static final String DS_NS = "http://www.w3.org/2000/09/xmldsig#";
private static final String BASEDIR =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -54,7 +56,7 @@ import org.xml.sax.SAXException;
* org.apache.xml.security.samples.signature.CreateEnvelopingSignature</code>
* </p>
*/
-public class UnknownAlgoSignatureTest extends org.junit.Assert {
+public class UnknownAlgoSignatureTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.*;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
@@ -32,7 +34,7 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class X509DataTest extends org.junit.Assert {
+public class X509DataTest {
private static final String BASEDIR = System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.signature;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,7 +34,7 @@ import org.apache.xml.security.signature
*
* @see <A HREF="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4336">Bug 4336</A>
*/
-public class XMLSignatureInputTest extends org.junit.Assert {
+public class XMLSignatureInputTest {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLSignatureInputTest.class);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java Tue Oct 10 09:14:33 2017
@@ -43,12 +43,14 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests creating and validating an XML Signature with an XPath Transform.
* Tests bug #44617.
*
*/
-public class XmlSecTest extends org.junit.Assert {
+public class XmlSecTest {
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.transforms.implementations;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -39,7 +41,7 @@ import org.w3c.dom.Node;
* Unit test for {@link org.apache.xml.security.transforms.implementations.TransformBase64Decode}
*
*/
-public class TransformBase64DecodeTest extends org.junit.Assert {
+public class TransformBase64DecodeTest {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TransformBase64DecodeTest.class);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java Tue Oct 10 09:14:33 2017
@@ -36,7 +36,7 @@ import org.apache.xml.security.transform
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.XMLUtils;
-public class TransformXSLTTest extends org.junit.Assert {
+public class TransformXSLTTest {
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.transforms.implementations;
+import static org.junit.Assert.assertEquals;
+
import java.io.ByteArrayInputStream;
import org.apache.xml.security.Init;
@@ -26,7 +28,7 @@ import org.apache.xml.security.utils.Con
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
-public class Xpath2TransformationTest extends org.junit.Assert {
+public class Xpath2TransformationTest {
static {
Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.utils.resolver;
+import static org.junit.Assert.fail;
+
import java.io.File;
import org.apache.xml.security.utils.XMLUtils;
@@ -29,7 +31,7 @@ import org.w3c.dom.Document;
* Unit test for {@link org.apache.xml.security.utils.resolver.ResourceResolver}
*
*/
-public class ResourceResolverTest extends org.junit.Assert {
+public class ResourceResolverTest {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java Tue Oct 10 09:14:33 2017
@@ -18,13 +18,15 @@
*/
package org.apache.xml.security.test.dom.version;
+import static org.junit.Assert.assertTrue;
+
import java.security.Provider;
import java.security.Security;
/**
* Version test.
*/
-public class VersionTest extends org.junit.Assert {
+public class VersionTest {
/**
* A unit test for the algorithm below to convert a version number
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java Tue Oct 10 09:14:33 2017
@@ -31,6 +31,9 @@ import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLResolver;
import javax.xml.stream.XMLStreamException;
+
+import static org.junit.Assert.*;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -39,7 +42,7 @@ import java.nio.charset.StandardCharsets
/**
*/
-public class Canonicalizer11Test extends org.junit.Assert {
+public class Canonicalizer11Test {
private XMLInputFactory xmlInputFactory;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java Tue Oct 10 09:14:33 2017
@@ -37,6 +37,8 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import static org.junit.Assert.*;
+
import java.io.*;
import java.net.URL;
import java.util.ArrayList;
@@ -46,7 +48,7 @@ import java.util.Map;
/**
*/
-public class Canonicalizer20010315ExclusiveTest extends org.junit.Assert {
+public class Canonicalizer20010315ExclusiveTest {
private XMLInputFactory xmlInputFactory;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java Tue Oct 10 09:14:33 2017
@@ -32,6 +32,9 @@ import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLResolver;
import javax.xml.stream.XMLStreamException;
+
+import static org.junit.Assert.*;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -40,7 +43,7 @@ import java.nio.charset.StandardCharsets
/**
*/
-public class Canonicalizer20010315Test extends org.junit.Assert {
+public class Canonicalizer20010315Test {
private XMLInputFactory xmlInputFactory;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java Tue Oct 10 09:14:33 2017
@@ -51,7 +51,7 @@ import org.w3c.dom.Document;
/**
* Interop test for exclusive canonical XML.
*/
-public class ExclusiveC14NInteropTest extends org.junit.Assert {
+public class ExclusiveC14NInteropTest {
// Define the Keys
private static final String DSA_Y =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Santuario191Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Santuario191Test.java Tue Oct 10 09:14:33 2017
@@ -28,6 +28,9 @@ import org.apache.xml.security.test.stax
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
+
+import static org.junit.Assert.assertEquals;
+
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
@@ -38,7 +41,7 @@ import java.io.StringReader;
* <p></p>
* An xml:Id attribute is appearing in a child element, contrary to the C14n11 spec.
*/
-public class Santuario191Test extends org.junit.Assert {
+public class Santuario191Test {
private static final String INPUT_DATA =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Tue Oct 10 09:14:33 2017
@@ -56,11 +56,13 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+import static org.junit.Assert.assertTrue;
+
/**
* Interop test for XML Encryption
*
*/
-public class BaltimoreEncTest extends org.junit.Assert {
+public class BaltimoreEncTest {
private static String cardNumber;
private static int nodeCount;