Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java Wed Jun 19 10:27:50 2019 @@ -37,7 +37,8 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; -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; @@ -46,9 +47,9 @@ import java.util.List; import javax.security.auth.callback.CallbackHandler; -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 CertificateStore Crypto instance. This class does not know anything @@ -62,7 +63,7 @@ public class CertificateStoreTest { private Crypto receiverCrypto; private CallbackHandler keystoreCallbackHandler = new KeystoreCallbackHandler(); - @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/components/crypto/CryptoProviderTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java Wed Jun 19 10:27:50 2019 @@ -33,7 +33,8 @@ import org.apache.wss4j.dom.message.WSSe import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; import org.bouncycastle.jce.provider.BouncyCastleProvider; -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; @@ -47,8 +48,8 @@ import java.security.Security; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -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 test for WSS-86 - "CryptoBase.splitAndTrim does not take into account the format of a @@ -75,7 +76,7 @@ public class CryptoProviderTest { crypto = CryptoFactory.getInstance("wss86.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/components/crypto/CryptoTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java Wed Jun 19 10:27:50 2019 @@ -36,13 +36,14 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; -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.assertSame; -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.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class CryptoTest { @@ -50,7 +51,7 @@ public class CryptoTest { WSSConfig.init(); } - @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/components/crypto/WSSConfigTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java Wed Jun 19 10:27:50 2019 @@ -23,10 +23,10 @@ import java.security.Security; import org.apache.wss4j.common.crypto.WSProviderConfig; import org.apache.wss4j.dom.engine.WSSConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * Test loading and removing security providers via WSSConfig Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java Wed Jun 19 10:27:50 2019 @@ -27,13 +27,14 @@ import org.apache.wss4j.dom.common.SOAPU import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; 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.apache.wss4j.common.util.XMLUtils; import org.w3c.dom.Document; import javax.security.auth.callback.CallbackHandler; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test case for WSS-245 - "WSHandlerConstants.PW_CALLBACK_REF isn't correctly searched for" @@ -45,7 +46,7 @@ public class CallbackRefTest { org.slf4j.LoggerFactory.getLogger(CallbackRefTest.class); 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/handler/CustomActionProcessorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java Wed Jun 19 10:27:50 2019 @@ -35,15 +35,16 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.message.WSSecSignature; 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.util.Collections; 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; /** @@ -54,7 +55,7 @@ public class CustomActionProcessorTest { org.slf4j.LoggerFactory.getLogger(CustomActionProcessorTest.class); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -107,7 +108,7 @@ public class CustomActionProcessorTest { found = true; } } - assertTrue("Unable to find result from CustomProcessor", found); + assertTrue(found, "Unable to find result from CustomProcessor"); } /** @@ -151,7 +152,7 @@ public class CustomActionProcessorTest { found = true; } } - assertTrue("Unable to find result from CustomProcessor", found); + assertTrue(found, "Unable to find result from CustomProcessor"); } /** Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java Wed Jun 19 10:27:50 2019 @@ -39,11 +39,12 @@ import org.apache.wss4j.dom.engine.WSSec import org.apache.wss4j.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.token.Timestamp; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** @@ -53,7 +54,7 @@ public class CustomTokenTest { private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(CustomTokenTest.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/handler/ResultsOrderTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java Wed Jun 19 10:27:50 2019 @@ -23,10 +23,11 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.CustomHandler; import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSecurityEngineResult; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -35,7 +36,7 @@ import static org.junit.Assert.assertTru */ public class ResultsOrderTest { - @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/handler/SecurityActionTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java Wed Jun 19 10:27:50 2019 @@ -46,8 +46,9 @@ import org.apache.wss4j.dom.common.Secur import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.xml.security.stax.impl.util.IDGenerator; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; @@ -61,12 +62,12 @@ public class SecurityActionTokenTest { private Crypto crypto; private byte[] keyData; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } - @Before + @BeforeEach public void setUp() throws Exception { KeyGenerator keyGen = KeyGenerator.getInstance("AES"); keyGen.init(128); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java Wed Jun 19 10:27:50 2019 @@ -41,14 +41,15 @@ import org.apache.wss4j.dom.engine.WSSec import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.token.SignatureConfirmation; 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; -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.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; /** * A set of test-cases for SignatureConfirmation. @@ -60,7 +61,7 @@ public class SignatureConfirmationTest { 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/handler/SignatureUTAliasTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java Wed Jun 19 10:27:50 2019 @@ -33,7 +33,8 @@ import org.apache.wss4j.dom.common.SOAPU import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; 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.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.util.XMLUtils; @@ -49,7 +50,7 @@ public class SignatureUTAliasTest implem org.slf4j.LoggerFactory.getLogger(SignatureUTAliasTest.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/handler/UseReqSigCertTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java Wed Jun 19 10:27:50 2019 @@ -32,7 +32,8 @@ import org.apache.wss4j.dom.common.SOAPU import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; 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.w3c.dom.Document; @@ -44,7 +45,7 @@ public class UseReqSigCertTest { private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(UseReqSigCertTest.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/handler/WSHandlerGetPasswordTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java Wed Jun 19 10:27:50 2019 @@ -27,14 +27,15 @@ import org.apache.wss4j.dom.common.SOAPU import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler; 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.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.util.XMLUtils; import org.w3c.dom.Document; import javax.security.auth.callback.CallbackHandler; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * WS-Security Test Case for the getPassword method in WSHandler. @@ -45,7 +46,7 @@ public class WSHandlerGetPasswordTest { org.slf4j.LoggerFactory.getLogger(WSHandlerGetPasswordTest.class); 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/message/AttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java Wed Jun 19 10:27:50 2019 @@ -55,15 +55,15 @@ 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.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -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; public class AttachmentTest { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java Wed Jun 19 10:27:50 2019 @@ -23,14 +23,15 @@ 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.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.util.KeyUtils; 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; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; @@ -42,7 +43,7 @@ import javax.crypto.SecretKey; */ public class CertErrorTest { - @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/DerivedKeyActionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java Wed Jun 19 10:27:50 2019 @@ -44,10 +44,11 @@ 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.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A set of tests for using a derived key for encryption/signature using WSHandler actions. @@ -58,7 +59,7 @@ public class DerivedKeyActionTest { 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/DerivedKeyTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java Wed Jun 19 10:27:50 2019 @@ -27,7 +27,8 @@ import org.apache.wss4j.dom.engine.WSSCo import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.engine.WSSecurityEngineResult; 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.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; @@ -42,9 +43,9 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.security.auth.callback.CallbackHandler; -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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A set of tests for using a derived key for encryption/signature. @@ -56,7 +57,7 @@ public class DerivedKeyTest { 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/EncryptedDataInHeaderTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java Wed Jun 19 10:27:50 2019 @@ -37,12 +37,13 @@ import org.apache.wss4j.common.crypto.Cr import org.apache.wss4j.common.util.KeyUtils; 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 org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * This test encrypts a Timestamp and the SOAP Body, and appends the ReferenceList Element after the @@ -58,7 +59,7 @@ public class EncryptedDataInHeaderTest { 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/EncryptionAlgorithmSuiteTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java Wed Jun 19 10:27:50 2019 @@ -38,12 +38,13 @@ import org.apache.wss4j.dom.engine.WSSec import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; 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; -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 encrypting and decrypting SOAP requests when specifying an @@ -55,7 +56,7 @@ public class EncryptionAlgorithmSuiteTes 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/EncryptionCRLTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java Wed Jun 19 10:27:50 2019 @@ -39,11 +39,12 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.handler.HandlerAction; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +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; /** @@ -59,7 +60,7 @@ public class EncryptionCRLTest { private CallbackHandler keystoreCallbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -73,7 +74,7 @@ public class EncryptionCRLTest { * * @throws java.lang.Exception Thrown when there is a problem in setup */ - @Before + @BeforeEach public void setUp() throws Exception { secEngine.setWssConfig(WSSConfig.getNewInstance()); } @@ -126,7 +127,7 @@ public class EncryptionCRLTest { * TODO Re-enable once CRL issue fixed */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testEncryptionWithRevocationCheck() throws Exception { final WSSConfig cfg = WSSConfig.getNewInstance(); final RequestData reqData = new RequestData(); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java Wed Jun 19 10:27:50 2019 @@ -39,17 +39,18 @@ import org.apache.wss4j.common.util.KeyU import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import java.util.ArrayList; 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; /** * A set of test-cases for encrypting and decrypting SOAP requests using GCM. See: @@ -68,7 +69,7 @@ public class EncryptionGCMTest { private CallbackHandler keystoreCallbackHandler = new KeystoreCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -82,7 +83,7 @@ public class EncryptionGCMTest { * * @throws java.lang.Exception Thrown when there is a problem in setup */ - @Before + @BeforeEach public void setUp() throws Exception { secEngine.setWssConfig(WSSConfig.getNewInstance()); } Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java Wed Jun 19 10:27:50 2019 @@ -36,7 +36,8 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.common.util.KeyUtils; 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 org.w3c.dom.Document; import org.w3c.dom.Element; @@ -47,11 +48,11 @@ import javax.xml.namespace.QName; 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.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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * This is some unit tests for encryption using encryption using parts. Note that the "soapMsg" below @@ -87,7 +88,7 @@ public class EncryptionPartsTest { 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/EncryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java Wed Jun 19 10:27:50 2019 @@ -53,16 +53,17 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +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.assertFalse; -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.assertFalse; +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 set of test-cases for encrypting and decrypting SOAP requests. @@ -83,7 +84,7 @@ public class EncryptionTest { private SecretKey key; private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -97,7 +98,7 @@ public class EncryptionTest { * * @throws java.lang.Exception Thrown when there is a problem in setup */ - @Before + @BeforeEach public void setUp() throws Exception { KeyGenerator keyGen = KeyGenerator.getInstance("AES"); keyGen.init(128); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java Wed Jun 19 10:27:50 2019 @@ -50,13 +50,14 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.saml.WSSecSignatureSAML; import org.apache.wss4j.dom.util.SignatureUtils; 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; import org.w3c.dom.Node; -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 class tests the modification of requests. @@ -81,7 +82,7 @@ public class ModifiedRequestTest { 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/NoSoapPrefixSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java Wed Jun 19 10:27:50 2019 @@ -24,7 +24,8 @@ import org.apache.wss4j.dom.common.SOAPU import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; 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.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.util.XMLUtils; @@ -40,7 +41,7 @@ public class NoSoapPrefixSignatureTest { 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/message/PasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java Wed Jun 19 10:27:50 2019 @@ -44,10 +44,11 @@ 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 org.w3c.dom.Document; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** @@ -64,7 +65,7 @@ public class PasswordEncryptorTest { new JasyptPasswordEncryptor("this-is-a-secret"); 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/PasswordTypeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java Wed Jun 19 10:27:50 2019 @@ -32,13 +32,14 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.handler.HandlerAction; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; -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.CallbackHandler; -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 test for processing a Username Token to enforce either a plaintext or digest @@ -49,7 +50,7 @@ public class PasswordTypeTest { org.slf4j.LoggerFactory.getLogger(PasswordTypeTest.class); 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/message/ReplayTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java Wed Jun 19 10:27:50 2019 @@ -47,12 +47,13 @@ import org.apache.wss4j.dom.handler.Requ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.validate.SamlAssertionValidator; -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 test-cases for replay attacks. @@ -64,7 +65,7 @@ public class ReplayTest { 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/RequireSignedEncryptedDataElementsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java Wed Jun 19 10:27:50 2019 @@ -44,13 +44,14 @@ 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.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; -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; /** * Tests for the WSHandlerConstants.REQUIRE_SIGNED_ENCRYPTED_DATA_ELEMENTS option. @@ -77,7 +78,7 @@ public class RequireSignedEncryptedDataE 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/SKISignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java Wed Jun 19 10:27:50 2019 @@ -30,11 +30,12 @@ import org.apache.wss4j.common.crypto.Cr import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; -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; /** * WS-Security Test Case for SubjectKeyIdentifier. @@ -45,7 +46,7 @@ public class SKISignatureTest { 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/message/STRSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java Wed Jun 19 10:27:50 2019 @@ -22,7 +22,8 @@ package org.apache.wss4j.dom.message; import org.apache.wss4j.dom.SOAPConstants; import org.apache.wss4j.dom.WSConstants; 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.apache.wss4j.dom.common.SOAPUtil; import org.apache.wss4j.dom.common.SecurityTestUtil; import org.apache.wss4j.dom.engine.WSSConfig; @@ -43,7 +44,7 @@ public class STRSignatureTest { 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/message/SecurityContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java Wed Jun 19 10:27:50 2019 @@ -34,12 +34,13 @@ import org.apache.wss4j.common.derivedKe import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.message.token.SecurityContextToken; 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 set of tests for SecurityContextTokens. @@ -55,7 +56,7 @@ public class SecurityContextTokenTest { crypto = CryptoFactory.getInstance("wss40.properties"); } - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -80,12 +81,12 @@ public class SecurityContextTokenTest { } assertTrue( - "SecurityContextToken missing", - out.indexOf(ConversationConstants.SECURITY_CONTEXT_TOKEN_LN) > 0 + out.indexOf(ConversationConstants.SECURITY_CONTEXT_TOKEN_LN) > 0, + "SecurityContextToken missing" ); assertTrue( - "wsc:Identifier missing", - out.indexOf(ConversationConstants.IDENTIFIER_LN) > 0 + out.indexOf(ConversationConstants.IDENTIFIER_LN) > 0, + "wsc:Identifier missing" ); } catch (Exception e) { Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java Wed Jun 19 10:27:50 2019 @@ -35,10 +35,11 @@ import org.apache.wss4j.dom.engine.WSSCo import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.engine.WSSecurityEngineResult; 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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** @@ -50,7 +51,7 @@ public class SignatureAKITest { 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/message/SignatureAlgorithmSuiteTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java Wed Jun 19 10:27:50 2019 @@ -43,12 +43,13 @@ import org.apache.wss4j.dom.engine.WSSec import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; 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; -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 when specifying an @@ -60,7 +61,7 @@ public class SignatureAlgorithmSuiteTest 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/SignatureCRLTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java Wed Jun 19 10:27:50 2019 @@ -34,13 +34,14 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; 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; -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 Certificate Revocation List checking. A message is signed and sent to the @@ -74,7 +75,7 @@ public class SignatureCRLTest { private Crypto crypto; private Crypto cryptoCA; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -91,7 +92,7 @@ public class SignatureCRLTest { * TODO Re-enable once CRL issue fixed */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSignatureDirectReference() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); WSSecHeader secHeader = new WSSecHeader(doc); @@ -125,7 +126,7 @@ public class SignatureCRLTest { * TODO Re-enable once CRL issue fixed */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSignatureDirectReferenceRevocation() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); WSSecHeader secHeader = new WSSecHeader(doc); @@ -163,7 +164,7 @@ public class SignatureCRLTest { * TODO Re-enable once CRL issue fixed */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSignatureDirectReferenceRevocationKeyStore() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG); WSSecHeader secHeader = new WSSecHeader(doc); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java Wed Jun 19 10:27:50 2019 @@ -34,12 +34,13 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; 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; -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; /** @@ -52,7 +53,7 @@ public class SignatureCertConstraintsTes private Crypto crypto; private Crypto cryptoCA; - @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/SignatureCertTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Wed Jun 19 10:27:50 2019 @@ -35,16 +35,17 @@ 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 org.w3c.dom.Document; import java.security.cert.X509Certificate; import java.util.Collections; import java.util.Properties; -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 WSS-40. Essentially it just tests that a message is signed using a @@ -81,7 +82,7 @@ public class SignatureCertTest { private Crypto crypto; private Crypto cryptoCA; - @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/SignatureEncryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java Wed Jun 19 10:27:50 2019 @@ -32,7 +32,8 @@ 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 org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; @@ -48,10 +49,10 @@ import javax.xml.crypto.dsig.SignatureMe import java.util.List; import java.util.ArrayList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -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.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A set of tests for combined signature/encryption, verification/decryption. @@ -88,7 +89,7 @@ public class SignatureEncryptionTest { 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/SignatureIssuerCertConstraintsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java Wed Jun 19 10:27:50 2019 @@ -34,12 +34,13 @@ import org.apache.wss4j.dom.engine.WSSec import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerResult; 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; -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; /** @@ -52,7 +53,7 @@ public class SignatureIssuerCertConstrai private Crypto crypto; private Crypto cryptoCA; - @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/SignatureKeyValueTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java Wed Jun 19 10:27:50 2019 @@ -36,11 +36,12 @@ import org.apache.wss4j.dom.engine.WSSec import org.apache.wss4j.dom.engine.WSSecurityEngineResult; 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 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 class tests signing where the the public key is transmitted in the message via @@ -52,7 +53,7 @@ public class SignatureKeyValueTest { org.slf4j.LoggerFactory.getLogger(SignatureKeyValueTest.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/SignaturePartsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java Wed Jun 19 10:27:50 2019 @@ -47,7 +47,8 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.saml.SignedSamlTokenHOKTest; import org.apache.wss4j.dom.saml.WSSecSignatureSAML; 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; @@ -58,11 +59,11 @@ import java.util.List; import javax.xml.namespace.QName; -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.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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * This is some unit tests for signing using signature parts. Note that the "soapMsg" below @@ -94,7 +95,7 @@ public class SignaturePartsTest { private WSSecurityEngine secEngine = new WSSecurityEngine(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -562,7 +563,7 @@ public class SignaturePartsTest { } @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSignedKeyInfo() throws Exception { Document doc = SOAPUtil.toSOAPPart(SOAPMSG); WSSecHeader secHeader = new WSSecHeader(doc); @@ -620,7 +621,7 @@ public class SignaturePartsTest { } @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSignedKeyInfoAction() throws Exception { final WSSConfig cfg = WSSConfig.getNewInstance(); final RequestData reqData = new RequestData(); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java Wed Jun 19 10:27:50 2019 @@ -43,12 +43,13 @@ import org.apache.wss4j.dom.engine.WSSCo import org.apache.wss4j.dom.engine.WSSecurityEngine; import org.apache.wss4j.dom.engine.WSSecurityEngineResult; 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 org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** @@ -61,7 +62,7 @@ public class SignaturePrefixListTest { 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/message/SignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java Wed Jun 19 10:27:50 2019 @@ -58,14 +58,15 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE; 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; import org.w3c.dom.Node; -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; /** @@ -79,7 +80,7 @@ public class SignatureTest { 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/SignatureWSS651Test.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java Wed Jun 19 10:27:50 2019 @@ -31,7 +31,8 @@ import org.apache.wss4j.dom.common.Secur import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.wss4j.dom.engine.WSSecurityEngine; 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; @@ -60,7 +61,7 @@ public class SignatureWSS651Test { 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/message/SignedBSTTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java Wed Jun 19 10:27:50 2019 @@ -40,11 +40,12 @@ 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.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.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * This is a test for signing the SOAP Body as well as the BinarySecurityToken that contains the certificate @@ -56,7 +57,7 @@ public class SignedBSTTest { 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/message/SymmetricSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java Wed Jun 19 10:27:50 2019 @@ -45,8 +45,9 @@ import org.apache.wss4j.common.util.XMLU import org.apache.wss4j.dom.handler.HandlerAction; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; @@ -64,7 +65,7 @@ public class SymmetricSignatureTest impl private byte[] keyData; private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -80,7 +81,7 @@ public class SymmetricSignatureTest impl * * @throws Exception Thrown when there is a problem in setup */ - @Before + @BeforeEach public void setUp() throws Exception { KeyGenerator keyGen = KeyGenerator.getInstance("AES"); keyGen.init(128); Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java Wed Jun 19 10:27:50 2019 @@ -29,6 +29,7 @@ import javax.xml.transform.TransformerEx import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.common.SecurityTestUtil; +import org.junit.jupiter.api.AfterAll; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -41,7 +42,7 @@ import org.w3c.dom.NodeList; public class TestMessageTransformer { private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(TestMessageTransformer.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/TimestampTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java Wed Jun 19 10:27:50 2019 @@ -43,13 +43,14 @@ import org.apache.wss4j.dom.handler.Requ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.token.Timestamp; import org.apache.wss4j.dom.validate.NoOpValidator; -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.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; /** * WS-Security Test Case for Timestamps. @@ -59,7 +60,7 @@ public class TimestampTest { org.slf4j.LoggerFactory.getLogger(TimestampTest.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/UTDerivedKeyTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java Wed Jun 19 10:27:50 2019 @@ -21,7 +21,6 @@ package org.apache.wss4j.dom.message; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.util.Arrays; import java.util.Collections; import javax.security.auth.callback.CallbackHandler; @@ -45,12 +44,14 @@ import org.apache.wss4j.dom.handler.Requ import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.token.UsernameToken; 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.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * WS-Security Test Case for UsernameToken Key Derivation, as defined in the @@ -63,7 +64,7 @@ public class UTDerivedKeyTest { private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler(); private Crypto crypto; - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -130,7 +131,7 @@ public class UTDerivedKeyTest { int iteration = 1049; byte[] expectedDerivedKey = org.apache.xml.security.utils.XMLUtils.decode("C7Ll/OY4TECb6hZuMMiX/5hzszo="); byte[] derivedKey = UsernameTokenUtil.generateDerivedKey(passwordHash, salt, iteration); - assertTrue("the derived key is not as expected", Arrays.equals(expectedDerivedKey, derivedKey)); + assertArrayEquals(expectedDerivedKey, derivedKey, "the derived key is not as expected"); } /** Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java Wed Jun 19 10:27:50 2019 @@ -36,16 +36,17 @@ 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 org.w3c.dom.Document; import javax.security.auth.callback.CallbackHandler; import java.util.Collections; -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; /** * WS-Security Test Case for UsernameToken Key Derivation, as defined in the @@ -61,7 +62,7 @@ public class UTSignatureTest { private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler(); 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/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java Wed Jun 19 10:27:50 2019 @@ -52,17 +52,18 @@ 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.token.UsernameToken; -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; import org.w3c.dom.NodeList; -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.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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * WS-Security Test Case for UsernameTokens. @@ -123,7 +124,7 @@ public class UsernameTokenTest implement private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler(); - @org.junit.AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } @@ -177,7 +178,7 @@ public class UsernameTokenTest implement String expectedPasswordDigest = "C0rena/6gKpRZ9ATj+e6ss5sAbQ="; byte[] decodedNonce = org.apache.xml.security.utils.XMLUtils.decode(nonce); String actualPasswordDigest = UsernameTokenUtil.doPasswordDigest(decodedNonce, created, passwordHash); - assertEquals("the password digest is not as expected", expectedPasswordDigest, actualPasswordDigest); + assertEquals(expectedPasswordDigest, actualPasswordDigest, "the password digest is not as expected"); } /** Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java Wed Jun 19 10:27:50 2019 @@ -50,13 +50,13 @@ 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.util.WSSecurityUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -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 for creating / processing an xop:Include inside a CipherValue Element
