svn commit: r1811650 [1/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...

[co...@apache.org]

Author: coheigea
Date: Tue Oct 10 09:14:33 2017
New Revision: 1811650

URL: http://svn.apache.org/viewvc?rev=1811650&view=rev
Log:
Switch to use static imports instead of extending the junit Assert class

Modified:
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore18Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ComRSASecurityTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DigestMethodTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikTransformsTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SecureXSLTTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureMethodTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TransformTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Santuario191Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test;
 
+import static org.junit.Assert.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
@@ -30,7 +32,7 @@ import javax.xml.crypto.KeySelectorExcep
  * Unit test for javax.xml.crypto.KeySelectorException
  *
  */
-public class KeySelectorExceptionTest extends org.junit.Assert {
+public class KeySelectorExceptionTest {
 
     @org.junit.Test
     public void testConstructor() {

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java Tue Oct 10 09:14:33 2017
@@ -22,6 +22,9 @@
 package javax.xml.crypto.test;
 
 import java.util.*;
+
+import static org.junit.Assert.assertTrue;
+
 import java.security.Key;
 import java.security.cert.X509Certificate;
 import javax.xml.crypto.*;
@@ -32,7 +35,7 @@ import javax.xml.crypto.dsig.*;
  * Unit test for javax.xml.crypto.KeySelector
  *
  */
-public class KeySelectorTest extends org.junit.Assert {
+public class KeySelectorTest {
     private Key key;
     private KeySelector selector1;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test;
 
+import static org.junit.Assert.*;
+
 import java.io.*;
 import java.util.*;
 import javax.xml.crypto.*;
@@ -29,7 +31,7 @@ import javax.xml.crypto.*;
  * Unit test for javax.xml.crypto.OctetStreamData
  *
  */
-public class OctetStreamDataTest extends org.junit.Assert {
+public class OctetStreamDataTest {
 
     @org.junit.Test
     public void testConstructor() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore18Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore18Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore18Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore18Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 import java.security.cert.CertificateException;
@@ -34,7 +36,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from Baltimore
  *
  */
-public class Baltimore18Test extends org.junit.Assert {
+public class Baltimore18Test {
 
     private File dir;
     private KeySelector cks;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
@@ -37,7 +39,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from Baltimore
  *
  */
-public class Baltimore23Test extends org.junit.Assert {
+public class Baltimore23Test {
 
     private File dir;
     private final URIDereferencer ud;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -31,7 +33,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from Baltimore
  *
  */
-public class BaltimoreExcC14n1Test extends org.junit.Assert {
+public class BaltimoreExcC14n1Test {
 
     private SignatureValidator validator;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -31,7 +33,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from Baltimore
  *
  */
-public class BaltimoreIaik2Test extends org.junit.Assert {
+public class BaltimoreIaik2Test {
 
     private SignatureValidator validator;
     private File dir;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -31,7 +33,7 @@ import javax.xml.crypto.test.KeySelector
  * under data/vectors/ie/baltimore/merlin-examples directory
  *
  */
-public class BaltimoreXPathFilter2ThreeTest extends org.junit.Assert {
+public class BaltimoreXPathFilter2ThreeTest {
 
     private SignatureValidator validator;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java Tue Oct 10 09:14:33 2017
@@ -25,11 +25,13 @@ import javax.xml.crypto.KeySelector;
 
 import javax.xml.crypto.test.KeySelectors;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * This is a testcase to validate all the W3C xmldsig C14N11 testcases.
  *
  */
-public class C14N11Test extends org.junit.Assert {
+public class C14N11Test {
 
     private SignatureValidator validator;
     private File dir;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.security.*;
 import java.security.spec.AlgorithmParameterSpec;
 import javax.xml.crypto.dsig.*;
@@ -31,7 +33,7 @@ import javax.xml.crypto.dsig.spec.ExcC14
  * Unit test for javax.xml.crypto.dsig.CanonicalizationMethod
  *
  */
-public class CanonicalizationMethodTest extends org.junit.Assert {
+public class CanonicalizationMethodTest {
 
     XMLSignatureFactory factory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java Tue Oct 10 09:14:33 2017
@@ -34,7 +34,7 @@ import org.apache.jcp.xml.dsig.internal.
  * invokes the XMLSignature API. It tests that there are not provider class
  * loading issues with more than one classloader (see 6380953).
  */
-public class ClassLoaderTest extends org.junit.Assert {
+public class ClassLoaderTest {
 
     private static final org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(ClassLoaderTest.class);

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ComRSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ComRSASecurityTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ComRSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ComRSASecurityTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -31,7 +33,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from RSA
  *
  */
-public class ComRSASecurityTest extends org.junit.Assert {
+public class ComRSASecurityTest {
 
     private SignatureValidator validator;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.*;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -60,7 +62,7 @@ import javax.xml.crypto.test.KeySelector
  * different keys and X.509 data.
  *
  */
-public class CreateBaltimore23Test extends org.junit.Assert {
+public class CreateBaltimore23Test {
 
     private XMLSignatureFactory fac;
     private KeyInfoFactory kifac;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.*;
 import java.security.*;
 import java.security.cert.Certificate;
@@ -43,7 +45,7 @@ import javax.xml.parsers.DocumentBuilder
  * but with different keys.
  *
  */
-public class CreateInteropExcC14NTest extends org.junit.Assert {
+public class CreateInteropExcC14NTest {
 
     private XMLSignatureFactory fac;
     private KeyInfoFactory kifac;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.*;
 import java.security.*;
 import java.security.cert.Certificate;
@@ -43,7 +45,7 @@ import javax.xml.parsers.DocumentBuilder
  * but with different keys and X.509 data.
  *
  */
-public class CreateInteropXFilter2Test extends org.junit.Assert {
+public class CreateInteropXFilter2Test {
 
     private XMLSignatureFactory fac;
     private KeyInfoFactory kifac;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java Tue Oct 10 09:14:33 2017
@@ -36,11 +36,13 @@ import org.w3c.dom.*;
 
 import javax.xml.crypto.test.KeySelectors;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * This is a testcase to generate all the W3C xmldsig XMLDSig11 testcases.
  *
  */
-public class CreateInteropXMLDSig11Test extends org.junit.Assert {
+public class CreateInteropXMLDSig11Test {
 
     private KeySelector kvks, sks;
     private CanonicalizationMethod withoutComments;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.util.*;
@@ -42,7 +44,7 @@ import javax.xml.parsers.DocumentBuilder
  * the exc-c14n vectors.
  *
  */
-public class CreatePhaosXMLDSig3Test extends org.junit.Assert {
+public class CreatePhaosXMLDSig3Test {
 
     private XMLSignatureFactory fac;
     private DocumentBuilder db;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java Tue Oct 10 09:14:33 2017
@@ -28,6 +28,8 @@ import javax.xml.crypto.dsig.dom.DOMVali
 import javax.xml.crypto.dsig.keyinfo.*;
 import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
 
+import static org.junit.Assert.*;
+
 import java.security.*;
 import java.util.*;
 
@@ -79,7 +81,7 @@ import org.w3c.dom.Document;
  * </Signature>
  *
  */
-public class DetachedTest extends org.junit.Assert {
+public class DetachedTest {
 
     static {
         Security.insertProviderAt

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DigestMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DigestMethodTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DigestMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DigestMethodTest.java Tue Oct 10 09:14:33 2017
@@ -22,13 +22,16 @@
 package javax.xml.crypto.test.dsig;
 
 import javax.xml.crypto.dsig.*;
+
+import static org.junit.Assert.*;
+
 import java.security.*;
 
 /**
  * Unit test for javax.xml.crypto.dsig.DigestMethod
  *
  */
-public class DigestMethodTest extends org.junit.Assert {
+public class DigestMethodTest {
 
     private XMLSignatureFactory factory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java Tue Oct 10 09:14:33 2017
@@ -47,10 +47,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * Test signing using all available HMAC signing algorithms
  */
-public class HMACSignatureAlgorithmTest extends org.junit.Assert {
+public class HMACSignatureAlgorithmTest {
 
     private KeySelector sks;
     private CanonicalizationMethod withoutComments;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.Security;
@@ -34,7 +36,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from IAIK
  *
  */
-public class IaikCoreFeaturesTest extends org.junit.Assert {
+public class IaikCoreFeaturesTest {
 
     private SignatureValidator validator;
     private String base;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.security.Security;
@@ -33,7 +35,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from IAIK
  *
  */
-public class IaikSignatureAlgosTest extends org.junit.Assert {
+public class IaikSignatureAlgosTest {
 
     private SignatureValidator validator;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikTransformsTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikTransformsTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikTransformsTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikTransformsTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -31,7 +33,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from IAIK
  *
  */
-public class IaikTransformsTest extends org.junit.Assert {
+public class IaikTransformsTest {
 
     private SignatureValidator validator;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -31,7 +33,7 @@ import javax.xml.crypto.test.KeySelector
  * under data/vectors/interop directory
  *
  */
-public class InteropC14nTest extends org.junit.Assert {
+public class InteropC14nTest {
 
     private SignatureValidator validator;
     private String base;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java Tue Oct 10 09:14:33 2017
@@ -27,11 +27,13 @@ import javax.xml.crypto.KeySelector;
 
 import javax.xml.crypto.test.KeySelectors;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * This is a testcase to validate all the W3C xmldsig XMLDSig11 testcases.
  *
  */
-public class InteropXMLDSig11Test extends org.junit.Assert {
+public class InteropXMLDSig11Test {
 
     private SignatureValidator validator;
     private File dir;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.security.Security;
 
@@ -32,7 +34,7 @@ import org.w3c.dom.Element;
 /**
  * This is a test for a forbidden number of references when secure validation is enabled.
  */
-public class JSRForbiddenRefCountTest extends org.junit.Assert {
+public class JSRForbiddenRefCountTest {
 
     static {
         Security.insertProviderAt(new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI(), 1);

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.security.Security;
@@ -29,7 +31,7 @@ import javax.xml.crypto.test.KeySelector
 /**
  * This is a test for a forbidden Reference algorithm when secure validation is enabled.
  */
-public class JSRForbiddenReferenceTest extends org.junit.Assert {
+public class JSRForbiddenReferenceTest {
 
     private SignatureValidator validator;
     private File dir;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.security.Security;
 
@@ -32,7 +34,7 @@ import org.w3c.dom.Element;
 /**
  * This is a test for a wrapping attack.
  */
-public class JSRWrappingAttackTest extends org.junit.Assert {
+public class JSRWrappingAttackTest {
 
     private SignatureValidator validator;
     private File dir;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.util.*;
 import javax.xml.crypto.dsig.*;
 
@@ -28,7 +30,7 @@ import javax.xml.crypto.dsig.*;
  * Unit test for javax.xml.crypto.dsig.Manifest
  *
  */
-public class ManifestTest extends org.junit.Assert {
+public class ManifestTest {
     private XMLSignatureFactory fac;
 
     private static Reference VALID_REF = new

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java Tue Oct 10 09:14:33 2017
@@ -51,10 +51,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * Test signing using all available PublicKey signing algorithms
  */
-public class PKSignatureAlgorithmTest extends org.junit.Assert {
+public class PKSignatureAlgorithmTest {
 
     private KeySelector kvks;
     private CanonicalizationMethod withoutComments;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.security.Security;
@@ -36,7 +38,7 @@ import javax.xml.crypto.test.KeySelector
  * testcases from Phaos
  *
  */
-public class PhaosXMLDSig3Test extends org.junit.Assert {
+public class PhaosXMLDSig3Test {
 
     private SignatureValidator validator;
     private File base;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.*;
 import java.security.MessageDigest;
 import java.security.Security;
@@ -38,7 +40,7 @@ import org.w3c.dom.Document;
  * Unit test for javax.xml.crypto.dsig.Reference
  *
  */
-public class ReferenceTest extends org.junit.Assert {
+public class ReferenceTest {
     private XMLSignatureFactory fac;
     private KeyInfoFactory kifac;
     private DigestMethod dmSHA1;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SecureXSLTTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SecureXSLTTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SecureXSLTTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SecureXSLTTest.java Tue Oct 10 09:14:33 2017
@@ -29,7 +29,9 @@ import org.w3c.dom.*;
 
 import javax.xml.crypto.test.KeySelectors;
 
-public class SecureXSLTTest extends org.junit.Assert {
+import static org.junit.Assert.assertFalse;
+
+public class SecureXSLTTest {
 
     static {
         Security.insertProviderAt

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java Tue Oct 10 09:14:33 2017
@@ -45,10 +45,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * Test signing using all available digest methods
  */
-public class SignatureDigestMethodTest extends org.junit.Assert {
+public class SignatureDigestMethodTest {
 
     private KeySelector kvks;
     private CanonicalizationMethod withoutComments;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureMethodTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureMethodTest.java Tue Oct 10 09:14:33 2017
@@ -22,13 +22,16 @@
 package javax.xml.crypto.test.dsig;
 
 import javax.xml.crypto.dsig.*;
+
+import static org.junit.Assert.*;
+
 import java.security.*;
 
 /**
  * Unit test for javax.xml.crypto.dsig.SignatureMethod
  *
  */
-public class SignatureMethodTest extends org.junit.Assert {
+public class SignatureMethodTest {
 
     XMLSignatureFactory factory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.util.*;
 import javax.xml.crypto.dsig.*;
 
@@ -28,7 +30,7 @@ import javax.xml.crypto.dsig.*;
  * Unit test for javax.xml.crypto.dsig.SignatureProperties
  *
  */
-public class SignaturePropertiesTest extends org.junit.Assert {
+public class SignaturePropertiesTest {
 
     private XMLSignatureFactory factory;
     private String id = "id";

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.util.*;
 import javax.xml.crypto.XMLStructure;
 import javax.xml.crypto.dsig.*;
@@ -29,7 +31,7 @@ import javax.xml.crypto.dsig.*;
  * Unit test for javax.xml.crypto.dsig.SignatureProperty
  *
  */
-public class SignaturePropertyTest extends org.junit.Assert {
+public class SignaturePropertyTest {
 
     private XMLSignatureFactory factory;
     private String target = "target";

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.security.Security;
 import java.util.*;
 import javax.xml.crypto.dsig.*;
@@ -30,7 +32,7 @@ import javax.xml.crypto.dsig.spec.C14NMe
  * Unit test for javax.xml.crypto.dsig.SignedInfo
  *
  */
-public class SignedInfoTest extends org.junit.Assert {
+public class SignedInfoTest {
     private XMLSignatureFactory fac;
     private CanonicalizationMethod cm;
     private SignatureMethod sm;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TransformTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TransformTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TransformTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TransformTest.java Tue Oct 10 09:14:33 2017
@@ -29,13 +29,16 @@ import javax.xml.crypto.dsig.spec.XPathT
 import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec;
 import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;
 import javax.xml.crypto.dsig.spec.XSLTTransformParameterSpec;
+
+import static org.junit.Assert.*;
+
 import java.security.*;
 
 /**
  * Unit test for javax.xml.crypto.dsig.Transform
  *
  */
-public class TransformTest extends org.junit.Assert {
+public class TransformTest {
 
     XMLSignatureFactory factory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.security.Security;
@@ -39,7 +41,7 @@ import javax.xml.crypto.dsig.dom.DOMVali
  * This is a testcase that validates various signatures
  *
  */
-public class ValidateSignatureTest extends org.junit.Assert {
+public class ValidateSignatureTest {
 
     private SignatureValidator validator;
     private File dir;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.util.*;
 import javax.xml.crypto.XMLStructure;
 import javax.xml.crypto.dsig.*;
@@ -29,7 +31,7 @@ import javax.xml.crypto.dsig.*;
  * Unit test for javax.xml.crypto.dsig.XMLObject
  *
  */
-public class XMLObjectTest extends org.junit.Assert {
+public class XMLObjectTest {
 
     private XMLSignatureFactory factory;
     private String id = "id";

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java Tue Oct 10 09:14:33 2017
@@ -26,6 +26,8 @@ import javax.xml.crypto.dsig.dom.DOMSign
 import javax.xml.crypto.KeySelector;
 import javax.xml.crypto.URIDereferencer;
 
+import static org.junit.Assert.*;
+
 import java.security.*;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -35,7 +37,7 @@ import org.w3c.dom.Document;
  * Unit test for javax.xml.crypto.dsig.XMLSignContext
  *
  */
-public class XMLSignContextTest extends org.junit.Assert {
+public class XMLSignContextTest {
 
     private XMLSignContext defContext;
     private Key[] KEYS;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.security.NoSuchProviderException;
 import java.security.Provider;
@@ -40,7 +42,7 @@ import org.w3c.dom.NodeList;
  * Unit test for javax.xml.crypto.dsig.XMLSignatureFactory
  *
  */
-public class XMLSignatureFactoryTest extends org.junit.Assert {
+public class XMLSignatureFactoryTest {
 
     XMLSignatureFactory factory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig;
 
+import static org.junit.Assert.*;
+
 import java.io.*;
 import java.util.*;
 import java.security.*;
@@ -41,7 +43,7 @@ import org.w3c.dom.*;
  * Unit test for javax.xml.crypto.dsig.XMLSignature
  *
  */
-public class XMLSignatureTest extends org.junit.Assert {
+public class XMLSignatureTest {
     private XMLSignatureFactory fac;
     private KeyInfoFactory kifac;
     private SignedInfo defSi;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java Tue Oct 10 09:14:33 2017
@@ -24,6 +24,9 @@ package javax.xml.crypto.test.dsig;
 import javax.xml.crypto.*;
 import javax.xml.crypto.dsig.dom.DOMValidateContext;
 import javax.xml.crypto.dsig.*;
+
+import static org.junit.Assert.*;
+
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
@@ -31,7 +34,7 @@ import javax.crypto.spec.SecretKeySpec;
  * Unit test for javax.xml.crypto.dsig.XMLValidateContext
  *
  */
-public class XMLValidateContextTest extends org.junit.Assert {
+public class XMLValidateContextTest {
 
     private XMLValidateContext defContext;
     private KeySelector[] KEY_SELECTORS;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig.dom;
 
+import static org.junit.Assert.*;
+
 import java.io.*;
 import javax.xml.crypto.dsig.dom.DOMValidateContext;
 
@@ -30,7 +32,7 @@ import javax.xml.crypto.test.dsig.TestUt
  * Unit test for javax.xml.crypto.dsig.dom.DOMValidateContext
  *
  */
-public class DOMValidateContextTest extends org.junit.Assert {
+public class DOMValidateContextTest {
     private DOMValidateContext domVC;
 
     public DOMValidateContextTest() throws Exception {

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import java.math.BigInteger;
 import java.util.*;
 import java.security.KeyException;
@@ -32,7 +34,7 @@ import javax.xml.crypto.*;
  * Unit test for javax.xml.crypto.dsig.keyinfo.KeyInfoFactory
  *
  */
-public class KeyInfoFactoryTest extends org.junit.Assert {
+public class KeyInfoFactoryTest {
 
     KeyInfoFactory factory;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import java.security.Key;
 import java.util.Collections;
 import java.util.List;
@@ -40,7 +42,7 @@ import org.w3c.dom.Element;
  * Unit test for javax.xml.crypto.dsig.keyinfo.KeyInfo
  *
  */
-public class KeyInfoTest extends org.junit.Assert {
+public class KeyInfoTest {
 
     private KeyInfoFactory fac;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java Tue Oct 10 09:14:33 2017
@@ -21,13 +21,15 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import javax.xml.crypto.dsig.keyinfo.*;
 
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.KeyName
  *
  */
-public class KeyNameTest extends org.junit.Assert {
+public class KeyNameTest {
 
     private KeyInfoFactory fac;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import java.security.*;
 import javax.xml.crypto.dsig.keyinfo.*;
 
@@ -28,7 +30,7 @@ import javax.xml.crypto.dsig.keyinfo.*;
  * Unit test for javax.xml.crypto.dsig.keyinfo.KeyValue
  *
  */
-public class KeyValueTest extends org.junit.Assert {
+public class KeyValueTest {
 
     private static final String[] ALGOS = { "DSA", "RSA" };
     private KeyInfoFactory fac;

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,7 +33,7 @@ import javax.xml.crypto.dsig.keyinfo.*;
  * Unit test for javax.xml.crypto.dsig.keyinfo.PGPData
  *
  */
-public class PGPDataTest extends org.junit.Assert {
+public class PGPDataTest {
 
     private KeyInfoFactory fac;
     private byte[][] values = {

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java Tue Oct 10 09:14:33 2017
@@ -21,13 +21,15 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import javax.xml.crypto.dsig.keyinfo.*;
 
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.RetrievalMethod
  *
  */
-public class RetrievalMethodTest extends org.junit.Assert {
+public class RetrievalMethodTest {
 
     private KeyInfoFactory fac;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java Tue Oct 10 09:14:33 2017
@@ -23,6 +23,9 @@ package javax.xml.crypto.test.dsig.keyin
 
 import java.util.*;
 import java.security.cert.X509Certificate;
+
+import static org.junit.Assert.*;
+
 import java.security.cert.X509CRL;
 import javax.xml.crypto.*;
 import javax.xml.crypto.dsig.keyinfo.*;
@@ -31,7 +34,7 @@ import javax.xml.crypto.dsig.keyinfo.*;
  * Unit test for javax.xml.crypto.dsig.keyinfo.X509Data
  *
  */
-public class X509DataTest extends org.junit.Assert {
+public class X509DataTest {
 
     private KeyInfoFactory fac;
 

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java Tue Oct 10 09:14:33 2017
@@ -21,6 +21,8 @@
  */
 package javax.xml.crypto.test.dsig.keyinfo;
 
+import static org.junit.Assert.*;
+
 import java.math.BigInteger;
 import javax.xml.crypto.dsig.keyinfo.*;
 
@@ -28,7 +30,7 @@ import javax.xml.crypto.dsig.keyinfo.*;
  * Unit test for javax.xml.crypto.dsig.keyinfo.X509IssuerSerial
  *
  */
-public class X509IssuerSerialTest extends org.junit.Assert {
+public class X509IssuerSerialTest {
 
     private KeyInfoFactory fac;
     private String name;

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.algorithms;
 
+import static org.junit.Assert.*;
+
 import java.lang.reflect.Constructor;
 import java.security.MessageDigest;
 import java.security.Provider;
@@ -31,7 +33,7 @@ import org.w3c.dom.Document;
 /**
  * A test to make sure that the various digest algorithms are working
  */
-public class DigestAlgorithmTest extends org.junit.Assert {
+public class DigestAlgorithmTest {
 
     static {
         org.apache.xml.security.Init.init();

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java Tue Oct 10 09:14:33 2017
@@ -27,7 +27,7 @@ import org.apache.xml.security.signature
 import org.apache.xml.security.utils.XMLUtils;
 import org.w3c.dom.Document;
 
-public class SignatureAlgorithmTest extends org.junit.Assert {
+public class SignatureAlgorithmTest {
 
     static org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(SignatureAlgorithmTest.class);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.helper;
 
+import static org.junit.Assert.*;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -34,7 +36,7 @@ import org.w3c.dom.NamedNodeMap;
  * Unit test for {@link org.apache.xml.security.c14n.AttrCompare#compare}
  *
  */
-public class AttrCompareTest extends org.junit.Assert {
+public class AttrCompareTest {
 
     static {
         org.apache.xml.security.Init.init();

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java Tue Oct 10 09:14:33 2017
@@ -18,12 +18,14 @@
  */
 package org.apache.xml.security.test.dom.c14n.helper;
 
+import static org.junit.Assert.assertTrue;
+
 import org.apache.xml.security.c14n.helper.C14nHelper;
 
 
 /**
  */
-public class C14nHelperTest extends org.junit.Assert {
+public class C14nHelperTest {
 
     static org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(C14nHelperTest.class);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.*;
+
 import java.io.FileInputStream;
 import java.security.KeyStore;
 import java.security.PrivateKey;
@@ -38,7 +40,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-public class Bug45961Test extends org.junit.Assert {
+public class Bug45961Test {
 
     private static final String OBJECT_ID = "Object";
     private static final String MOCK_CANONICALIZATION_METHOD =

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -48,7 +50,7 @@ import org.xml.sax.SAXException;
  * Unit test for
  * {@link org.apache.xml.security.c14n.implementations.Canonicalizer11}
  */
-public class Canonicalizer11Test extends org.junit.Assert {
+public class Canonicalizer11Test {
 
     static org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(Canonicalizer11Test.class);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -58,7 +60,7 @@ import org.xml.sax.SAXException;
 
 /**
  */
-public class Canonicalizer20010315ExclusiveTest extends org.junit.Assert {
+public class Canonicalizer20010315ExclusiveTest {
 
     static {
         org.apache.xml.security.Init.init();

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -60,7 +62,7 @@ import org.xml.sax.SAXException;
  * {@link org.apache.xml.security.c14n.implementations.Canonicalizer20010315WithXPath}
  *
  */
-public class Canonicalizer20010315Test extends org.junit.Assert {
+public class Canonicalizer20010315Test {
 
     static org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(Canonicalizer20010315Test.class);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 
 import org.apache.xml.security.signature.Reference;

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.*;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +28,7 @@ import org.apache.xml.security.utils.XML
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 
-public class NameSpaceSymbTableTest extends org.junit.Assert {
+public class NameSpaceSymbTableTest {
     static Attr node1, node2;
     static {
         try {

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -37,7 +39,7 @@ import org.apache.xml.security.utils.XML
  *
  * 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/dom/c14n/implementations/Santuario273Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
@@ -39,7 +41,7 @@ import org.w3c.dom.Node;
  * https://issues.apache.org/jira/browse/SANTUARIO-273
  * "xml:base attribute not processed correctly in C14N11 canonicalization"
  */
-public class Santuario273Test extends org.junit.Assert {
+public class Santuario273Test {
     public static String input = ""
         + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
         + "<Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\" xml:base=\"http://www.acme.com/resources/\">\n"

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java Tue Oct 10 09:14:33 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.xml.security.test.dom.c14n.implementations;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
@@ -25,7 +27,7 @@ import java.util.Arrays;
 
 import org.apache.xml.security.c14n.implementations.UtfHelpper;
 
-public class UtfHelperTest extends org.junit.Assert {
+public class UtfHelperTest {
 
     @org.junit.Test
     public void testBug40156() {

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Tue Oct 10 09:14:33 2017
@@ -56,11 +56,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import static org.junit.Assert.*;
+
 /**
  * Interop test for XML Encryption
  *
  */
-public class BaltimoreEncTest extends org.junit.Assert {
+public class BaltimoreEncTest {
 
     private static String cardNumber;
     private static String rsaCertSerialNumber;

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.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.assertEquals;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -42,7 +44,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-public class EncryptContentTest extends org.junit.Assert {
+public class EncryptContentTest {
 
     static org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(EncryptContentTest.class);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java?rev=1811650&r1=1811649&r2=1811650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.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.util.Iterator;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -30,7 +32,7 @@ import org.apache.xml.security.utils.XML
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-public class ReferenceListTest extends org.junit.Assert {
+public class ReferenceListTest {
 
     static org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class);