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 2015/12/19 13:16:11 UTC
svn commit: r1720903 [3/4] - in /webservices/wss4j/trunk: ./
policy/src/main/java/org/apache/wss4j/policy/
policy/src/main/java/org/apache/wss4j/policy/model/
policy/src/test/java/org/apache/wss4j/policy/tests/
ws-security-common/src/main/java/org/apac...
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java?rev=1720903&r1=1720902&r2=1720903&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java Sat Dec 19 12:16:09 2015
@@ -34,6 +34,7 @@ import org.apache.wss4j.common.util.XMLU
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -85,7 +86,7 @@ public class SignatureCRLTest extends or
* should pass.
* TODO Re-enable once CRL issue fixed
*/
- @org.junit.Test
+ @Test
@org.junit.Ignore
public void testSignatureDirectReference() throws Exception {
WSSecSignature sign = new WSSecSignature();
@@ -119,7 +120,7 @@ public class SignatureCRLTest extends or
* should fail.
* TODO Re-enable once CRL issue fixed
*/
- @org.junit.Test
+ @Test
@org.junit.Ignore
public void testSignatureDirectReferenceRevocation() throws Exception {
WSSecSignature sign = new WSSecSignature();
@@ -157,7 +158,7 @@ public class SignatureCRLTest extends or
*
* TODO Re-enable once CRL issue fixed
*/
- @org.junit.Test
+ @Test
@org.junit.Ignore
public void testSignatureDirectReferenceRevocationKeyStore() throws Exception {
WSSecSignature sign = new WSSecSignature();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java?rev=1720903&r1=1720902&r2=1720903&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java Sat Dec 19 12:16:09 2015
@@ -34,6 +34,7 @@ import org.apache.wss4j.common.util.XMLU
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -62,7 +63,7 @@ public class SignatureCertConstraintsTes
/**
* The test uses the BinarySecurityToken key identifier type.
*/
- @org.junit.Test
+ @Test
public void testBSTSignature() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss40", "security");
@@ -96,7 +97,7 @@ public class SignatureCertConstraintsTes
/**
* The test uses the BinarySecurityToken key identifier type.
*/
- @org.junit.Test
+ @Test
public void testBSTSignaturePKIPath() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss40", "security");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1720903&r1=1720902&r2=1720903&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Sat Dec 19 12:16:09 2015
@@ -35,6 +35,7 @@ import org.apache.wss4j.dom.handler.Hand
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.junit.Test;
import org.w3c.dom.Document;
import java.security.cert.X509Certificate;
@@ -90,7 +91,7 @@ public class SignatureCertTest extends o
/**
* Test signing a SOAP message using a BST.
*/
- @org.junit.Test
+ @Test
public void testSignatureDirectReference() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("wss40", "security");
@@ -119,7 +120,7 @@ public class SignatureCertTest extends o
}
//disabling this test as the certs are expired
- @org.junit.Test
+ @Test
@org.junit.Ignore
public void testBSTCertChain() throws Exception {
//
@@ -165,7 +166,7 @@ public class SignatureCertTest extends o
* Test signing a SOAP message using a BST, sending the CA cert as well in the
* message.
*/
- @org.junit.Test
+ @Test
public void testSignatureDirectReferenceCACert() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("wss40", "security");
@@ -204,7 +205,7 @@ public class SignatureCertTest extends o
* trust-store does not contain the cert corresponding to wss40, only the CA cert
* wss40CA.
*/
- @org.junit.Test
+ @Test
public void testSignatureIssuerSerial() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("wss40", "security");
@@ -235,7 +236,7 @@ public class SignatureCertTest extends o
* Test signing a SOAP message using a BST. The signature verification passes, but the trust
* verification will fail as the CA cert is out of date.
*/
- @org.junit.Test
+ @Test
public void testSignatureBadCACert() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("wss4jcertdsa", "security");
@@ -267,7 +268,7 @@ public class SignatureCertTest extends o
/**
* A test for "SignatureAction does not set DigestAlgorithm on WSSecSignature instance"
*/
- @org.junit.Test
+ @Test
public void testMultipleCertsWSHandler() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
@@ -304,7 +305,7 @@ public class SignatureCertTest extends o
assertTrue(certs != null && certs.length == 2);
}
- @org.junit.Test
+ @Test
public void testExpiredCert() throws Exception {
Properties clientProperties = new Properties();
clientProperties.put("org.apache.wss4j.crypto.provider",
@@ -343,7 +344,7 @@ public class SignatureCertTest extends o
}
}
- @org.junit.Test
+ @Test
public void testExpiredCertInKeystore() throws Exception {
Properties clientProperties = new Properties();
clientProperties.put("org.apache.wss4j.crypto.provider",
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java?rev=1720903&r1=1720902&r2=1720903&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java Sat Dec 19 12:16:09 2015
@@ -32,6 +32,7 @@ import org.apache.wss4j.dom.handler.Hand
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.junit.Test;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -86,7 +87,7 @@ public class SignatureEncryptionTest ext
* Thrown when there is any problem in signing, encryption,
* decryption, or verification
*/
- @org.junit.Test
+ @Test
public void testEncryptionSigning() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
@@ -128,7 +129,7 @@ public class SignatureEncryptionTest ext
* decryption, or verification
*/
@SuppressWarnings("unchecked")
- @org.junit.Test
+ @Test
public void testEncryptionElementSigning() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
@@ -214,7 +215,7 @@ public class SignatureEncryptionTest ext
* Thrown when there is any problem in signing, encryption,
* decryption, or verification
*/
- @org.junit.Test
+ @Test
public void testSigningEncryption() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
@@ -238,7 +239,7 @@ public class SignatureEncryptionTest ext
* As the encryption adds a wsu:Id to the encrypted element, this test checks that
* verification still works ok.
*/
- @org.junit.Test
+ @Test
public void testWSS198() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
@@ -277,7 +278,7 @@ public class SignatureEncryptionTest ext
* @throws Exception Thrown when there is any problem in signing, encryption,
* decryption, or verification
*/
- @org.junit.Test
+ @Test
public void testSigningEncryptionIS3DES() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("wss40");
@@ -313,7 +314,7 @@ public class SignatureEncryptionTest ext
* put into the Encrypted Key, as a child of the EncryptedKey. Signature is created
* using the encrypted key.
*/
- @org.junit.Test
+ @Test
public void testEncryptedKeySignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
LOG.info("Before Sign/Encryption....");
@@ -355,7 +356,7 @@ public class SignatureEncryptionTest ext
verify(encryptedSignedDoc);
}
- @org.junit.Test
+ @Test
public void testEncryptionSigningHandler() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
@@ -400,7 +401,7 @@ public class SignatureEncryptionTest ext
newEngine.processSecurityHeader(doc, reqData);
}
- @org.junit.Test
+ @Test
public void testSigningEncryptionHandler() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -36,6 +36,7 @@ import org.apache.wss4j.dom.engine.WSSec
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.junit.Test;
/**
* This class tests signing where the the public key is transmitted in the message via
@@ -60,7 +61,7 @@ public class SignatureKeyValueTest exten
/**
* Successful RSAKeyValue test.
*/
- @org.junit.Test
+ @Test
public void testRSAKeyValue() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss40", "security");
@@ -102,7 +103,7 @@ public class SignatureKeyValueTest exten
* Failed RSAKeyValue test, where a message is signed using a key-pair which doesn't
* correspond to the public key in the "trust"-store.
*/
- @org.junit.Test
+ @Test
public void testBadRSAKeyValue() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss86", "security");
@@ -137,7 +138,7 @@ public class SignatureKeyValueTest exten
/**
* Successful DSAKeyValue test.
*/
- @org.junit.Test
+ @Test
public void testDSAKeyValue() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss40DSA", "security");
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -43,6 +43,7 @@ import org.apache.wss4j.common.util.XMLU
import org.apache.wss4j.dom.saml.SignedSamlTokenHOKTest;
import org.apache.wss4j.dom.saml.WSSecSignatureSAML;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -96,7 +97,7 @@ public class SignaturePartsTest extends
* Test signing a custom SOAP header
*/
@SuppressWarnings("unchecked")
- @org.junit.Test
+ @Test
public void testSOAPHeader() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -154,7 +155,7 @@ public class SignaturePartsTest extends
assertTrue(WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(transformAlgorithms.get(0)));
}
- @org.junit.Test
+ @Test
public void testOptionalSOAPHeaderPresent() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -192,7 +193,7 @@ public class SignaturePartsTest extends
verify(signedDoc);
}
- @org.junit.Test
+ @Test
public void testOptionalSOAPHeaderNotPresent() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -230,7 +231,7 @@ public class SignaturePartsTest extends
verify(signedDoc);
}
- @org.junit.Test
+ @Test
public void testRequiredSOAPHeaderNotPresent() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -268,7 +269,7 @@ public class SignaturePartsTest extends
* Test signing of a header through a STR Dereference Transform
*/
@SuppressWarnings("unchecked")
- @org.junit.Test
+ @Test
public void testSOAPHeaderSTRTransform() throws Exception {
// Construct issuer and user crypto instances
Crypto issuerCrypto = new Merlin();
@@ -347,7 +348,7 @@ public class SignaturePartsTest extends
/**
* Test signing a custom SOAP header with a bad localname
*/
- @org.junit.Test
+ @Test
public void testBadLocalname() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -376,7 +377,7 @@ public class SignaturePartsTest extends
/**
* Test signing a custom SOAP header with a bad namespace
*/
- @org.junit.Test
+ @Test
public void testBadNamespace() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -405,7 +406,7 @@ public class SignaturePartsTest extends
/**
* Test signing a custom SOAP header and the SOAP body
*/
- @org.junit.Test
+ @Test
public void testSOAPHeaderAndBody() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -475,7 +476,7 @@ public class SignaturePartsTest extends
/**
* Test getting a DOM Element from WSEncryptionPart directly
*/
- @org.junit.Test
+ @Test
public void testSignaturePartDOMElement() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -525,7 +526,7 @@ public class SignaturePartsTest extends
/**
* Test signing two SOAP Body elements with the same QName.
*/
- @org.junit.Test
+ @Test
public void testMultipleElements() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPMSG_MULTIPLE);
WSSecSignature sign = new WSSecSignature();
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -47,6 +47,7 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -79,7 +80,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testX509SignatureIS() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -108,7 +109,7 @@ public class SignatureTest extends org.j
assertTrue(referenceType == REFERENCE_TYPE.ISSUER_SERIAL);
}
- @org.junit.Test
+ @Test
public void testX509SignatureISAttached() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -145,7 +146,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testDoubleX509SignatureIS() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -163,7 +164,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testIssuerSerialSignature() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -189,7 +190,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testSignatureInclusiveC14N() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setSigCanonicalization(WSConstants.C14N_OMIT_COMMENTS);
@@ -230,7 +231,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testSignatureInclusivePrefixes() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setAddInclusivePrefixes(true);
@@ -257,7 +258,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testBSTSignature() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -292,7 +293,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testBSTPKIPathSignature() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("wss40", "security");
@@ -322,7 +323,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testX509Signature() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -360,7 +361,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testX509SignatureThumb() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -392,7 +393,7 @@ public class SignatureTest extends org.j
assertTrue(referenceType == REFERENCE_TYPE.THUMBPRINT_SHA1);
}
- @org.junit.Test
+ @Test
public void testX509SignatureThumbAttached() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -432,7 +433,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testDoubleX509SignatureThumb() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -455,7 +456,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testValidModifiedSignature() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -499,7 +500,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testX509SignatureSha256() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -525,7 +526,7 @@ public class SignatureTest extends org.j
/**
* A test for "SignatureAction does not set DigestAlgorithm on WSSecSignature instance"
*/
- @org.junit.Test
+ @Test
public void
testWSS170() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
@@ -575,7 +576,7 @@ public class SignatureTest extends org.j
* "When a document contains a comment as its first child element,
* wss4j will not find the SOAP body."
*/
- @org.junit.Test
+ @Test
public void testWSS234() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -606,7 +607,7 @@ public class SignatureTest extends org.j
* Test that signs and verifies a Timestamp. The Signature element is appended to the security
* header, and so appears after the Timestamp element.
*/
- @org.junit.Test
+ @Test
public void testSignedTimestamp() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -649,7 +650,7 @@ public class SignatureTest extends org.j
*
* https://issues.apache.org/jira/browse/WSS-283
*/
- @org.junit.Test
+ @Test
public void testWSS283() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -675,7 +676,7 @@ public class SignatureTest extends org.j
/**
* Create a signature that uses a custom SecurityTokenReference.
*/
- @org.junit.Test
+ @Test
public void testCustomSTR() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -706,7 +707,7 @@ public class SignatureTest extends org.j
*
* @throws java.lang.Exception Thrown when there is any problem in signing or verification
*/
- @org.junit.Test
+ @Test
public void testX509SignatureDefaultPassword() throws Exception {
Crypto passwordCrypto = CryptoFactory.getInstance("alice.properties");
@@ -734,7 +735,7 @@ public class SignatureTest extends org.j
* A test for "There is an issue with the position of the <Timestamp> element in the
* <Security> header when using WSS4J calling .NET Web Services with WS-Security."
*/
- @org.junit.Test
+ @Test
public void
testWSS231() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
@@ -776,7 +777,7 @@ public class SignatureTest extends org.j
assertTrue(handler.checkResults(results.getResults(), receivedActions));
}
- @org.junit.Test
+ @Test
public void
testSignatureEncryptTimestampOrder() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
@@ -813,7 +814,7 @@ public class SignatureTest extends org.j
}
}
- @org.junit.Test
+ @Test
public void
testEncryptSignatureTimestampOrder() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
@@ -850,7 +851,7 @@ public class SignatureTest extends org.j
}
}
- @org.junit.Test
+ @Test
public void testWSHandlerSignatureCanonicalization() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
@@ -895,7 +896,7 @@ public class SignatureTest extends org.j
Collections.singletonList(WSConstants.SIGN)));
}
- @org.junit.Test
+ @Test
public void testCommentInSOAPBody() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -40,6 +40,7 @@ import org.apache.wss4j.dom.handler.Requ
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
/**
@@ -64,7 +65,7 @@ public class SignedBSTTest extends org.j
/**
*/
- @org.junit.Test
+ @Test
public void testSignedBST() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -121,7 +122,7 @@ public class SignedBSTTest extends org.j
verify(doc);
}
- @org.junit.Test
+ @Test
public void testSignedBSTAction() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -46,6 +46,8 @@ import org.apache.wss4j.dom.handler.Hand
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.xml.security.utils.Base64;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Document;
@@ -79,7 +81,7 @@ public class SymmetricSignatureTest exte
*
* @throws Exception Thrown when there is a problem in setup
*/
- @org.junit.Before
+ @Before
public void setUp() throws Exception {
KeyGenerator keyGen = KeyGenerator.getInstance("AES");
keyGen.init(128);
@@ -90,7 +92,7 @@ public class SymmetricSignatureTest exte
/**
* Test signing a message body using a symmetric key with EncryptedKeySHA1
*/
- @org.junit.Test
+ @Test
public void testSymmetricSignatureSHA1() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -123,7 +125,7 @@ public class SymmetricSignatureTest exte
* Test signing a message body using a symmetric key with Direct Reference to an
* EncryptedKey
*/
- @org.junit.Test
+ @Test
public void testSymmetricSignatureDR() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -163,7 +165,7 @@ public class SymmetricSignatureTest exte
* @throws Exception Thrown when there is any problem in signing, encryption,
* decryption, or verification
*/
- @org.junit.Test
+ @Test
public void testEncryptedKeySignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
LOG.info("Before Sign/Encryption....");
@@ -209,7 +211,7 @@ public class SymmetricSignatureTest exte
* Test signing a message body using a symmetric key with EncryptedKeySHA1.
* The request is generated using WSHandler, instead of coding it.
*/
- @org.junit.Test
+ @Test
public void testSymmetricSignatureSHA1Handler() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
RequestData reqData = new RequestData();
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -42,6 +42,7 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.message.token.Timestamp;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
import org.apache.wss4j.dom.validate.NoOpValidator;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -61,7 +62,7 @@ public class TimestampTest extends org.j
/**
* This is a test for processing a valid Timestamp.
*/
- @org.junit.Test
+ @Test
public void testValidTimestamp() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -99,7 +100,7 @@ public class TimestampTest extends org.j
/**
* This is a test for processing a valid Timestamp with no expires element
*/
- @org.junit.Test
+ @Test
public void testValidTimestampNoExpires() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -129,7 +130,7 @@ public class TimestampTest extends org.j
assertTrue(receivedTimestamp != null);
}
- @org.junit.Test
+ @Test
public void testInvalidTimestampNoExpires() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -176,7 +177,7 @@ public class TimestampTest extends org.j
/**
* This is a test for processing an expired Timestamp.
*/
- @org.junit.Test
+ @Test
public void testExpiredTimestamp() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -206,7 +207,7 @@ public class TimestampTest extends org.j
* This is a test for processing an "old" Timestamp, i.e. one with a "Created" element that is
* out of date
*/
- @org.junit.Test
+ @Test
public void testOldTimestamp() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -242,7 +243,7 @@ public class TimestampTest extends org.j
* future. It should be accepted by default when it is created 30 seconds in the future,
* and then rejected once we configure "0 seconds" for future-time-to-live.
*/
- @org.junit.Test
+ @Test
public void testNearFutureCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -290,7 +291,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where the "Created" element is in the future.
* A Timestamp that is 120 seconds in the future should be rejected by default.
*/
- @org.junit.Test
+ @Test
public void testFutureCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -336,7 +337,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where the "Created" element is greater than
* the expiration time.
*/
- @org.junit.Test
+ @Test
public void testExpiresBeforeCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -390,7 +391,7 @@ public class TimestampTest extends org.j
/**
* This is a test for processing multiple Timestamps in the security header
*/
- @org.junit.Test
+ @Test
public void testMultipleTimestamps() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -428,7 +429,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains multiple "Created" elements.
* This Timestamp should be rejected.
*/
- @org.junit.Test
+ @Test
public void testMultipleCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -474,7 +475,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains no "Created" element.
* This Timestamp should be rejected.
*/
- @org.junit.Test
+ @Test
public void testNoCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -524,7 +525,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains multiple "Expires" elements.
* This Timestamp should be rejected.
*/
- @org.junit.Test
+ @Test
public void testMultipleExpires() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -581,7 +582,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains an "Expires" element before
* the Created element. This Timestamp should be rejected as per the BSP spec.
*/
- @org.junit.Test
+ @Test
public void testExpiresInFrontOfCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -636,7 +637,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains a Created element with
* seconds > 60. This should be rejected as per the BSP spec.
*/
- @org.junit.Test
+ @Test
public void testCreatedSeconds() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -681,7 +682,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains a Created element with
* a ValueType. This should be rejected as per the BSP spec.
*/
- @org.junit.Test
+ @Test
public void testCreatedValueType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -734,7 +735,7 @@ public class TimestampTest extends org.j
* This is a test for processing an Timestamp where it contains a CustomElement. This should
* be rejected as per the BSP spec.
*/
- @org.junit.Test
+ @Test
public void testCustomElement() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -793,7 +794,7 @@ public class TimestampTest extends org.j
/**
* This is a test to create a "Spoofed" Timestamp (see WSS-441)
*/
- @org.junit.Test
+ @Test
public void testSpoofedTimestamp() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -833,7 +834,7 @@ public class TimestampTest extends org.j
}
}
- @org.junit.Test
+ @Test
public void testTimestampNoMilliseconds() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -860,7 +861,7 @@ public class TimestampTest extends org.j
assertTrue(actionResult != null);
}
- @org.junit.Test
+ @Test
public void testThaiLocaleVerification() throws Exception {
Locale defaultLocale = Locale.getDefault();
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -46,6 +46,7 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.message.token.UsernameToken;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.xml.security.utils.Base64;
+import org.junit.Test;
import org.w3c.dom.Document;
/**
@@ -71,7 +72,7 @@ public class UTDerivedKeyTest extends or
/**
* Unit test for the UsernameToken derived key functionality
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenUnit() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -114,7 +115,7 @@ public class UTDerivedKeyTest extends or
/**
* Test for encoded passwords.
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyWithEncodedPasswordBaseline() throws Exception {
String password = "password";
// The SHA-1 of the password is known as a password equivalent in the UsernameToken specification.
@@ -130,7 +131,7 @@ public class UTDerivedKeyTest extends or
/**
* Test using a UsernameToken derived key for encrypting a SOAP body
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -181,7 +182,7 @@ public class UTDerivedKeyTest extends or
/**
* Test using a UsernameToken derived key for encrypting a SOAP body
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyEncryptionWithEncodedPassword() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -232,7 +233,7 @@ public class UTDerivedKeyTest extends or
* Test using a UsernameToken derived key for encrypting a SOAP body. In this test the
* derived key is modified before encryption, and so decryption should fail.
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyChangedEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -284,7 +285,7 @@ public class UTDerivedKeyTest extends or
* Test using a UsernameToken derived key for encrypting a SOAP body. In this test the
* user is "colm" rather than "bob", and so decryption should fail.
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyBadUserEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -333,7 +334,7 @@ public class UTDerivedKeyTest extends or
/**
* Test using a UsernameToken derived key for signing a SOAP body
*/
- @org.junit.Test
+ @Test
public void testDerivedKeySignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -382,7 +383,7 @@ public class UTDerivedKeyTest extends or
/**
* Test using a UsernameToken derived key for signing a SOAP body
*/
- @org.junit.Test
+ @Test
public void testDerivedKeySignatureWithEncodedPassword() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -441,7 +442,7 @@ public class UTDerivedKeyTest extends or
* derived key is modified before signature, and so signature verification should
* fail.
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyChangedSignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -491,7 +492,7 @@ public class UTDerivedKeyTest extends or
* Test using a UsernameToken derived key for signing a SOAP body. In this test the
* user is "colm" rather than "bob", and so signature verification should fail.
*/
- @org.junit.Test
+ @Test
public void testDerivedKeyBadUserSignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -536,7 +537,7 @@ public class UTDerivedKeyTest extends or
* Unit test for creating a Username Token with no salt element that is used for
* deriving a key for encryption.
*/
- @org.junit.Test
+ @Test
public void testNoSaltEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -587,7 +588,7 @@ public class UTDerivedKeyTest extends or
* Unit test for creating a Username Token with no iteration element that is used for
* deriving a key for encryption.
*/
- @org.junit.Test
+ @Test
public void testNoIterationEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -636,7 +637,7 @@ public class UTDerivedKeyTest extends or
* Unit test for creating a Username Token with an iteration value < 1000 that is used for
* deriving a key for encryption.
*/
- @org.junit.Test
+ @Test
public void testLowIterationEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -698,7 +699,7 @@ public class UTDerivedKeyTest extends or
* UsernameToken contains a non-standard value type, which is rejected when the corresponding
* BSP rule is turned on.
*/
- @org.junit.Test
+ @Test
public void testBadValueType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -761,7 +762,7 @@ public class UTDerivedKeyTest extends or
* Test using a UsernameToken derived key for encrypting a SOAP body. A KeyIdentifier is
* used to refer to the UsernameToken, which is forbidden by the BSP.
*/
- @org.junit.Test
+ @Test
public void testKeyIdentifier() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -35,6 +35,7 @@ import org.apache.wss4j.dom.handler.Hand
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.junit.Test;
import org.w3c.dom.Document;
import javax.security.auth.callback.CallbackHandler;
@@ -67,7 +68,7 @@ public class UTSignatureTest extends org
/**
* Test using a UsernameToken derived key for signing a SOAP body
*/
- @org.junit.Test
+ @Test
public void testSignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -118,7 +119,7 @@ public class UTSignatureTest extends org
* Test using a UsernameToken derived key for signing a SOAP body. In this test the
* user is "colm" rather than "bob", and so signature verification should fail.
*/
- @org.junit.Test
+ @Test
public void testBadUserSignature() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -157,7 +158,7 @@ public class UTSignatureTest extends org
/**
* Test using a UsernameToken derived key for signing a SOAP body via WSHandler
*/
- @org.junit.Test
+ @Test
public void testHandlerSignature() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
@@ -199,7 +200,7 @@ public class UTSignatureTest extends org
/**
* Test using a UsernameToken derived key for signing a SOAP body via WSHandler
*/
- @org.junit.Test
+ @Test
public void testHandlerSignatureIterations() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -51,6 +51,7 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.message.token.UsernameToken;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
import org.apache.xml.security.utils.Base64;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -123,7 +124,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with password Digest to a WS-Security envelope
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenDigest() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
@@ -157,7 +158,7 @@ public class UsernameTokenTest extends o
/**
* Test for encoded passwords.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenWithEncodedPasswordBaseline() throws Exception {
String password = "password";
// The SHA-1 of the password is known as a password equivalent in the UsernameToken specification.
@@ -173,7 +174,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with password Digest to a WS-Security envelope
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenWithEncodedPassword() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordsAreEncoded(true);
@@ -203,7 +204,7 @@ public class UsernameTokenTest extends o
* Test that a bad username with password digest does not leak whether the username
* is valid or not - see WSS-141.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenBadUsername() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("badusername", "verySecret");
@@ -234,7 +235,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with a bad password Digest to a WS-Security envelope
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenBadDigest() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecre");
@@ -264,7 +265,7 @@ public class UsernameTokenTest extends o
* This is a test for processing an "old" UsernameToken, i.e. one with a "Created" element that is
* out of date
*/
- @org.junit.Test
+ @Test
public void testOldUsernameToken() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
@@ -297,7 +298,7 @@ public class UsernameTokenTest extends o
* future. It should be accepted by default when it is created 30 seconds in the future,
* and then rejected once we configure "0 seconds" for future-time-to-live.
*/
- @org.junit.Test
+ @Test
public void testNearFutureCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -362,7 +363,7 @@ public class UsernameTokenTest extends o
* This is a test for processing a UsernameToken where the "Created" element is in the future.
* A UsernameToken that is 120 seconds in the future should be rejected by default.
*/
- @org.junit.Test
+ @Test
public void testFutureCreated() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -418,7 +419,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with password text to a WS-Security envelope
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenText() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_TEXT);
@@ -453,7 +454,7 @@ public class UsernameTokenTest extends o
* Test that adds a UserNameToken with a digested password but with type of
* password test.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenDigestText() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_TEXT);
@@ -480,7 +481,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with (bad) password text to a WS-Security envelope
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenBadText() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_TEXT);
@@ -514,7 +515,7 @@ public class UsernameTokenTest extends o
* The 1.1 spec states that the password type is optional and defaults to password text,
* and so we should handle an incoming Username Token accordingly.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenNoPasswordType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUTMSG);
if (LOG.isDebugEnabled()) {
@@ -541,7 +542,7 @@ public class UsernameTokenTest extends o
* See WSS-185 - https://issues.apache.org/jira/browse/WSS-185
* "NullPointerException on empty UsernameToken"
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenNoUser() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUTNOUSERMSG);
if (LOG.isDebugEnabled()) {
@@ -561,7 +562,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with no password
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenNoPassword() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(null);
@@ -588,7 +589,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with an empty password
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenEmptyPassword() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_TEXT);
@@ -610,7 +611,7 @@ public class UsernameTokenTest extends o
/**
* Test that processes a UserNameToken with an empty password
*/
- @org.junit.Test
+ @Test
public void testEmptyPasswordProcessing() throws Exception {
Document doc = SOAPUtil.toSOAPPart(EMPTY_PASSWORD_MSG);
if (LOG.isDebugEnabled()) {
@@ -628,7 +629,7 @@ public class UsernameTokenTest extends o
* Test with a non-standard token type. This will fail as the default is to reject custom
* token types.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenCustomFail() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType("RandomType");
@@ -659,7 +660,7 @@ public class UsernameTokenTest extends o
* Test with a non-standard password type. This will pass as the WSSConfig is configured to
* handle custom token types.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenCustomPass() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType("RandomType");
@@ -695,7 +696,7 @@ public class UsernameTokenTest extends o
* http://issues.apache.org/jira/browse/WSS-66
* "Possible security hole when PasswordDigest is used by client."
*/
- @org.junit.Test
+ @Test
public void testNullNonce() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
@@ -738,7 +739,7 @@ public class UsernameTokenTest extends o
* http://issues.apache.org/jira/browse/WSS-66
* "Possible security hole when PasswordDigest is used by client."
*/
- @org.junit.Test
+ @Test
public void testNullCreated() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
@@ -779,7 +780,7 @@ public class UsernameTokenTest extends o
/**
* Test that verifies an EncodingType is set for the nonce. See WSS-169.
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenNonceEncodingType() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
@@ -796,7 +797,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken via WSHandler
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenWSHandler() throws Exception {
CustomHandler handler = new CustomHandler();
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -827,7 +828,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with no password via WSHandler
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenWSHandlerNoPassword() throws Exception {
CustomHandler handler = new CustomHandler();
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -857,7 +858,7 @@ public class UsernameTokenTest extends o
/**
* Test that adds a UserNameToken with an empty password via WSHandler
*/
- @org.junit.Test
+ @Test
public void testUsernameTokenWSHandlerEmptyPassword() throws Exception {
CustomHandler handler = new CustomHandler();
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -888,7 +889,7 @@ public class UsernameTokenTest extends o
/**
* A test for sending multiple nonces in the UsernameToken
*/
- @org.junit.Test
+ @Test
public void testMultipleNonce() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
@@ -931,7 +932,7 @@ public class UsernameTokenTest extends o
/**
* A test for sending multiple Created elements in the UsernameToken
*/
- @org.junit.Test
+ @Test
public void testMultipleCreated() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
@@ -974,7 +975,7 @@ public class UsernameTokenTest extends o
/**
* A test for sending multiple passwords in the UsernameToken
*/
- @org.junit.Test
+ @Test
public void testMultiplePassword() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
@@ -1017,7 +1018,7 @@ public class UsernameTokenTest extends o
/**
* A test for sending a nonce with a bad encoding type in the UsernameToken
*/
- @org.junit.Test
+ @Test
public void testNonceBadEncodingType() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
@@ -1058,7 +1059,7 @@ public class UsernameTokenTest extends o
newEngine.processSecurityHeader(doc, data);
}
- @org.junit.Test
+ @Test
public void testUsernameTokenWSHandlerNonceCreated() throws Exception {
CustomHandler handler = new CustomHandler();
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -1091,7 +1092,7 @@ public class UsernameTokenTest extends o
/**
* This is a test to create a "Spoofed" UsernameToken (see WSS-441)
*/
- @org.junit.Test
+ @Test
public void testSpoofedUsernameToken() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -47,6 +47,7 @@ import org.apache.wss4j.dom.handler.Requ
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -99,7 +100,7 @@ public class XOPAttachmentTest extends o
// the SOAP Body. Then replace the encrypted SOAP Body with a xop:Include to the attachment,
// and modify the request to remove the encryption stuff pointing to the attachment.
// (NOTE: This test was before we supported creating requests with xop:Include)
- @org.junit.Test
+ @Test
public void testManualEncryptedSOAPBody() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecEncrypt encrypt = new WSSecEncrypt();
@@ -186,7 +187,7 @@ public class XOPAttachmentTest extends o
assertTrue(processedDoc.contains(SOAP_BODY));
}
- @org.junit.Test
+ @Test
public void testEncryptedSOAPBody() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecEncrypt encrypt = new WSSecEncrypt();
@@ -224,7 +225,7 @@ public class XOPAttachmentTest extends o
}
// Here we are storing the BinarySecurityToken bytes in an attachment
- @org.junit.Test
+ @Test
public void testSignedSOAPBody() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -256,7 +257,7 @@ public class XOPAttachmentTest extends o
verify(signedDoc, inboundAttachmentCallback);
}
- @org.junit.Test
+ @Test
public void testSignedSOAPBodyAndBinarySecurityToken() throws Exception {
WSSecSignature builder = new WSSecSignature();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -289,7 +290,7 @@ public class XOPAttachmentTest extends o
verify(signedDoc, inboundAttachmentCallback);
}
- @org.junit.Test
+ @Test
public void testEncryptedHeaderAsEncryptedData() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAP_HEADER_MSG);
WSSecEncrypt encrypt = new WSSecEncrypt();
@@ -327,7 +328,7 @@ public class XOPAttachmentTest extends o
verify(encryptedDoc, inboundAttachmentCallback);
}
- @org.junit.Test
+ @Test
public void testEncryptedHeaderasEncryptedHeader() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAP_HEADER_MSG);
WSSecEncrypt encrypt = new WSSecEncrypt();
@@ -364,7 +365,7 @@ public class XOPAttachmentTest extends o
verify(encryptedDoc, inboundAttachmentCallback);
}
- @org.junit.Test
+ @Test
public void testDerivedEncryptedSOAPBody() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -414,7 +415,7 @@ public class XOPAttachmentTest extends o
assertTrue(processedDoc.contains(SOAP_BODY));
}
- @org.junit.Test
+ @Test
public void testDerivedSignedSOAPBody() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -462,7 +463,7 @@ public class XOPAttachmentTest extends o
assertTrue(processedDoc.contains(SOAP_BODY));
}
- @org.junit.Test
+ @Test
public void testSignedEncryptedSOAPBody() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -507,7 +508,7 @@ public class XOPAttachmentTest extends o
assertTrue(processedDoc.contains(SOAP_BODY));
}
- @org.junit.Test
+ @Test
public void testSignedEncryptedSOAPBodyViaHandler() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
@@ -557,7 +558,7 @@ public class XOPAttachmentTest extends o
assertTrue(processedDoc.contains(SOAP_BODY));
}
- @org.junit.Test
+ @Test
public void testEncryptedSignedSOAPBodyViaHandler() throws Exception {
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -43,6 +43,7 @@ import org.apache.wss4j.dom.util.WSSecur
import org.apache.wss4j.dom.validate.Credential;
import org.apache.wss4j.dom.validate.Validator;
import org.apache.xml.security.utils.Base64;
+import org.junit.Test;
import org.w3c.dom.Document;
import javax.crypto.KeyGenerator;
@@ -78,7 +79,7 @@ public class BSTKerberosTest extends org
/**
* A unit test for creating BinarySecurityTokens
*/
- @org.junit.Test
+ @Test
public void testCreateBinarySecurityToken() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -106,7 +107,7 @@ public class BSTKerberosTest extends org
/**
* A test for signing a Kerberos BST
*/
- @org.junit.Test
+ @Test
public void testSignBST() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -142,7 +143,7 @@ public class BSTKerberosTest extends org
/**
* A test for signing a Kerberos BST as well as a Timestamp
*/
- @org.junit.Test
+ @Test
public void testSignBSTTimestamp() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -181,7 +182,7 @@ public class BSTKerberosTest extends org
/**
* Test Validating a Kerberos BinarySecurityToken
*/
- @org.junit.Test
+ @Test
public void testProcessToken() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -215,7 +216,7 @@ public class BSTKerberosTest extends org
/**
* Test Validating a Kerberos BinarySecurityToken using a custom Validator instance.
*/
- @org.junit.Test
+ @Test
public void testProcessTokenCustomValidator() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -252,7 +253,7 @@ public class BSTKerberosTest extends org
/**
* A test for signing using a direct reference to a Kerberos token
*/
- @org.junit.Test
+ @Test
public void testKerberosSignatureDRCreation() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -291,7 +292,7 @@ public class BSTKerberosTest extends org
/**
* A test for signing using a KeyIdentifier to a Kerberos token
*/
- @org.junit.Test
+ @Test
public void testKerberosSignatureKICreation() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -332,7 +333,7 @@ public class BSTKerberosTest extends org
/**
* A test for encryption using a direct reference to a Kerberos token
*/
- @org.junit.Test
+ @Test
public void testKerberosEncryptionDRCreation() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -370,7 +371,7 @@ public class BSTKerberosTest extends org
/**
* A test for encryption using a Key Identifier to a Kerberos token
*/
- @org.junit.Test
+ @Test
public void testKerberosEncryptionKICreation() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -37,6 +37,7 @@ import org.apache.wss4j.common.token.X50
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.junit.Test;
import org.w3c.dom.Document;
import java.security.cert.X509Certificate;
@@ -61,7 +62,7 @@ public class BinarySecurityTokenTest ext
/**
* A unit test for an X.509 BinarySecurityToken
*/
- @org.junit.Test
+ @Test
public void testX509() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -102,7 +103,7 @@ public class BinarySecurityTokenTest ext
/**
* A unit test for an PKIPath BinarySecurityToken
*/
- @org.junit.Test
+ @Test
public void testPKIPath() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -139,7 +140,7 @@ public class BinarySecurityTokenTest ext
/**
* A unit test for a custom BinarySecurityToken
*/
- @org.junit.Test
+ @Test
public void testCustomToken() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -21,6 +21,7 @@ package org.apache.wss4j.dom.message.tok
import org.apache.wss4j.common.bsp.BSPEnforcer;
import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.junit.Test;
/**
* Tests for DerivedKeyToken type.
@@ -69,7 +70,7 @@ public class DerivedKeyTokenTest extends
.getDocumentElement(), new BSPEnforcer());
}
- @org.junit.Test
+ @Test
public void testEquals() throws Exception{
assertTrue(token.equals(tokenEqual));
assertTrue(tokenEqual.equals(token));
@@ -78,7 +79,7 @@ public class DerivedKeyTokenTest extends
assertFalse(token.equals("string"));
}
- @org.junit.Test
+ @Test
public void testHashcode() throws Exception{
assertEquals(token.hashCode(), tokenEqual.hashCode());
assertFalse(token.hashCode() == tokenNotEqual.hashCode());
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -23,6 +23,7 @@ import org.apache.wss4j.common.ext.WSSec
import org.apache.wss4j.common.token.Reference;
import org.apache.wss4j.dom.common.SecurityTestUtil;
import org.apache.wss4j.dom.engine.WSSConfig;
+import org.junit.Test;
/**
* unit test for the Reference type
@@ -66,7 +67,7 @@ public class ReferenceTest extends org.j
}
- @org.junit.Test
+ @Test
public void testConstructor() throws Exception {
//
// null input
@@ -108,7 +109,7 @@ public class ReferenceTest extends org.j
);
}
- @org.junit.Test
+ @Test
public void
testAccessors() throws Exception {
final Reference ref = new Reference(
@@ -121,7 +122,7 @@ public class ReferenceTest extends org.j
assertEquals(ref.getURI(), "bar");
}
- @org.junit.Test
+ @Test
public void testEquals() throws Exception{
assertTrue(ref.equals(refEqual));
assertTrue(refEqual.equals(ref));
@@ -130,7 +131,7 @@ public class ReferenceTest extends org.j
assertFalse(ref.equals("string"));
}
- @org.junit.Test
+ @Test
public void testHashcode() throws Exception{
assertEquals(ref.hashCode(), refEqual.hashCode());
assertFalse(ref.hashCode() == refNotEqual.hashCode());
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -31,6 +31,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecurityTestUtil;
import org.apache.wss4j.dom.engine.WSSConfig;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -53,7 +54,7 @@ public class SecurityTokenReferenceTest
/**
* Test for a Reference with no URI
*/
- @org.junit.Test
+ @Test
public void testReferenceNoURI() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -82,7 +83,7 @@ public class SecurityTokenReferenceTest
/**
* Test for a SecurityTokenReference having multiple data references
*/
- @org.junit.Test
+ @Test
public void testMultipleChildren() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -117,7 +118,7 @@ public class SecurityTokenReferenceTest
/**
* Test for a SecurityTokenReference having a Key Identifier with no ValueType
*/
- @org.junit.Test
+ @Test
public void testKeyIdentifierNoValueType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -146,7 +147,7 @@ public class SecurityTokenReferenceTest
/**
* Test for a SecurityTokenReference having a Key Identifier with a bad EncodingType
*/
- @org.junit.Test
+ @Test
public void testKeyIdentifierBadEncodingType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -181,7 +182,7 @@ public class SecurityTokenReferenceTest
/**
* Test for a SecurityTokenReference having a Key Identifier with no EncodingType
*/
- @org.junit.Test
+ @Test
public void testKeyIdentifierNoEncodingType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -215,7 +216,7 @@ public class SecurityTokenReferenceTest
* Test for a SecurityTokenReference having a Key Identifier with no EncodingType, but
* it should pass as the ValueType is for a SAML Assertion.
*/
- @org.junit.Test
+ @Test
public void testKeyIdentifierSAMLNoEncodingType() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -241,7 +242,7 @@ public class SecurityTokenReferenceTest
* Test for a SecurityTokenReference having an Embedded Child, which in turn has a
* SecurityTokenReference child.
*/
- @org.junit.Test
+ @Test
public void testEmbeddedSTRChild() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -277,7 +278,7 @@ public class SecurityTokenReferenceTest
* Test for a SecurityTokenReference having an Embedded Child, which has multiple
* children.
*/
- @org.junit.Test
+ @Test
public void testMultipleEmbeddedChildren() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -35,6 +35,7 @@ import org.apache.wss4j.dom.engine.WSSCo
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.junit.Test;
import org.w3c.dom.Document;
@@ -76,7 +77,7 @@ public class WCFUsernameTokenTest extend
* Test that adds a UserNameToken with a namespace qualified type. This should fail
* as WSS4J rejects these tokens by default.
*/
- @org.junit.Test
+ @Test
public void testNamespaceQualifiedTypeRejected() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUTMSG);
@@ -99,7 +100,7 @@ public class WCFUsernameTokenTest extend
* Test that adds a UserNameToken with a namespace qualified type. This should pass
* as WSS4J has been configured to accept these tokens.
*/
- @org.junit.Test
+ @Test
public void testNamespaceQualifiedTypeAccepted() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUTMSG);
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -43,6 +43,7 @@ import org.apache.wss4j.dom.message.WSSe
import org.apache.wss4j.dom.message.WSSecTimestamp;
import org.apache.wss4j.dom.message.WSSecUsernameToken;
import org.apache.wss4j.dom.message.token.UsernameToken;
+import org.junit.Test;
import org.w3c.dom.Document;
/**
@@ -67,7 +68,7 @@ public class FaultCodeTest extends org.j
* Test for the wsse:FailedCheck faultcode. This will fail due to a bad password in
* the callback handler.
*/
- @org.junit.Test
+ @Test
public void testFailedCheck() throws Exception {
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40", "security");
@@ -92,7 +93,7 @@ public class FaultCodeTest extends org.j
* Test for the wsse:UnsupportedAlgorithm faultcode. This will fail due to the argument
* passed to getCipherInstance.
*/
- @org.junit.Test
+ @Test
public void testUnsupportedAlgorithm() throws Exception {
try {
secEngine.getWssConfig();
@@ -110,7 +111,7 @@ public class FaultCodeTest extends org.j
* Test for the wsse:MessageExpired faultcode. This will fail due to the argument
* passed to setTimeToLive.
*/
- @org.junit.Test
+ @Test
public void testMessageExpired() throws Exception {
WSSecTimestamp builder = new WSSecTimestamp();
builder.setTimeToLive(-1);
@@ -135,7 +136,7 @@ public class FaultCodeTest extends org.j
* Test for the wsse:FailedAuthentication faultcode. This will fail due to a bad password in
* the callback handler.
*/
- @org.junit.Test
+ @Test
public void testFailedAuthentication() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.addCreated();
@@ -162,7 +163,7 @@ public class FaultCodeTest extends org.j
* Test for the wsse:InvalidSecurityToken faultcode. This will fail due to the fact
* that a null username is used.
*/
- @org.junit.Test
+ @Test
public void testInvalidSecurityToken() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.addCreated();
@@ -188,7 +189,7 @@ public class FaultCodeTest extends org.j
/**
* Test for the wsse:InvalidSecurity faultcode.
*/
- @org.junit.Test
+ @Test
public void testInvalidSecurity() throws Exception {
try {
new Reference((org.w3c.dom.Element)null);
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=1720903&r1=1720902&r2=1720903&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 Sat Dec 19 12:16:09 2015
@@ -55,6 +55,7 @@ import org.apache.wss4j.dom.message.WSSe
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.wss4j.dom.validate.Credential;
import org.apache.wss4j.dom.validate.Validator;
+import org.junit.Test;
import org.w3c.dom.Document;
/**
@@ -74,7 +75,7 @@ public class PrincipalTest extends org.j
/**
* Test the principal that is created after processing a Username Token
*/
- @org.junit.Test
+ @Test
public void testUsernameToken() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
@@ -106,7 +107,7 @@ public class PrincipalTest extends org.j
* Test the principal that is created after processing a Username Token, which has been
* transformed into a SAML Assertion.
*/
- @org.junit.Test
+ @Test
public void testTransformedUsernameToken() throws Exception {
WSSecUsernameToken builder = new WSSecUsernameToken();
builder.setUserInfo("wernerd", "verySecret");
@@ -133,7 +134,7 @@ public class PrincipalTest extends org.j
/**
* Test the principal that is created after processing a SAML Token
*/
- @org.junit.Test
+ @Test
public void testSAMLToken() throws Exception {
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
@@ -176,7 +177,7 @@ public class PrincipalTest extends org.j
/**
* Test the principal that is created after processing a SAML2 Token
*/
- @org.junit.Test
+ @Test
public void testSAML2Token() throws Exception {
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setStatement(SAML2CallbackHandler.Statement.AUTHN);
@@ -220,7 +221,7 @@ public class PrincipalTest extends org.j
* Test the principal that is created after processing a SAML Token, which has been
* transformed into another SAML Token.
*/
- @org.junit.Test
+ @Test
public void testTransformedSAMLToken() throws Exception {
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setStatement(SAML1CallbackHandler.Statement.AUTHN);
@@ -265,7 +266,7 @@ public class PrincipalTest extends org.j
* Test the principal that is created after processing (and explicitly validating)
* a BinarySecurityToken.
*/
- @org.junit.Test
+ @Test
public void testBinarySecurityToken() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);