You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2019/01/03 11:48:58 UTC
svn commit: r1850227 [3/11] - in /webservices/wss4j/trunk: build-tools/
integration/src/test/java/org/apache/wss4j/integration/test/kerberos/
performance/src/test/java/org/apache/wss4j/performance/
policy/src/test/java/org/apache/wss4j/policy/tests/ ws...
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -38,12 +38,16 @@ import org.apache.wss4j.dom.handler.Requ
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This class tests signing where the the public key is transmitted in the message via
* a ds:KeyInfo/ds:KeyValue element. Although this isn't strictly recommended for use in
* WS-Security, it's necessary to support it for WCF interop.
*/
-public class SignatureKeyValueTest extends org.junit.Assert {
+public class SignatureKeyValueTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureKeyValueTest.class);
private Crypto crypto;
@@ -177,4 +181,4 @@ public class SignatureKeyValueTest exten
assertTrue(publicKey instanceof java.security.interfaces.DSAPublicKey);
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -58,11 +58,17 @@ 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;
+
/**
* This is some unit tests for signing using signature parts. Note that the "soapMsg" below
* has a custom header added.
*/
-public class SignaturePartsTest extends org.junit.Assert {
+public class SignaturePartsTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignaturePartsTest.class);
private static final String SOAPMSG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
@@ -670,4 +676,4 @@ public class SignaturePartsTest extends
return results;
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -47,11 +47,14 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* A test-case for WSS-626 - "Duplicates in the PrefixList".
*/
-public class SignaturePrefixListTest extends org.junit.Assert {
+public class SignaturePrefixListTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignaturePrefixListTest.class);
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -63,11 +63,15 @@ 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;
+
/**
* A set of test-cases for signing and verifying SOAP requests.
*/
-public class SignatureTest extends org.junit.Assert {
+public class SignatureTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureTest.class);
@@ -1058,4 +1062,4 @@ public class SignatureTest extends org.j
return secEngine.processSecurityHeader(doc, null, null, crypto);
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -43,11 +43,14 @@ import org.apache.wss4j.dom.util.WSSecur
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* This is a test for signing the SOAP Body as well as the BinarySecurityToken that contains the certificate
* used to verify the signature.
*/
-public class SignedBSTTest extends org.junit.Assert {
+public class SignedBSTTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignedBSTTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -179,4 +182,4 @@ public class SignedBSTTest extends org.j
return results;
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -55,7 +55,7 @@ import org.w3c.dom.Document;
* Demonstrates that Signature Crypto object can have null values when
* calling processSecurityHeader method of WSSecurityEngine.
*/
-public class SymmetricSignatureTest extends org.junit.Assert implements CallbackHandler {
+public class SymmetricSignatureTest implements CallbackHandler {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SymmetricSignatureTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -38,7 +38,7 @@ import org.w3c.dom.NodeList;
* Applies message transformations to the tests in
* org.apache.wss4j.dom.message.RequireSignedEncryptedDataElementsTest
*/
-public class TestMessageTransformer extends org.junit.Assert {
+public class TestMessageTransformer {
private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(TestMessageTransformer.class);
@org.junit.AfterClass
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -47,10 +47,14 @@ import org.junit.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;
+
/**
* WS-Security Test Case for Timestamps.
*/
-public class TimestampTest extends org.junit.Assert {
+public class TimestampTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TimestampTest.class);
@@ -907,4 +911,4 @@ public class TimestampTest extends org.j
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -48,12 +48,16 @@ import org.apache.wss4j.dom.util.WSSecur
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* WS-Security Test Case for UsernameToken Key Derivation, as defined in the
* UsernameTokenProfile 1.1 specification. The derived keys are used to encrypt
* and sign, as per wsc:DerivedKeyToken.
*/
-public class UTDerivedKeyTest extends org.junit.Assert {
+public class UTDerivedKeyTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UTDerivedKeyTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
@@ -852,4 +856,4 @@ public class UTDerivedKeyTest extends or
return secEngine.processSecurityHeader(doc, requestData);
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -42,6 +42,10 @@ import javax.security.auth.callback.Call
import java.util.Collections;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* WS-Security Test Case for UsernameToken Key Derivation, as defined in the
* UsernameTokenProfile 1.1 specification. The derived keys are used for signature.
@@ -50,7 +54,7 @@ import java.util.Collections;
* different to UTWseSignatureTest, which derives a key for signature using a
* non-standard implementation.
*/
-public class UTSignatureTest extends org.junit.Assert {
+public class UTSignatureTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UTSignatureTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
@@ -266,4 +270,4 @@ public class UTSignatureTest extends org
return secEngine.processSecurityHeader(doc, requestData);
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -57,10 +57,16 @@ 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;
+
/**
* WS-Security Test Case for UsernameTokens.
*/
-public class UsernameTokenTest extends org.junit.Assert implements CallbackHandler {
+public class UsernameTokenTest implements CallbackHandler {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UsernameTokenTest.class);
private static final String SOAPUTMSG =
@@ -1213,4 +1219,4 @@ public class UsernameTokenTest extends o
}
}
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -52,10 +52,13 @@ 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;
+
/**
* Test for creating / processing an xop:Include inside a CipherValue Element
*/
-public class XOPAttachmentTest extends org.junit.Assert {
+public class XOPAttachmentTest {
private static final String SOAP_BODY =
"<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">"
@@ -622,4 +625,4 @@ public class XOPAttachmentTest extends o
requestData.setCallbackHandler(new KeystoreCallbackHandler());
return secEngine.processSecurityHeader(doc, requestData);
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java Thu Jan 3 11:48:56 2019
@@ -52,10 +52,14 @@ import javax.xml.crypto.dsig.SignatureMe
import java.util.Arrays;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This is a test for the Kerberos Token Profile 1.1
*/
-public class BSTKerberosTest extends org.junit.Assert {
+public class BSTKerberosTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(BSTKerberosTest.class);
private static final String AP_REQ = WSConstants.WSS_GSS_KRB_V5_AP_REQ;
@@ -454,4 +458,4 @@ public class BSTKerberosTest extends org
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java Thu Jan 3 11:48:56 2019
@@ -42,10 +42,14 @@ import org.w3c.dom.Document;
import java.security.cert.X509Certificate;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This is a test for constructing and processing BinarySecurityTokens.
*/
-public class BinarySecurityTokenTest extends org.junit.Assert {
+public class BinarySecurityTokenTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(BinarySecurityTokenTest.class);
private Crypto crypto;
@@ -186,4 +190,4 @@ public class BinarySecurityTokenTest ext
assertNotNull(token);
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java Thu Jan 3 11:48:56 2019
@@ -23,11 +23,15 @@ import org.apache.wss4j.common.bsp.BSPEn
import org.apache.wss4j.dom.common.SecurityTestUtil;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for DerivedKeyToken type.
*/
-public class DerivedKeyTokenTest extends org.junit.Assert {
+public class DerivedKeyTokenTest {
private static final String TEST_TOKEN_TEMPLATE = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<wsc:DerivedKeyToken "
@@ -100,4 +104,4 @@ public class DerivedKeyTokenTest extends
.newDocumentBuilder();
return builder.parse(in);
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java Thu Jan 3 11:48:56 2019
@@ -25,10 +25,15 @@ import org.apache.wss4j.dom.common.Secur
import org.apache.wss4j.dom.engine.WSSConfig;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* unit test for the Reference type
*/
-public class ReferenceTest extends org.junit.Assert {
+public class ReferenceTest {
private static final String
TEST_REFERENCE_TEMPLATE =
@@ -159,4 +164,4 @@ public class ReferenceTest extends org.j
final javax.xml.parsers.DocumentBuilder builder = factory.newDocumentBuilder();
return builder.parse(in);
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java Thu Jan 3 11:48:56 2019
@@ -35,10 +35,13 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some tests for the SecurityTokenReference class.
*/
-public class SecurityTokenReferenceTest extends org.junit.Assert {
+public class SecurityTokenReferenceTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SecurityTokenReferenceTest.class);
@@ -311,4 +314,4 @@ public class SecurityTokenReferenceTest
bspEnforcer.setIgnoredBSPRules(Collections.singletonList(BSPRule.R3060));
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java Thu Jan 3 11:48:56 2019
@@ -38,6 +38,9 @@ import org.apache.wss4j.dom.handler.WSHa
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* A test-case for WSS-199 - "Add support for WCF non-standard Username Tokens"
@@ -45,7 +48,7 @@ import org.w3c.dom.Document;
* The issue is that WCF generated Username Tokens where the password type is namespace
* qualified (incorrectly). WSS-199 added the ability to process these Username Tokens.
*/
-public class WCFUsernameTokenTest extends org.junit.Assert {
+public class WCFUsernameTokenTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WCFUsernameTokenTest.class);
private static final String SOAPUTMSG =
@@ -151,4 +154,4 @@ public class WCFUsernameTokenTest extend
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java Thu Jan 3 11:48:56 2019
@@ -46,11 +46,15 @@ import org.apache.wss4j.dom.message.toke
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* WS-Security Test Case for fault codes. The SOAP Message Security specification 1.1 defines
* standard fault codes and fault strings for error propagation.
*/
-public class FaultCodeTest extends org.junit.Assert implements CallbackHandler {
+public class FaultCodeTest implements CallbackHandler {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
@@ -233,4 +237,4 @@ public class FaultCodeTest extends org.j
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java Thu Jan 3 11:48:56 2019
@@ -58,10 +58,13 @@ import org.apache.wss4j.dom.validate.Val
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test various principal objects after processing a security token.
*/
-public class PrincipalTest extends org.junit.Assert {
+public class PrincipalTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(PrincipalTest.class);
@@ -366,4 +369,4 @@ public class PrincipalTest extends org.j
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java Thu Jan 3 11:48:56 2019
@@ -26,10 +26,13 @@ import org.junit.Test;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This tests how security headers are parsed and processed.
*/
-public class SecurityHeaderTest extends org.junit.Assert {
+public class SecurityHeaderTest {
private static final String DUPLICATE_NULL_ACTOR_MSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" "
@@ -127,4 +130,4 @@ public class SecurityHeaderTest extends
secEngine.processSecurityHeader(doc, "user", null, null);
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java Thu Jan 3 11:48:56 2019
@@ -41,6 +41,10 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test that checks for correct WSDataRef which should be returned by
* <code>org.apache.wss4j.dom.processor.EncryptedKeyProcessor</code>
@@ -54,7 +58,7 @@ import org.w3c.dom.Element;
* WSDataRef object must contain the correct QName of the decrypted element.
*
*/
-public class EncryptedKeyDataRefTest extends org.junit.Assert {
+public class EncryptedKeyDataRefTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(EncryptedKeyDataRefTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -193,4 +197,4 @@ public class EncryptedKeyDataRefTest ext
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java Thu Jan 3 11:48:56 2019
@@ -41,6 +41,10 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test that checks for correct WSDataRef which should be returned by
* <code>org.apache.wss4j.dom.processor.ReferenceListProcessor</code>
@@ -54,7 +58,7 @@ import org.w3c.dom.Element;
* WSDataRef object must contain the correct QName of the decrypted element.
*
*/
-public class ReferenceListDataRefTest extends org.junit.Assert {
+public class ReferenceListDataRefTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ReferenceListDataRefTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -189,4 +193,4 @@ public class ReferenceListDataRefTest ex
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java Thu Jan 3 11:48:56 2019
@@ -43,11 +43,14 @@ import org.apache.wss4j.common.util.XMLU
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* A set of test-cases for signing and verifying SOAP requests containing a signed
* SAML (HOK) assertion when specifying an AlgorithmSuite policy.
*/
-public class SamlAlgorithmSuiteTest extends org.junit.Assert {
+public class SamlAlgorithmSuiteTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlAlgorithmSuiteTest.class);
private Crypto crypto;
@@ -214,4 +217,4 @@ public class SamlAlgorithmSuiteTest exte
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java Thu Jan 3 11:48:56 2019
@@ -42,10 +42,14 @@ import org.joda.time.DateTime;
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Some tests for SAML Authentication Assertions
*/
-public class SamlAuthnTest extends org.junit.Assert {
+public class SamlAuthnTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlAuthnTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -207,4 +211,4 @@ public class SamlAuthnTest extends org.j
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java Thu Jan 3 11:48:56 2019
@@ -52,10 +52,14 @@ import org.joda.time.DateTime;
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test-case for sending and processing an a SAML Token with a custom Conditions element.
*/
-public class SamlConditionsTest extends org.junit.Assert {
+public class SamlConditionsTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlConditionsTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -794,4 +798,4 @@ public class SamlConditionsTest extends
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java Thu Jan 3 11:48:56 2019
@@ -60,11 +60,14 @@ import java.security.KeyStore;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This is a set of test-cases where the SAML Assertion is altered in some way and so
* we expect an exception to be thrown when processing it.
*/
-public class SamlNegativeTest extends org.junit.Assert {
+public class SamlNegativeTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlNegativeTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -438,4 +441,4 @@ public class SamlNegativeTest extends or
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java Thu Jan 3 11:48:56 2019
@@ -55,10 +55,15 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some tests for how SAML tokens are referenced.
*/
-public class SamlReferenceTest extends org.junit.Assert {
+public class SamlReferenceTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlReferenceTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -986,4 +991,4 @@ public class SamlReferenceTest extends o
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java Thu Jan 3 11:48:56 2019
@@ -45,10 +45,12 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/**
* Test-case for sending SAML Assertions using the "action" approach.
*/
-public class SamlTokenActionTest extends org.junit.Assert {
+public class SamlTokenActionTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlTokenActionTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -232,4 +234,4 @@ public class SamlTokenActionTest extends
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java Thu Jan 3 11:48:56 2019
@@ -64,9 +64,12 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
*/
-public class SamlTokenCustomSignatureTest extends org.junit.Assert {
+public class SamlTokenCustomSignatureTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlTokenCustomSignatureTest.class);
@@ -377,4 +380,4 @@ public class SamlTokenCustomSignatureTes
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java Thu Jan 3 11:48:56 2019
@@ -52,11 +52,16 @@ import org.apache.wss4j.dom.util.WSSecur
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test-case for sending and processing a signed (sender vouches) SAML Assertion using a
* derived key.
*/
-public class SamlTokenDerivedTest extends org.junit.Assert {
+public class SamlTokenDerivedTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlTokenDerivedTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -220,4 +225,4 @@ public class SamlTokenDerivedTest extend
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java Thu Jan 3 11:48:56 2019
@@ -43,12 +43,15 @@ import org.apache.wss4j.dom.message.WSSe
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test-case for sending and processing a signed (holder-of-key) SAML Assertion. These tests
* just cover the case of creating and signing the Assertion, and not using the credential
* information in the SAML Subject to sign the SOAP body.
*/
-public class SamlTokenHOKTest extends org.junit.Assert {
+public class SamlTokenHOKTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -269,4 +272,4 @@ public class SamlTokenHOKTest extends or
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java Thu Jan 3 11:48:56 2019
@@ -50,10 +50,15 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test-case for sending and processing a signed (sender vouches) SAML Assertion.
*/
-public class SamlTokenSVTest extends org.junit.Assert {
+public class SamlTokenSVTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlTokenSVTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -374,4 +379,4 @@ public class SamlTokenSVTest extends org
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Thu Jan 3 11:48:56 2019
@@ -89,10 +89,17 @@ import org.opensaml.saml.saml2.core.Cond
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test-case for sending and processing an unsigned (sender vouches) SAML Assertion.
*/
-public class SamlTokenTest extends org.junit.Assert {
+public class SamlTokenTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SamlTokenTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -1462,4 +1469,4 @@ public class SamlTokenTest extends org.j
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java Thu Jan 3 11:48:56 2019
@@ -71,12 +71,17 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test-case for sending and processing a signed (holder-of-key) SAML Assertion. These tests
* also cover the case of using the credential information in the SAML Subject to sign the
* SOAP body.
*/
-public class SignedSamlTokenHOKTest extends org.junit.Assert {
+public class SignedSamlTokenHOKTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignedSamlTokenHOKTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -879,4 +884,4 @@ public class SignedSamlTokenHOKTest exte
return results;
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java Thu Jan 3 11:48:56 2019
@@ -37,19 +37,21 @@ import org.apache.wss4j.common.util.Load
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SecurityTestUtil;
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.Assert;
import org.junit.Test;
import org.opensaml.xmlsec.signature.Signature;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* A list of test-cases to test the functionality of signing with
* SamlAssertionWrapper class implementation.
*/
-public class AssertionSigningTest extends Assert {
+public class AssertionSigningTest {
private Crypto issuerCrypto;
// Default Canonicalization algorithm used by SamlAssertionWrapper class.
@@ -107,11 +109,11 @@ public class AssertionSigningTest extend
samlAssertion.signAssertion("client_certchain", "password", issuerCrypto,
false);
Signature signature = samlAssertion.getSaml2().getSignature();
- Assert.assertTrue(signature.getSignatureAlgorithm().equalsIgnoreCase(
+ assertTrue(signature.getSignatureAlgorithm().equalsIgnoreCase(
defaultRSASignatureAlgorithm)
|| signature.getSignatureAlgorithm().equalsIgnoreCase(
defaultDSASignatureAlgorithm));
- Assert.assertEquals(defaultCanonicalizationAlgorithm,
+ assertEquals(defaultCanonicalizationAlgorithm,
signature.getCanonicalizationAlgorithm());
// Verify Signature
@@ -149,9 +151,9 @@ public class AssertionSigningTest extend
false, customCanonicalizationAlgorithm,
customSignatureAlgorithm, customSignatureDigestAlgorithm);
Signature signature = samlAssertion.getSaml2().getSignature();
- Assert.assertEquals(customSignatureAlgorithm,
+ assertEquals(customSignatureAlgorithm,
signature.getSignatureAlgorithm());
- Assert.assertEquals(customCanonicalizationAlgorithm,
+ assertEquals(customCanonicalizationAlgorithm,
signature.getCanonicalizationAlgorithm());
Document doc = dbf.newDocumentBuilder().newDocument();
@@ -159,7 +161,7 @@ public class AssertionSigningTest extend
Element assertionElement = samlAssertion.toDOM(doc);
doc.appendChild(assertionElement);
String assertionString = DOM2Writer.nodeToString(assertionElement);
- Assert.assertTrue(assertionString.contains(customSignatureDigestAlgorithm));
+ assertTrue(assertionString.contains(customSignatureDigestAlgorithm));
// Verify Signature
SAMLKeyInfo keyInfo = new SAMLKeyInfo();
@@ -171,4 +173,4 @@ public class AssertionSigningTest extend
samlAssertion.verifySignature(keyInfo);
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java Thu Jan 3 11:48:56 2019
@@ -54,11 +54,15 @@ import org.apache.wss4j.dom.util.WSSecur
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* A test-case for Validators, check for non-standard behaviour by plugging in
* Validator implementations.
*/
-public class ValidatorTest extends org.junit.Assert {
+public class ValidatorTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ValidatorTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -321,4 +325,4 @@ public class ValidatorTest extends org.j
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java Thu Jan 3 11:48:56 2019
@@ -36,10 +36,13 @@ import org.apache.wss4j.policy.stax.enfo
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
-import org.junit.Assert;
import org.junit.Test;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class AlgorithmSuiteTest extends AbstractPolicyTestBase {
@Test
@@ -87,12 +90,12 @@ public class AlgorithmSuiteTest extends
algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.SigDig);
try {
policyEnforcer.registerSecurityEvent(algorithmSuiteSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Digest algorithm http://www.w3.org/2001/04/xmlenc#sha256 does not meet policy");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -116,13 +119,13 @@ public class AlgorithmSuiteTest extends
algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.Enc);
try {
policyEnforcer.registerSecurityEvent(algorithmSuiteSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Encryption algorithm http://www.w3.org/2001/04/xmlenc#aes128-cbc does not meet policy\n" +
"Symmetric encryption algorithm key length 128 does not meet policy");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -174,13 +177,13 @@ public class AlgorithmSuiteTest extends
algorithmSuiteSecurityEvent.setAlgorithmUsage(WSSConstants.Enc);
try {
policyEnforcer.registerSecurityEvent(algorithmSuiteSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Encryption algorithm http://www.w3.org/2001/04/xmlenc#aes128-cbc does not meet policy\n" +
"Symmetric encryption algorithm key length 128 does not meet policy");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -275,9 +278,9 @@ public class AlgorithmSuiteTest extends
try {
policyEnforcer.registerSecurityEvent(algorithmSuiteSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (Exception e) {
- Assert.assertEquals(e.getCause().getMessage(), "Encryption algorithm http://www.w3.org/2001/04/xmlenc#aes256-cbc does not meet policy");
+ assertEquals(e.getCause().getMessage(), "Encryption algorithm http://www.w3.org/2001/04/xmlenc#aes256-cbc does not meet policy");
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java Thu Jan 3 11:48:56 2019
@@ -51,10 +51,13 @@ import org.apache.wss4j.stax.test.Callba
import org.apache.wss4j.stax.test.saml.SAMLCallbackHandlerImpl;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.SecurePart;
-import org.junit.Assert;
import org.junit.Test;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase {
@Test
@@ -412,12 +415,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Timestamp must not be present");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -662,12 +665,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Element /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be signed");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -791,12 +794,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -1024,12 +1027,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Asymmetric algorithm http://www.w3.org/2001/04/xmldsig-more#rsa-sha512 does not meet policy");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -1144,12 +1147,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"C14N algorithm http://www.w3.org/2006/12/xml-c14n11 does not meet policy");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -1264,12 +1267,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- // Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ // assertEquals(e.getCause().getMessage(),
// "Digest algorithm http://www.w3.org/2001/04/xmldsig-more#md5 does not meet policy");
- // Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ // assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
} finally {
switchAllowMD5Algorithm(false);
}
@@ -1383,13 +1386,13 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Encryption algorithm http://www.w3.org/2001/04/xmlenc#tripledes-cbc does not meet policy\n" +
"Symmetric encryption algorithm key length 192 does not meet policy");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -1717,10 +1720,10 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -1831,12 +1834,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Element /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://www.w3.org/2000/09/xmldsig#}Signature must not be encrypted");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -2060,13 +2063,13 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"OnlySignEntireHeadersAndBody not fulfilled, offending element: " +
"/{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Body/{http://schemas.xmlsoap.org/wsdl/}definitions");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -2169,13 +2172,13 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"OnlySignEntireHeadersAndBody not fulfilled, offending element: " +
"/{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://schemas.xmlsoap.org/wsdl/}definitions/{http://schemas.xmlsoap.org/wsdl/}service");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -2282,10 +2285,10 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(), "An error was discovered processing the <wsse:Security> header; nested exception is: \n" +
"\torg.apache.wss4j.policy.stax.PolicyViolationException: \n" +
"Policy enforces LaxTsFirst but X509Token occured first");
}
@@ -2667,11 +2670,11 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(), "Token must be included");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(), "Token must be included");
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -2781,11 +2784,11 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(), "Token must be included");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(), "Token must be included");
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -2894,12 +2897,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Policy enforces SignBeforeEncrypting but the /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Body was encrypted and then signed");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -3008,12 +3011,12 @@ public class AsymmetricBindingIntegratio
}
}
));
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ assertEquals(e.getCause().getMessage(),
"Policy enforces EncryptBeforeSigning but the /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Body was signed and then encrypted");
- Assert.assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java Thu Jan 3 11:48:56 2019
@@ -38,9 +38,12 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class AsymmetricBindingTest extends AbstractPolicyTestBase {
@Test
@@ -143,12 +146,12 @@ public class AsymmetricBindingTest exten
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Timestamp must not be present");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -187,12 +190,12 @@ public class AsymmetricBindingTest exten
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Policy enforces EncryptBeforeSigning but the /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Body was signed and then encrypted");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -242,10 +245,10 @@ public class AsymmetricBindingTest exten
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -312,13 +315,13 @@ public class AsymmetricBindingTest exten
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"OnlySignEntireHeadersAndBody not fulfilled, offending element: " +
"/{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Body/{http://www.example.com}bodyChildElement");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -386,13 +389,13 @@ public class AsymmetricBindingTest exten
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"OnlySignEntireHeadersAndBody not fulfilled, offending element: " +
"/{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Username");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -416,4 +419,4 @@ public class AsymmetricBindingTest exten
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
policyEnforcer.doFinal();
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java Thu Jan 3 11:48:56 2019
@@ -31,9 +31,12 @@ import org.apache.wss4j.stax.ext.WSSCons
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class ContentEncryptedElementsTest extends AbstractPolicyTestBase {
@Test
@@ -90,12 +93,12 @@ public class ContentEncryptedElementsTes
contentEncryptedElementSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Content of element /{http://example.org}a must be encrypted");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java Thu Jan 3 11:48:56 2019
@@ -36,9 +36,12 @@ import org.apache.wss4j.stax.securityTok
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class DerivedKeyTests extends AbstractPolicyTestBase {
@Test
@@ -189,11 +192,11 @@ public class DerivedKeyTests extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertEquals(e.getMessage(),
+ assertEquals(e.getMessage(),
"Derived key must be used");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -267,11 +270,11 @@ public class DerivedKeyTests extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertEquals(e.getMessage(),
+ assertEquals(e.getMessage(),
"Derived key must be used");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -333,11 +336,11 @@ public class DerivedKeyTests extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertEquals(e.getMessage(),
+ assertEquals(e.getMessage(),
"Derived key must be used");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
@@ -419,9 +422,9 @@ public class DerivedKeyTests extends Abs
try {
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof WSSPolicyException);
+ assertTrue(e.getCause() instanceof WSSPolicyException);
}
}
@@ -504,4 +507,4 @@ public class DerivedKeyTests extends Abs
policyEnforcer.doFinal();
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java Thu Jan 3 11:48:56 2019
@@ -31,9 +31,12 @@ import org.apache.wss4j.stax.ext.WSSCons
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class EncryptedElementsTest extends AbstractPolicyTestBase {
@Test
@@ -90,12 +93,12 @@ public class EncryptedElementsTest exten
encryptedElementSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (WSSecurityException e) {
- Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
- Assert.assertEquals(e.getCause().getMessage(),
+ assertTrue(e.getCause() instanceof PolicyViolationException);
+ assertEquals(e.getCause().getMessage(),
"Element /{http://example.org}a must be encrypted");
- Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
+ assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
-}
+}
\ No newline at end of file