Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java Wed Jun 19 10:27:50 2019 @@ -42,7 +42,8 @@ import org.apache.wss4j.dom.message.WSSe import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.validate.Credential; import org.apache.wss4j.dom.validate.Validator; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import javax.crypto.KeyGenerator; @@ -52,9 +53,9 @@ import javax.xml.crypto.dsig.SignatureMe import java.util.Arrays; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * This is a test for the Kerberos Token Profile 1.1 @@ -69,7 +70,7 @@ public class BSTKerberosTest { private CallbackHandler callbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); }
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java Wed Jun 19 10:27:50 2019 @@ -37,14 +37,15 @@ import org.apache.wss4j.common.token.X50 import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import java.security.cert.X509Certificate; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * This is a test for constructing and processing BinarySecurityTokens. @@ -54,7 +55,7 @@ public class BinarySecurityTokenTest { org.slf4j.LoggerFactory.getLogger(BinarySecurityTokenTest.class); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java Wed Jun 19 10:27:50 2019 @@ -21,11 +21,12 @@ package org.apache.wss4j.dom.message.tok import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.dom.common.SecurityTestUtil; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for DerivedKeyToken type. @@ -54,7 +55,7 @@ public class DerivedKeyTokenTest { private DerivedKeyToken tokenEqual; private DerivedKeyToken tokenNotEqual; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java Wed Jun 19 10:27:50 2019 @@ -23,12 +23,13 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.common.token.Reference; import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * unit test for the Reference type @@ -59,7 +60,7 @@ public class ReferenceTest { private Reference refEqual; private Reference refNotEqual; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java Wed Jun 19 10:27:50 2019 @@ -31,12 +31,13 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.SOAPUtil; import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Some tests for the SecurityTokenReference class. @@ -45,7 +46,7 @@ public class SecurityTokenReferenceTest private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(SecurityTokenReferenceTest.class); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java Wed Jun 19 10:27:50 2019 @@ -35,11 +35,12 @@ import org.apache.wss4j.dom.engine.WSSCo import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** @@ -71,7 +72,7 @@ public class WCFUsernameTokenTest { private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java Wed Jun 19 10:27:50 2019 @@ -45,12 +45,13 @@ import org.apache.wss4j.dom.message.WSSe import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; import org.apache.wss4j.dom.message.token.UsernameToken; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * WS-Security Test Case for fault codes. The SOAP Message Security specification 1.1 defines @@ -60,7 +61,7 @@ public class FaultCodeTest implements Ca private WSSecurityEngine secEngine = new WSSecurityEngine(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java Wed Jun 19 10:27:50 2019 @@ -55,11 +55,12 @@ import org.apache.wss4j.dom.message.WSSe import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.validate.Credential; import org.apache.wss4j.dom.validate.Validator; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test various principal objects after processing a security token. @@ -70,7 +71,7 @@ public class PrincipalTest { private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java Wed Jun 19 10:27:50 2019 @@ -22,12 +22,13 @@ package org.apache.wss4j.dom.misc; import org.apache.wss4j.dom.common.SOAPUtil; import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSecurityEngine; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.apache.wss4j.common.ext.WSSecurityException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * This tests how security headers are parsed and processed. @@ -87,7 +88,7 @@ public class SecurityHeaderTest { private WSSecurityEngine secEngine = new WSSecurityEngine(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java Wed Jun 19 10:27:50 2019 @@ -40,13 +40,14 @@ import org.apache.wss4j.common.crypto.Cr import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test that checks for correct WSDataRef which should be returned by @@ -68,7 +69,7 @@ public class EncryptedKeyDataRefTest { private CallbackHandler callbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java Wed Jun 19 10:27:50 2019 @@ -40,13 +40,14 @@ import org.apache.wss4j.common.crypto.Cr import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test that checks for correct WSDataRef which should be returned by @@ -68,7 +69,7 @@ public class ReferenceListDataRefTest { private CallbackHandler callbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java Wed Jun 19 10:27:50 2019 @@ -41,10 +41,11 @@ import org.apache.wss4j.common.saml.SAML import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * A set of test-cases for signing and verifying SOAP requests containing a signed @@ -55,7 +56,7 @@ public class SamlAlgorithmSuiteTest { org.slf4j.LoggerFactory.getLogger(SamlAlgorithmSuiteTest.class); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java Wed Jun 19 10:27:50 2019 @@ -39,12 +39,13 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; import org.joda.time.DateTime; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Some tests for SAML Authentication Assertions @@ -54,7 +55,7 @@ public class SamlAuthnTest { org.slf4j.LoggerFactory.getLogger(SamlAuthnTest.class); private WSSecurityEngine secEngine = new WSSecurityEngine(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java Wed Jun 19 10:27:50 2019 @@ -49,12 +49,13 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; import org.joda.time.DateTime; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test-case for sending and processing an a SAML Token with a custom Conditions element. @@ -64,7 +65,7 @@ public class SamlConditionsTest { org.slf4j.LoggerFactory.getLogger(SamlConditionsTest.class); private WSSecurityEngine secEngine = new WSSecurityEngine(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -218,7 +219,7 @@ public class SamlConditionsTest { assertTrue(ex.getMessage().contains("SAML token security failure")); } } - + @Test public void testSAML2NoNotOnOrAfter() throws Exception { SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler(); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java Wed Jun 19 10:27:50 2019 @@ -46,7 +46,8 @@ import org.apache.wss4j.common.util.Load import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import javax.security.auth.callback.Callback; @@ -60,8 +61,8 @@ import java.security.KeyStore; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * This is a set of test-cases where the SAML Assertion is altered in some way and so @@ -76,7 +77,7 @@ public class SamlNegativeTest { private Crypto issuerCrypto; private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties"); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java Wed Jun 19 10:27:50 2019 @@ -45,7 +45,8 @@ import org.apache.wss4j.common.util.Load import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -58,10 +59,10 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.security.auth.callback.CallbackHandler; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Some tests for how SAML tokens are referenced. @@ -76,7 +77,7 @@ public class SamlReferenceTest { private Crypto issuerCrypto; private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties"); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java Wed Jun 19 10:27:50 2019 @@ -43,9 +43,10 @@ import org.apache.wss4j.dom.handler.Hand import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test-case for sending SAML Assertions using the "action" approach. @@ -56,7 +57,7 @@ public class SamlTokenActionTest { private WSSecurityEngine secEngine = new WSSecurityEngine(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java Wed Jun 19 10:27:50 2019 @@ -60,12 +60,13 @@ import org.apache.xml.security.signature import org.apache.xml.security.transforms.Transforms; import org.apache.xml.security.transforms.params.XPath2FilterContainer; import org.apache.xml.security.utils.Constants; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** */ @@ -75,7 +76,7 @@ public class SamlTokenCustomSignatureTes private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -125,7 +126,7 @@ public class SamlTokenCustomSignatureTes // This should pass as we are disabling signature profile validation in the Validator verifyWithoutProfile(doc); } - + @Test public void testSAML1AuthnAssertionValidatorMap() throws Exception { SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler(); @@ -162,7 +163,7 @@ public class SamlTokenCustomSignatureTes // This should pass as we are disabling signature profile validation in the Validator, // which is configured via ConfigurationConstants.VALIDATOR_MAP - + SamlAssertionValidator validator = new SamlAssertionValidator(); validator.setValidateSignatureAgainstProfile(false); Map<QName, Validator> validatorMap = new HashMap<>(); @@ -174,16 +175,16 @@ public class SamlTokenCustomSignatureTes config.put(WSHandlerConstants.VALIDATOR_MAP, validatorMap); requestData.setMsgContext(config); requestData.setSigVerCrypto(crypto); - + CustomHandler handler = new CustomHandler(); List<Integer> actions = new ArrayList<>(); actions.add(WSConstants.ST_SIGNED); handler.receive(actions, requestData); - + WSSecurityEngine secEngine = new WSSecurityEngine(); secEngine.processSecurityHeader(doc, requestData); - + String outputString = XMLUtils.prettyDocumentToString(doc); assertTrue(outputString.indexOf("counter_port_type") > 0 ? true : false); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java Wed Jun 19 10:27:50 2019 @@ -49,13 +49,14 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test-case for sending and processing a signed (sender vouches) SAML Assertion using a @@ -68,7 +69,7 @@ public class SamlTokenDerivedTest { private CallbackHandler callbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java Wed Jun 19 10:27:50 2019 @@ -40,11 +40,12 @@ import org.apache.wss4j.common.saml.buil import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test-case for sending and processing a signed (holder-of-key) SAML Assertion. These tests @@ -57,7 +58,7 @@ public class SamlTokenHOKTest { private WSSecurityEngine secEngine = new WSSecurityEngine(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java Wed Jun 19 10:27:50 2019 @@ -42,7 +42,8 @@ import org.apache.wss4j.dom.handler.Requ import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecHeader; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import java.util.Collections; @@ -50,10 +51,10 @@ import java.util.List; import javax.security.auth.callback.CallbackHandler; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test-case for sending and processing a signed (sender vouches) SAML Assertion. @@ -65,7 +66,7 @@ public class SamlTokenSVTest { private CallbackHandler callbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Wed Jun 19 10:27:50 2019 @@ -77,7 +77,8 @@ import org.apache.xml.security.keys.cont import org.apache.xml.security.keys.content.X509Data; import org.apache.xml.security.stax.impl.util.IDGenerator; import org.joda.time.DateTime; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.opensaml.core.xml.XMLObjectBuilder; import org.opensaml.core.xml.XMLObjectBuilderFactory; import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport; @@ -89,12 +90,12 @@ import org.opensaml.saml.saml2.core.Cond import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test-case for sending and processing an unsigned (sender vouches) SAML Assertion. @@ -105,7 +106,7 @@ public class SamlTokenTest { private WSSecurityEngine secEngine = new WSSecurityEngine(); private static final String IP_ADDRESS = "12.34.56.78"; //NOPMD - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java Wed Jun 19 10:27:50 2019 @@ -46,7 +46,8 @@ import org.apache.wss4j.common.util.Load import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -71,10 +72,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test-case for sending and processing a signed (holder-of-key) SAML Assertion. These tests @@ -90,7 +91,7 @@ public class SignedSamlTokenHOKTest { private Crypto issuerCrypto; private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties"); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -625,7 +626,7 @@ public class SignedSamlTokenHOKTest { } @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSAML2Advice() throws Exception { // Create a signed "Advice" Element first SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler(); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java Wed Jun 19 10:27:50 2019 @@ -37,14 +37,15 @@ import org.apache.wss4j.common.util.Load import org.apache.wss4j.dom.common.SAML2CallbackHandler; import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.opensaml.xmlsec.signature.Signature; import org.opensaml.xmlsec.signature.support.SignatureConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A list of test-cases to test the functionality of signing with @@ -68,7 +69,7 @@ public class AssertionSigningTest { private final String customSignatureDigestAlgorithm = SignatureConstants.ALGO_ID_DIGEST_SHA256; private final DocumentBuilderFactory dbf; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java Wed Jun 19 10:27:50 2019 @@ -51,12 +51,13 @@ import org.apache.wss4j.dom.message.WSSe import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * A test-case for Validators, check for non-standard behaviour by plugging in @@ -67,7 +68,7 @@ public class ValidatorTest { org.slf4j.LoggerFactory.getLogger(ValidatorTest.class); private WSSecurityEngine secEngine = new WSSecurityEngine(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-policy-stax/pom.xml URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/pom.xml (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/pom.xml Wed Jun 19 10:27:50 2019 @@ -73,8 +73,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> <dependency> Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java Wed Jun 19 10:27:50 2019 @@ -37,8 +37,8 @@ import org.apache.xml.security.binding.x import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.impl.util.IDGenerator; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -63,13 +63,13 @@ import java.util.List; public class AbstractPolicyTestBase extends AbstractTestBase { - @BeforeClass + @BeforeAll public static void setUp() throws Exception { WSProviderConfig.init(); Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class); } - @AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java Wed Jun 19 10:27:50 2019 @@ -36,12 +36,12 @@ import org.apache.wss4j.policy.stax.enfo import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class AlgorithmSuiteTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java Wed Jun 19 10:27:50 2019 @@ -51,12 +51,12 @@ import org.apache.wss4j.stax.test.Callba import org.apache.wss4j.stax.test.saml.SAMLCallbackHandlerImpl; import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.ext.SecurePart; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java Wed Jun 19 10:27:50 2019 @@ -38,11 +38,11 @@ import org.apache.xml.security.stax.ext. import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory; import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class AsymmetricBindingTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java Wed Jun 19 10:27:50 2019 @@ -31,11 +31,11 @@ import org.apache.wss4j.stax.ext.WSSCons import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ContentEncryptedElementsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java Wed Jun 19 10:27:50 2019 @@ -36,11 +36,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class DerivedKeyTests extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java Wed Jun 19 10:27:50 2019 @@ -31,11 +31,11 @@ import org.apache.wss4j.stax.ext.WSSCons import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class EncryptedElementsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedPartsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedPartsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedPartsTest.java Wed Jun 19 10:27:50 2019 @@ -31,11 +31,11 @@ import org.apache.wss4j.stax.ext.WSSCons import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.xml.security.stax.ext.XMLSecurityConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class EncryptedPartsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/HttpsTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/HttpsTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/HttpsTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/HttpsTokenTest.java Wed Jun 19 10:27:50 2019 @@ -27,11 +27,11 @@ import org.apache.wss4j.stax.impl.securi import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class HttpsTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java Wed Jun 19 10:27:50 2019 @@ -45,11 +45,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class IssuedTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java Wed Jun 19 10:27:50 2019 @@ -35,10 +35,10 @@ import org.apache.xml.security.stax.ext. import org.apache.xml.security.stax.impl.util.IDGenerator; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class KerberosTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java Wed Jun 19 10:27:50 2019 @@ -36,11 +36,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class KeyValueTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java Wed Jun 19 10:27:50 2019 @@ -34,11 +34,11 @@ import org.apache.xml.security.stax.ext. import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ProtectionOrderTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java Wed Jun 19 10:27:50 2019 @@ -33,7 +33,7 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java Wed Jun 19 10:27:50 2019 @@ -28,10 +28,10 @@ import org.apache.wss4j.policy.stax.enfo import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityEvent.RequiredElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class RequiredElementsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java Wed Jun 19 10:27:50 2019 @@ -28,10 +28,10 @@ import org.apache.wss4j.policy.stax.enfo import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityEvent.RequiredPartSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class RequiredPartsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java Wed Jun 19 10:27:50 2019 @@ -39,11 +39,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SamlTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java Wed Jun 19 10:27:50 2019 @@ -35,11 +35,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SecureConversationTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java Wed Jun 19 10:27:50 2019 @@ -36,11 +36,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SecurityContextTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java Wed Jun 19 10:27:50 2019 @@ -31,11 +31,11 @@ import org.apache.wss4j.stax.ext.WSSCons import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SignedElementsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java Wed Jun 19 10:27:50 2019 @@ -31,11 +31,11 @@ import org.apache.wss4j.stax.ext.WSSCons import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; import org.apache.xml.security.stax.ext.XMLSecurityConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SignedPartsTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java Wed Jun 19 10:27:50 2019 @@ -33,7 +33,7 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SpnegoContextTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java Wed Jun 19 10:27:50 2019 @@ -48,11 +48,11 @@ import org.apache.wss4j.stax.securityEve import org.apache.wss4j.stax.securityEvent.X509TokenSecurityEvent; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.impl.util.IDGenerator; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SupportingTokensTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java Wed Jun 19 10:27:50 2019 @@ -38,11 +38,11 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory; import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SymmetricBindingTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java Wed Jun 19 10:27:50 2019 @@ -41,11 +41,11 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityToken.InboundSecurityToken; import org.apache.xml.security.stax.securityToken.SecurityToken; import org.apache.xml.security.stax.securityToken.SecurityTokenConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TokenProtectionTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java Wed Jun 19 10:27:50 2019 @@ -47,12 +47,12 @@ import org.apache.wss4j.stax.test.Callba import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java Wed Jun 19 10:27:50 2019 @@ -27,7 +27,7 @@ import org.apache.wss4j.stax.impl.securi import org.apache.wss4j.stax.securityEvent.*; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.namespace.QName; @@ -35,9 +35,9 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class TransportBindingTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java Wed Jun 19 10:27:50 2019 @@ -32,7 +32,7 @@ import org.apache.xml.security.stax.ext. import org.apache.xml.security.stax.impl.util.IDGenerator; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.namespace.QName; @@ -41,9 +41,9 @@ import java.time.ZonedDateTime; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class UsernameTokenTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java Wed Jun 19 10:27:50 2019 @@ -41,14 +41,14 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.xml.security.stax.ext.SecurePart; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class VulnerabliltyVectorsTest extends AbstractTestBase { @@ -58,7 +58,7 @@ public class VulnerabliltyVectorsTest ex * @Ignoring as SOAP Action spoofing detection should be left to the SOAP stack */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSOAPActionSpoofing() throws Exception { WSSSecurityProperties outSecurityProperties = new WSSSecurityProperties(); outSecurityProperties.setCallbackHandler(new CallbackHandlerImpl()); Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/WSP13SpecTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/WSP13SpecTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/WSP13SpecTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/WSP13SpecTest.java Wed Jun 19 10:27:50 2019 @@ -25,14 +25,14 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityEvent.SecurityEventConstants; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; import org.apache.wss4j.stax.test.InboundWSSecurityContextImplTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class WSP13SpecTest extends AbstractPolicyTestBase { Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java Wed Jun 19 10:27:50 2019 @@ -29,15 +29,15 @@ import org.apache.wss4j.stax.securityEve import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.namespace.QName; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class X509TokenTest extends AbstractPolicyTestBase {
