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/16 12:22:11 UTC
svn commit: r1720336 - in /webservices/wss4j/trunk: ./
ws-security-stax/src/test/java/org/apache/wss4j/stax/test/
ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/
ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/
Author: coheigea
Date: Wed Dec 16 11:22:10 2015
New Revision: 1720336
URL: http://svn.apache.org/viewvc?rev=1720336&view=rev
Log:
Enabling PMD for the tests as well
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Wed Dec 16 11:22:10 2015
@@ -134,7 +134,7 @@
<failOnViolation>true</failOnViolation>
<linkXRef>false</linkXRef>
<verbose>true</verbose>
- <!--<includeTests>true</includeTests>-->
+ <includeTests>true</includeTests>
<targetJdk>${targetJdk}</targetJdk>
<excludeRoots>
<excludeRoot>${basedir}/src/main/generated</excludeRoot>
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java Wed Dec 16 11:22:10 2015
@@ -89,7 +89,7 @@ import org.junit.Assert;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public abstract class AbstractTestBase extends org.junit.Assert {
+public abstract class AbstractTestBase extends Assert {
//javax.xml.transform.Transformer transformer = TransformerFactory.newInstance().newTransformer();
//transformer.transform(new StreamSource(new ByteArrayInputStream(baos.toByteArray())), new StreamResult(System.out));
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java Wed Dec 16 11:22:10 2015
@@ -553,7 +553,7 @@ public class AttachmentTest extends Abst
Map<String, String> attHeaders = responseAttachment.getHeaders();
Assert.assertEquals(6, attHeaders.size());
- } catch (IOException ex) {
+ } catch (IOException ex) { //NOPMD
// expected
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java Wed Dec 16 11:22:10 2015
@@ -212,9 +212,9 @@ public class DerivedKeyTokenTest extends
}
}
- org.junit.Assert.assertEquals(6, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(1, operationSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
+ Assert.assertEquals(6, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(1, operationSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -289,9 +289,9 @@ public class DerivedKeyTokenTest extends
}
}
- org.junit.Assert.assertEquals(6, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(1, operationSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
+ Assert.assertEquals(6, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(1, operationSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -966,10 +966,10 @@ public class DerivedKeyTokenTest extends
}
}
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(6, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(6, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size());
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Wed Dec 16 11:22:10 2015
@@ -158,7 +158,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -225,8 +225,8 @@ public class EncDecryptionTest extends A
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -302,7 +302,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -371,8 +371,8 @@ public class EncDecryptionTest extends A
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -443,7 +443,7 @@ public class EncDecryptionTest extends A
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedKey.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedKey.getLocalPart());
Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_wsse_Security.getLocalPart());
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -623,24 +623,24 @@ public class EncDecryptionTest extends A
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents1.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents2.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents3.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents4.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents5.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents6.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents7.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents8.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents9.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents10.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents11.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents12.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents13.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents14.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents15.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents16.size());
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents17.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents1.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents2.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents3.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents4.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents5.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents6.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents7.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents8.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents9.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents10.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents11.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents12.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents13.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents14.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents15.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents16.size());
+ Assert.assertEquals(3, encryptedPartSecurityEvents17.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents1.size() +
encryptedPartSecurityEvents2.size() +
@@ -757,7 +757,7 @@ public class EncDecryptionTest extends A
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedKey.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedKey.getLocalPart());
Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_wsse_Security.getLocalPart());
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -874,7 +874,7 @@ public class EncDecryptionTest extends A
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedKey.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedKey.getLocalPart());
Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_wsse_Security.getLocalPart());
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -942,8 +942,8 @@ public class EncDecryptionTest extends A
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -965,8 +965,8 @@ public class EncDecryptionTest extends A
doOutboundSecurity(securityProperties, sourceDocument);
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- org.junit.Assert.assertEquals("Part to encrypt not found: {http://www.wrongnamespace.org}complexType", e.getCause().getMessage());
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertEquals("Part to encrypt not found: {http://www.wrongnamespace.org}complexType", e.getCause().getMessage());
}
}
}
@@ -1086,7 +1086,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -1163,7 +1163,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -1206,7 +1206,7 @@ public class EncDecryptionTest extends A
* parentElement.removeChild(node);
* parentElement.appendChild(node);
* <p/>
- * javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ * Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
* transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
* }
* <p/>
@@ -1333,7 +1333,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -1410,7 +1410,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -1487,7 +1487,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -1578,7 +1578,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
@@ -1662,7 +1662,7 @@ public class EncDecryptionTest extends A
String action = WSHandlerConstants.ENCRYPT;
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, new Properties());
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
securedDocument = doOutboundSecurityWithWSS4J(new ByteArrayInputStream(baos.toByteArray()), action, new Properties());
@@ -1817,8 +1817,8 @@ public class EncDecryptionTest extends A
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -1907,7 +1907,7 @@ public class EncDecryptionTest extends A
node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -2021,7 +2021,7 @@ public class EncDecryptionTest extends A
node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -2145,7 +2145,7 @@ public class EncDecryptionTest extends A
node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -2285,7 +2285,7 @@ public class EncDecryptionTest extends A
node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -2324,7 +2324,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -2434,7 +2434,7 @@ public class EncDecryptionTest extends A
Node node = (Node) xPathExpression.evaluate(securedDocument, XPathConstants.NODE);
Assert.assertNotNull(node);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
}
//test streaming decryption
@@ -2509,8 +2509,8 @@ public class EncDecryptionTest extends A
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -2544,8 +2544,8 @@ public class EncDecryptionTest extends A
xmlStreamWriter.close();
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- org.junit.Assert.assertEquals("Part to encrypt not found: {http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken", e.getCause().getMessage());
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertEquals("Part to encrypt not found: {http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken", e.getCause().getMessage());
}
}
}
@@ -2577,7 +2577,7 @@ public class EncDecryptionTest extends A
builder.addExternalRefElement(ref, secHeader);
builder.prependToHeader(secHeader);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
}
@@ -2620,7 +2620,7 @@ public class EncDecryptionTest extends A
builder.addExternalRefElement(ref, secHeader);
builder.prependToHeader(secHeader);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
}
@@ -2664,7 +2664,7 @@ public class EncDecryptionTest extends A
//builder.addExternalRefElement(ref, secHeader);
securityHeaderElement.appendChild(ref);
- javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+ Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java Wed Dec 16 11:22:10 2015
@@ -27,6 +27,7 @@ import java.util.List;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
+import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
@@ -115,7 +116,8 @@ public class EncryptionCRLTest extends A
doOutboundSecurity(securityProperties, sourceDocument);
Assert.fail("Expected failure on a revocation check");
} catch (Exception ex) {
- // expected
+ Assert.assertNotNull(ex.getCause());
+ Assert.assertTrue(ex.getCause() instanceof WSSecurityException);
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java Wed Dec 16 11:22:10 2015
@@ -160,11 +160,11 @@ public class InteroperabilityTest extend
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents1.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents2.size());
- org.junit.Assert.assertEquals(4, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(3, signedElementSecurityEvents1.size());
+ Assert.assertEquals(3, signedElementSecurityEvents2.size());
+ Assert.assertEquals(4, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents.size() +
signedElementSecurityEvents1.size() +
@@ -325,12 +325,12 @@ public class InteroperabilityTest extend
}
}
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(3, encryptedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents1.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents2.size());
- org.junit.Assert.assertEquals(4, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(3, encryptedElementSecurityEvents.size());
+ Assert.assertEquals(3, signedElementSecurityEvents1.size());
+ Assert.assertEquals(3, signedElementSecurityEvents2.size());
+ Assert.assertEquals(4, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents.size() +
encryptedElementSecurityEvents.size() +
@@ -456,10 +456,10 @@ public class InteroperabilityTest extend
}
}
- org.junit.Assert.assertEquals(4, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents1.size());
- org.junit.Assert.assertEquals(4, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(4, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(3, signedElementSecurityEvents1.size());
+ Assert.assertEquals(4, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents.size() +
signedElementSecurityEvents1.size() +
@@ -636,12 +636,12 @@ public class InteroperabilityTest extend
}
}
- org.junit.Assert.assertEquals(3, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(3, encryptedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents1.size());
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents2.size());
- org.junit.Assert.assertEquals(4, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(3, encryptedElementSecurityEvents.size());
+ Assert.assertEquals(3, signedElementSecurityEvents1.size());
+ Assert.assertEquals(3, signedElementSecurityEvents2.size());
+ Assert.assertEquals(4, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents.size() +
encryptedElementSecurityEvents.size() +
@@ -1307,7 +1307,7 @@ public class InteroperabilityTest extend
StringWriter stringWriter = new StringWriter();
PrintWriter pw = new PrintWriter(stringWriter);
ex.printStackTrace(pw);
- Assert.assertFalse(stringWriter.toString(), (t instanceof NullPointerException));
+ Assert.assertFalse(stringWriter.toString(), t instanceof NullPointerException);
t = t.getCause();
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java Wed Dec 16 11:22:10 2015
@@ -96,8 +96,8 @@ public class ReplayTest extends Abstract
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- org.junit.Assert.assertEquals("The message has expired", e.getCause().getMessage());
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertEquals("The message has expired", e.getCause().getMessage());
}
}
}
@@ -149,7 +149,7 @@ public class ReplayTest extends Abstract
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
}
}
}
@@ -160,7 +160,7 @@ public class ReplayTest extends Abstract
* no "OneTimeUse" Element is defined there is no problem with replaying it.
* with a OneTimeUse Element
*/
- @org.junit.Test
+ @Test
public void testEhCacheReplayedSAML2() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
@@ -224,7 +224,7 @@ public class ReplayTest extends Abstract
* Test that creates, sends and processes an unsigned SAML 2 authentication assertion
* with a OneTimeUse Element
*/
- @org.junit.Test
+ @Test
public void testEhCacheReplayedSAML2OneTimeUse() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
@@ -284,7 +284,7 @@ public class ReplayTest extends Abstract
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java Wed Dec 16 11:22:10 2015
@@ -214,8 +214,8 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents.size()
);
@@ -295,8 +295,8 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
encryptedPartSecurityEvents.size()
);
@@ -431,9 +431,9 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(6, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(6, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size()
);
@@ -520,9 +520,9 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(6, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(6, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size()
);
@@ -690,10 +690,10 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(5, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(5, signatureValueSecurityEvents.size());
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size() + encryptedPartSecurityEvents.size()
);
@@ -789,10 +789,10 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(5, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(5, signatureValueSecurityEvents.size());
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size() + encryptedPartSecurityEvents.size()
);
@@ -913,10 +913,10 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(5, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(5, signatureValueSecurityEvents.size());
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size() + encryptedPartSecurityEvents.size()
);
@@ -1012,10 +1012,10 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(5, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(5, signatureValueSecurityEvents.size());
+ Assert.assertEquals(5, encryptedPartSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size() + encryptedPartSecurityEvents.size()
);
@@ -1106,9 +1106,9 @@ public class SecurityContextTokenTest ex
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(4, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(4, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size()
);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java Wed Dec 16 11:22:10 2015
@@ -123,7 +123,8 @@ public class SignatureCRLTest extends Ab
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("Expected failure on a revocation check");
} catch (Exception ex) {
- // Expected
+ Assert.assertNotNull(ex.getCause());
+ Assert.assertTrue(ex.getCause() instanceof WSSecurityException);
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java Wed Dec 16 11:22:10 2015
@@ -306,8 +306,8 @@ public class SignatureTest extends Abstr
xmlStreamWriter.close();
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- org.junit.Assert.assertEquals("Part to sign not found: {http://www.wrongnamespace.org}complexType", e.getCause().getMessage());
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertEquals("Part to sign not found: {http://www.wrongnamespace.org}complexType", e.getCause().getMessage());
}
}
}
@@ -1368,9 +1368,9 @@ public class SignatureTest extends Abstr
}
}
- org.junit.Assert.assertEquals(3, signedElementSecurityEvents.size());
- org.junit.Assert.assertEquals(4, signatureValueSecurityEvents.size());
- org.junit.Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ Assert.assertEquals(3, signedElementSecurityEvents.size());
+ Assert.assertEquals(4, signatureValueSecurityEvents.size());
+ Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size()
);
@@ -1692,8 +1692,8 @@ public class SignatureTest extends Abstr
xmlStreamWriter.close();
Assert.fail("Exception expected");
} catch (XMLStreamException e) {
- org.junit.Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- org.junit.Assert.assertEquals("Part to sign not found: {http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken", e.getCause().getMessage());
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
+ Assert.assertEquals("Part to sign not found: {http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken", e.getCause().getMessage());
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java Wed Dec 16 11:22:10 2015
@@ -358,7 +358,7 @@ public class TimestampTest extends Abstr
// now allow future TTL of 2 hours +
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
- securityProperties.setTimeStampFutureTTL((2 * 60 * 60) + 100);
+ securityProperties.setTimeStampFutureTTL(2 * 60 * 60 + 100);
InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
@@ -553,7 +553,8 @@ public class TimestampTest extends Abstr
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
fail("Failure expected on no Expires Element");
} catch (XMLStreamException e) {
- // expected
+ Assert.assertNotNull(e.getCause());
+ Assert.assertTrue(e.getCause() instanceof WSSecurityException);
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java Wed Dec 16 11:22:10 2015
@@ -68,7 +68,7 @@ public class SAMLTokenNegativeTest exten
Assert.assertEquals(nodeList.getLength(), 2);
NodeList list = securedDocument.getElementsByTagNameNS(WSConstants.SAML2_NS, "Assertion");
- Element assertionElement = (org.w3c.dom.Element) list.item(0);
+ Element assertionElement = (Element) list.item(0);
assertionElement.setAttributeNS(null, "MinorVersion", "5");
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
@@ -115,11 +115,11 @@ public class SAMLTokenNegativeTest exten
Element envelope = securedDocument.getDocumentElement();
NodeList list = envelope.getElementsByTagNameNS(WSConstants.SAML_NS, "Assertion");
- Element assertionElement = (org.w3c.dom.Element) list.item(0);
+ Element assertionElement = (Element) list.item(0);
list = assertionElement.getElementsByTagNameNS(WSConstants.SIG_NS, "Signature");
- Element sigElement = (org.w3c.dom.Element) list.item(0);
+ Element sigElement = (Element) list.item(0);
list = sigElement.getElementsByTagNameNS(WSConstants.SIG_NS, "Transform");
- Element transformElement = (org.w3c.dom.Element) list.item(0);
+ Element transformElement = (Element) list.item(0);
transformElement.setAttributeNS(null, "Algorithm", WSConstants.C14N_EXCL_OMIT_COMMENTS);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
@@ -164,7 +164,7 @@ public class SAMLTokenNegativeTest exten
Assert.assertEquals(nodeList.getLength(), 2);
NodeList list = securedDocument.getElementsByTagNameNS(WSConstants.SAML2_NS, "Assertion");
- Element assertionElement = (org.w3c.dom.Element) list.item(0);
+ Element assertionElement = (Element) list.item(0);
assertionElement.setAttributeNS(null, "MinorVersion", "5");
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Wed Dec 16 11:22:10 2015
@@ -68,6 +68,7 @@ import org.apache.wss4j.stax.validate.Sa
import org.apache.xml.security.encryption.EncryptedData;
import org.apache.xml.security.encryption.EncryptedKey;
import org.apache.xml.security.encryption.XMLCipher;
+import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.joda.time.DateTime;
@@ -86,6 +87,8 @@ import org.w3c.dom.NodeList;
public class SAMLTokenTest extends AbstractTestBase {
+ private static final String IP_ADDRESS = "12.34.56.78"; //NOPMD
+
@Test
public void testSAML1AuthnAssertionOutbound() throws Exception {
@@ -631,7 +634,7 @@ public class SAMLTokenTest extends Abstr
callbackHandler.setStatement(SAMLCallbackHandlerImpl.Statement.AUTHN);
callbackHandler.setIssuer("www.example.com");
callbackHandler.setSignAssertion(false);
- callbackHandler.setSubjectLocality("12.34.56.78", "test-dns");
+ callbackHandler.setSubjectLocality(IP_ADDRESS, "test-dns");
securityProperties.setSamlCallbackHandler(callbackHandler);
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
@@ -670,7 +673,7 @@ public class SAMLTokenTest extends Abstr
callbackHandler.setIssuer("www.example.com");
callbackHandler.setSignAssertion(false);
callbackHandler.setSamlVersion(Version.SAML_20);
- callbackHandler.setSubjectLocality("12.34.56.78", "test-dns");
+ callbackHandler.setSubjectLocality(IP_ADDRESS, "test-dns");
securityProperties.setSamlCallbackHandler(callbackHandler);
OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
@@ -869,7 +872,7 @@ public class SAMLTokenTest extends Abstr
* Test that creates, sends and processes an unsigned SAML 2 authentication assertion, which
* is encrypted in a saml2:EncryptedAssertion Element in the security header
*/
- @org.junit.Test
+ @Test
public void testSAML2EncryptedAssertion() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1020,7 +1023,7 @@ public class SAMLTokenTest extends Abstr
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
fail("Failure expected on a Bearer assertion");
} catch (XMLStreamException e) {
- // expected
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
}
}
}
@@ -1064,7 +1067,7 @@ public class SAMLTokenTest extends Abstr
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
fail("Failure expected on an unknown subject confirmation method");
} catch (XMLStreamException e) {
- // expected
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
}
}
@@ -1125,7 +1128,7 @@ public class SAMLTokenTest extends Abstr
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
fail("Failure expected on an unsigned bearer token");
} catch (XMLStreamException e) {
- // expected
+ Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java Wed Dec 16 11:22:10 2015
@@ -49,6 +49,8 @@ import org.w3c.dom.NodeList;
*/
public class SamlAuthnTest extends AbstractTestBase {
+ private static final String IP_ADDRESS = "127.0.0.1"; //NOPMD
+
@Test
public void testSAML1AuthnAssertion() throws Exception {
@@ -118,7 +120,7 @@ public class SamlAuthnTest extends Abstr
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setIssuer("www.example.com");
- callbackHandler.setSubjectLocality("127.0.0.1", "xyz.ws.apache.org");
+ callbackHandler.setSubjectLocality(IP_ADDRESS, "xyz.ws.apache.org");
createDOMMessageAndVerifyStAX(callbackHandler, true);
}
@@ -131,7 +133,7 @@ public class SamlAuthnTest extends Abstr
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setIssuer("www.example.com");
- callbackHandler.setSubjectLocality("127.0.0.1", "xyz.ws.apache.org");
+ callbackHandler.setSubjectLocality(IP_ADDRESS, "xyz.ws.apache.org");
createDOMMessageAndVerifyStAX(callbackHandler, true);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java Wed Dec 16 11:22:10 2015
@@ -423,7 +423,7 @@ public class SamlConditionsTest extends
* Test that creates, sends and processes an unsigned SAML 2 authentication assertion
* with a ProxyRestriction Element
*/
- @org.junit.Test
+ @Test
public void testSAML2ProxyRestriction() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
@@ -469,7 +469,7 @@ public class SamlConditionsTest extends
* Test that creates, sends and processes an unsigned SAML 2 authentication assertion
* with an AudienceRestriction Element
*/
- @org.junit.Test
+ @Test
public void testSAML2AudienceRestriction() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
@@ -511,7 +511,7 @@ public class SamlConditionsTest extends
}
// Now test AudienceRestrictions with supplied restrictions
- @org.junit.Test
+ @Test
public void testSAML2AudienceRestrictionValidation() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
List<String> audiences = new ArrayList<String>();
@@ -573,7 +573,7 @@ public class SamlConditionsTest extends
}
// Now test AudienceRestrictions with supplied restrictions
- @org.junit.Test
+ @Test
public void testSAML1AudienceRestrictionValidation() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
List<String> audiences = new ArrayList<String>();
@@ -638,7 +638,7 @@ public class SamlConditionsTest extends
* Test that creates, sends and processes an unsigned SAML 2 authentication assertion
* with two AudienceRestriction Elements
*/
- @org.junit.Test
+ @Test
public void testSAML2AudienceRestrictionSeparateRestrictions() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
@@ -686,7 +686,7 @@ public class SamlConditionsTest extends
}
// Now test AudienceRestrictions with supplied restrictions
- @org.junit.Test
+ @Test
public void testSAML1AudienceRestrictionSeparateRestrictionsValidation() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java Wed Dec 16 11:22:10 2015
@@ -46,8 +46,8 @@ public class SecretKeyCallbackHandler im
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if ((pc.getUsage() == WSPasswordCallback.SECRET_KEY)
- || (pc.getUsage() == WSPasswordCallback.SECURITY_CONTEXT_TOKEN)) {
+ if (pc.getUsage() == WSPasswordCallback.SECRET_KEY
+ || pc.getUsage() == WSPasswordCallback.SECURITY_CONTEXT_TOKEN) {
byte[] secret = this.secrets.get(pc.getIdentifier());
if (secret == null) {
secret = outboundSecret;
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java?rev=1720336&r1=1720335&r2=1720336&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java Wed Dec 16 11:22:10 2015
@@ -31,7 +31,7 @@ public class StAX2DOM {
public static Document readDoc(DocumentBuilder documentBuilder, XMLStreamReader xmlStreamReader) throws XMLStreamException {
//skip possible text at the beginning of a document and go directly to the root tag
- while (xmlStreamReader.hasNext() && xmlStreamReader.next() != XMLStreamConstants.START_ELEMENT) {
+ while (xmlStreamReader.hasNext() && xmlStreamReader.next() != XMLStreamConstants.START_ELEMENT) { //NOPMD
}
Document document = documentBuilder.newDocument();
StAX2DOM.readDocElements(document, document, xmlStreamReader, false, false);