Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/pom.xml (original) +++ webservices/wss4j/trunk/ws-security-stax/pom.xml Wed Jun 19 10:27:50 2019 @@ -87,11 +87,17 @@ <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> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + <version>${junit.version}</version> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> <scope>test</scope>
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java Wed Jun 19 10:27:50 2019 @@ -84,13 +84,13 @@ import org.apache.xml.security.stax.impl import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventConstants; import org.apache.xml.security.stax.securityEvent.SecurityEventListener; -import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; public abstract class AbstractTestBase { @@ -109,7 +109,7 @@ public abstract class AbstractTestBase { WSSConfig.init(); } - @AfterClass + @AfterAll public static void cleanup() throws Exception { SecurityTestUtil.cleanup(); } Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java Wed Jun 19 10:27:50 2019 @@ -66,16 +66,16 @@ import org.apache.wss4j.stax.test.utils. import org.apache.xml.security.exceptions.XMLSecurityException; 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 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.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; public class AttachmentTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java Wed Jun 19 10:27:50 2019 @@ -29,12 +29,12 @@ import org.apache.wss4j.stax.securityTok import org.apache.wss4j.stax.setup.ConfigurationConverter; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.saml.SAMLCallbackHandlerImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; -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 the ConfigurationConverter utility Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java Wed Jun 19 10:27:50 2019 @@ -24,8 +24,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.Properties; @@ -66,40 +64,25 @@ import org.apache.wss4j.stax.test.utils. import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventConstants; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(value = org.junit.runners.Parameterized.class) public class DerivedKeyTokenTest extends AbstractTestBase { - final int version; - - public DerivedKeyTokenTest(int version) { - this.version = version; - } - - @BeforeClass + @BeforeAll public static void setUp() throws Exception { WSSConfig.init(); } - @Parameters(name = "{0}") - public static Collection<Object[]> data() { - - return Arrays.asList(new Object[][] {{ConversationConstants.VERSION_05_02}, - {ConversationConstants.VERSION_05_12} - }); - } - - @Test - public void testEncryptionDecryptionTRIPLEDESOutbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptionDecryptionTRIPLEDESOutbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); @@ -130,8 +113,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptionDecryptionTRIPLEDESInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptionDecryptionTRIPLEDESInbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -224,8 +208,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptionDecryptionTRIPLEDESInboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptionDecryptionTRIPLEDESInboundAction(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -301,8 +286,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptionDecryptionAES128Outbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptionDecryptionAES128Outbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); @@ -333,8 +319,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptionDecryptionAES128Inbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptionDecryptionAES128Inbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -389,8 +376,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptionDecryptionAES128InboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptionDecryptionAES128InboundAction(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -429,7 +417,8 @@ public class DerivedKeyTokenTest extends } } - @Test + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) public void testSignatureOutbound() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -463,8 +452,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureInbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -518,8 +508,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureInboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureInboundAction(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -557,8 +548,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureThumbprintSHA1Outbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureThumbprintSHA1Outbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); @@ -602,8 +594,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureThumbprintSHA1Inbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureThumbprintSHA1Inbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -650,8 +643,9 @@ public class DerivedKeyTokenTest extends } - @Test - public void testSignatureThumbprintSHA1InboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureThumbprintSHA1InboundAction(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -688,7 +682,8 @@ public class DerivedKeyTokenTest extends } } - @Test + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) public void testSignatureSKIOutbound() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -733,8 +728,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureSKIInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureSKIInbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -780,8 +776,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureSKIInboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureSKIInboundAction(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -819,8 +816,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureEncryptOutbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureEncryptOutbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); @@ -863,8 +861,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testSignatureEncryptInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSignatureEncryptInbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -989,8 +988,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptSignatureInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptSignatureInbound(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { @@ -1058,8 +1058,9 @@ public class DerivedKeyTokenTest extends } } - @Test - public void testEncryptSignatureInboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testEncryptSignatureInboundAction(int version) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Wed Jun 19 10:27:50 2019 @@ -81,16 +81,16 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityEvent.SecurityEventConstants; import org.apache.xml.security.utils.XMLUtils; import org.bouncycastle.jce.provider.BouncyCastleProvider; -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 org.w3c.dom.NodeList; -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 EncDecryptionTest extends AbstractTestBase { @@ -2252,7 +2252,7 @@ public class EncDecryptionTest extends A } @Test - @org.junit.Ignore //WSS4J does not support OAEPParams atm + @org.junit.jupiter.api.Disabled //WSS4J does not support OAEPParams atm public void testKeyWrappingRSAOAEPAESGCM192SHA384MGF1SHA384PSourceInbound() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java Wed Jun 19 10:27:50 2019 @@ -31,15 +31,15 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -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; /** * This is a test for Certificate Revocation List checking before encryption. @@ -101,7 +101,7 @@ public class EncryptionCRLTest extends A * TODO Re-enable once CRL issue fixed */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testEncryptionWithRevocationCheck() throws Exception { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java Wed Jun 19 10:27:50 2019 @@ -35,11 +35,11 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class FaultTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java Wed Jun 19 10:27:50 2019 @@ -48,11 +48,11 @@ import org.apache.wss4j.stax.test.utils. import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventListener; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HeaderOrderingTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java Wed Jun 19 10:27:50 2019 @@ -65,15 +65,15 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityEvent.SecurityEventListener; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; -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; public class InboundWSSecurityContextImplTest { - @BeforeClass + @BeforeAll public static void setUp() throws Exception { WSProviderConfig.init(); Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java Wed Jun 19 10:27:50 2019 @@ -62,7 +62,7 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityEvent.SecurityEventListener; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -70,11 +70,11 @@ import org.w3c.dom.NamedNodeMap; 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; public class InteroperabilityTest extends AbstractTestBase { @@ -1312,7 +1312,7 @@ public class InteroperabilityTest extend StringWriter stringWriter = new StringWriter(); PrintWriter pw = new PrintWriter(stringWriter); ex.printStackTrace(pw); - assertFalse(stringWriter.toString(), t instanceof NullPointerException); + assertFalse(t instanceof NullPointerException, stringWriter.toString()); t = t.getCause(); } } Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java Wed Jun 19 10:27:50 2019 @@ -35,15 +35,15 @@ import org.apache.wss4j.stax.setup.WSSec import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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.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; /** * A test for 2x Signatures + 2x Encryption. This is not supported for now, but these tests are mainly to @@ -52,7 +52,7 @@ import static org.junit.Assert.fail; public class MultipleActionTest extends AbstractTestBase { @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testTwoSignatureActions() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -93,7 +93,7 @@ public class MultipleActionTest extends } @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testTwoEncryptionActions() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java Wed Jun 19 10:27:50 2019 @@ -34,14 +34,14 @@ import org.apache.wss4j.stax.setup.Outbo import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -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.fail; public class OutputChainTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java Wed Jun 19 10:27:50 2019 @@ -41,16 +41,16 @@ import org.apache.wss4j.stax.setup.Outbo import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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 org.w3c.dom.NodeList; -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; /** * This is a test for signing and encrypting using a Crypto properties file with an encrypted Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java Wed Jun 19 10:27:50 2019 @@ -36,15 +36,15 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; -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.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; /** * This is a test for processing a Username Token to enforce either a plaintext or digest Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java Wed Jun 19 10:27:50 2019 @@ -46,11 +46,11 @@ import org.apache.wss4j.stax.ext.WSSCons import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.test.saml.SAML1CallbackHandler; import org.apache.wss4j.stax.test.utils.StAX2DOM; -import org.junit.Test; +import org.junit.jupiter.api.Test; -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; /** * A test for various Principals... Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java Wed Jun 19 10:27:50 2019 @@ -44,14 +44,14 @@ import org.apache.wss4j.stax.test.utils. import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.utils.XMLUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -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 ReplayTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java Wed Jun 19 10:27:50 2019 @@ -23,8 +23,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.Properties; @@ -62,39 +60,24 @@ import org.apache.wss4j.stax.test.utils. import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(value = org.junit.runners.Parameterized.class) public class SecurityContextTokenTest extends AbstractTestBase { - final int version; - - public SecurityContextTokenTest(int version) { - this.version = version; - } - - @Parameters(name = "{0}") - public static Collection<Object[]> data() { - - return Arrays.asList(new Object[][] {{ConversationConstants.VERSION_05_02}, - {ConversationConstants.VERSION_05_12} - }); - } - - @BeforeClass + @BeforeAll public static void setUp() throws Exception { WSSConfig.init(); } - @Test - public void testSCTDKTEncryptOutbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTDKTEncryptOutbound(int version) throws Exception { byte[] secret = WSSConstants.generateBytes(128 / 8); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -137,8 +120,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTDKTEncryptInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTDKTEncryptInbound(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -223,8 +207,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTDKTEncryptInboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTDKTEncryptInboundAction(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -304,8 +289,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTKDKTSignOutbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTSignOutbound(int version) throws Exception { byte[] secret = WSSConstants.generateBytes(128 / 8); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -347,8 +333,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTKDKTSignInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTSignInbound(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -441,8 +428,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTKDKTSignInboundAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTSignInboundAction(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -530,8 +518,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTKDKTSignAbsoluteInbound() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTSignAbsoluteInbound(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -577,8 +566,9 @@ public class SecurityContextTokenTest ex } } - @Test() - public void testSCTKDKTSignEncrypt() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTSignEncrypt(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -701,8 +691,9 @@ public class SecurityContextTokenTest ex } } - @Test() - public void testSCTKDKTSignEncryptAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTSignEncryptAction(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -800,8 +791,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTKDKTEncryptSign() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTEncryptSign(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -924,8 +916,9 @@ public class SecurityContextTokenTest ex } } - @Test - public void testSCTKDKTEncryptSignAction() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTKDKTEncryptSignAction(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -1024,8 +1017,9 @@ public class SecurityContextTokenTest ex } - @Test - public void testSCTSign() throws Exception { + @ParameterizedTest + @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12}) + public void testSCTSign(int version) throws Exception { byte[] tempSecret = WSSecurityUtil.generateNonce(16); ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java Wed Jun 19 10:27:50 2019 @@ -39,14 +39,14 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -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; /** * This is a test for Certificate Revocation List checking. A message is signed and sent to the @@ -83,7 +83,7 @@ public class SignatureCRLTest extends Ab * TODO Re-enable once CRL issue fixed */ @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSignatureDirectReference() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java Wed Jun 19 10:27:50 2019 @@ -41,13 +41,13 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -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; /** * A set of test-cases for signing and verifying SOAP requests, where the certificate used to Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java Wed Jun 19 10:27:50 2019 @@ -47,16 +47,16 @@ import org.apache.wss4j.stax.test.utils. import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventListener; -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.assertNotNull; -import static org.junit.Assert.assertNotSame; -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.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SignatureConfirmationTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java Wed Jun 19 10:27:50 2019 @@ -60,12 +60,12 @@ import org.apache.xml.security.stax.impl import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityToken.OutboundSecurityToken; import org.apache.xml.security.stax.securityToken.SecurityTokenProvider; -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.jupiter.api.Assertions.assertEquals; public class SignatureEncryptionTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java Wed Jun 19 10:27:50 2019 @@ -41,13 +41,13 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -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; /** * A set of test-cases for signing and verifying SOAP requests, where the certificate used to Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignaturePrefixListTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignaturePrefixListTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignaturePrefixListTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignaturePrefixListTest.java Wed Jun 19 10:27:50 2019 @@ -34,14 +34,14 @@ import org.apache.wss4j.stax.setup.Outbo import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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.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; /** * A test-case for WSS-626 - "Duplicates in the PrefixList". Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java Wed Jun 19 10:27:50 2019 @@ -69,18 +69,18 @@ import org.apache.xml.security.exception import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; -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 org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +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 SignatureTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java Wed Jun 19 10:27:50 2019 @@ -50,17 +50,17 @@ import org.apache.wss4j.stax.setup.WSSec import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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 org.w3c.dom.NodeList; -import static org.junit.Assert.fail; -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.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; public class TimestampTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java Wed Jun 19 10:27:50 2019 @@ -58,15 +58,15 @@ import org.apache.xml.security.exception import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEventListener; import org.apache.xml.security.utils.XMLUtils; -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.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 UsernameTokenTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java Wed Jun 19 10:27:50 2019 @@ -44,17 +44,17 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.WSSec; import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.config.TransformerAlgorithmMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; 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.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; public class VulnerabliltyVectorsTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java Wed Jun 19 10:27:50 2019 @@ -52,22 +52,22 @@ import org.apache.wss4j.stax.ext.WSSSecu import org.apache.wss4j.stax.setup.InboundWSSec; import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; -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 org.w3c.dom.NodeList; -import static org.junit.Assert.assertNotNull; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test for processing an xop:Include inside a CipherValue Element * TODO Not supported yet. */ [email protected] [email protected] public class XOPAttachmentTest extends AbstractTestBase { public XOPAttachmentTest() throws Exception { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java Wed Jun 19 10:27:50 2019 @@ -31,7 +31,7 @@ import org.apache.wss4j.stax.setup.WSSec import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.opensaml.core.xml.schema.XSAny; import org.opensaml.core.xml.schema.impl.XSAnyBuilder; import org.opensaml.saml.saml2.core.*; @@ -50,7 +50,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests related to handling of custom contents in SAML data structures. Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java Wed Jun 19 10:27:50 2019 @@ -61,12 +61,12 @@ import org.apache.wss4j.stax.test.utils. import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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.jupiter.api.Assertions.assertEquals; public class SAMLTokenHOKTest extends AbstractTestBase { @@ -467,7 +467,7 @@ public class SAMLTokenHOKTest extends Ab // TODO Not working with OpenSAML 3.0 upgrade @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSAML1AttrAssertionInbound() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -967,7 +967,7 @@ public class SAMLTokenHOKTest extends Ab // TODO Not working with OpenSAML 3.0 upgrade @Test - @org.junit.Ignore + @org.junit.jupiter.api.Disabled public void testSAML2AttrAssertionInbound() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java Wed Jun 19 10:27:50 2019 @@ -38,14 +38,14 @@ import org.apache.wss4j.stax.setup.Inbou import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.utils.StAX2DOM; -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.assertNotNull; -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.fail; public class SAMLTokenNegativeTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java Wed Jun 19 10:27:50 2019 @@ -64,13 +64,13 @@ import org.apache.wss4j.stax.test.utils. import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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 org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SAMLTokenReferenceTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java Wed Jun 19 10:27:50 2019 @@ -51,14 +51,14 @@ import org.apache.wss4j.stax.test.utils. import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.stax.securityEvent.SecurityEvent; -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.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; public class SAMLTokenSVTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Wed Jun 19 10:27:50 2019 @@ -72,7 +72,7 @@ import org.apache.xml.security.exception import org.apache.xml.security.keys.KeyInfo; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.joda.time.DateTime; -import org.junit.Test; +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; @@ -84,9 +84,9 @@ import org.w3c.dom.Document; 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.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SAMLTokenTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java Wed Jun 19 10:27:50 2019 @@ -39,14 +39,14 @@ import org.apache.wss4j.stax.setup.WSSec import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.joda.time.DateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; 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.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.fail; /** * Some tests for SAML Authentication Assertions Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java Wed Jun 19 10:27:50 2019 @@ -49,15 +49,15 @@ import org.apache.wss4j.stax.test.utils. import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.joda.time.DateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.opensaml.saml.config.SAMLConfigurationSupport; 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.assertNotNull; -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.fail; public class SamlConditionsTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java Wed Jun 19 10:27:50 2019 @@ -50,12 +50,12 @@ import org.apache.wss4j.stax.test.Abstra import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.wss4j.stax.test.utils.SOAPUtil; import org.apache.wss4j.stax.test.utils.StAX2DOM; -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.jupiter.api.Assertions.assertEquals; public class SamlTokenDerivedTest extends AbstractTestBase {
