You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2019/01/03 11:48:58 UTC
svn commit: r1850227 [5/11] - in /webservices/wss4j/trunk: build-tools/
integration/src/test/java/org/apache/wss4j/integration/test/kerberos/
performance/src/test/java/org/apache/wss4j/performance/
policy/src/test/java/org/apache/wss4j/policy/tests/ ws...
Modified: webservices/wss4j/trunk/ws-security-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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -63,12 +63,17 @@ import org.apache.wss4j.stax.test.utils.
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.SecurePart;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
-import org.junit.Assert;
import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class AttachmentTest extends AbstractTestBase {
public AttachmentTest() throws Exception {
@@ -141,14 +146,14 @@ public class AttachmentTest extends Abst
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList sigReferences = document.getElementsByTagNameNS(WSConstants.SIG_NS, "Reference");
- Assert.assertEquals(2, sigReferences.getLength());
+ assertEquals(2, sigReferences.getLength());
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
}
@Test
@@ -211,10 +216,10 @@ public class AttachmentTest extends Abst
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- Assert.assertTrue(e.getCause().getMessage().startsWith("Invalid digest of reference cid:"));
+ assertTrue(e.getCause() instanceof XMLSecurityException);
+ assertTrue(e.getCause().getMessage().startsWith("Invalid digest of reference cid:"));
}
}
}
@@ -265,15 +270,15 @@ public class AttachmentTest extends Abst
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList sigReferences = document.getElementsByTagNameNS(WSConstants.SIG_NS, "Reference");
- Assert.assertEquals(2, sigReferences.getLength());
+ assertEquals(2, sigReferences.getLength());
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
}
@Test
@@ -336,10 +341,10 @@ public class AttachmentTest extends Abst
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- Assert.assertTrue(e.getCause().getMessage().startsWith("Invalid digest of reference cid:"));
+ assertTrue(e.getCause() instanceof XMLSecurityException);
+ assertTrue(e.getCause().getMessage().startsWith("Invalid digest of reference cid:"));
}
}
}
@@ -398,15 +403,15 @@ public class AttachmentTest extends Abst
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList sigReferences = document.getElementsByTagNameNS(WSConstants.SIG_NS, "Reference");
- Assert.assertEquals(3, sigReferences.getLength());
+ assertEquals(3, sigReferences.getLength());
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
}
@Test
@@ -443,18 +448,18 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList references = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "DataReference");
- Assert.assertEquals(2, references.getLength());
+ assertEquals(2, references.getLength());
NodeList cipherReferences = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "CipherReference");
- Assert.assertEquals(1, cipherReferences.getLength());
+ assertEquals(1, cipherReferences.getLength());
NodeList encDatas = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData");
- Assert.assertEquals(2, encDatas.getLength());
+ assertEquals(2, encDatas.getLength());
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(2, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedData");
+ assertEquals(2, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedData");
}
attachmentCallbackHandler = new AttachmentCallbackHandler(encryptedAttachments);
@@ -469,15 +474,15 @@ public class AttachmentTest extends Abst
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
Map<String, String> attHeaders = responseAttachment.getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
}
@Test
@@ -515,18 +520,18 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList references = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "DataReference");
- Assert.assertEquals(2, references.getLength());
+ assertEquals(2, references.getLength());
NodeList cipherReferences = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "CipherReference");
- Assert.assertEquals(1, cipherReferences.getLength());
+ assertEquals(1, cipherReferences.getLength());
NodeList encDatas = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData");
- Assert.assertEquals(2, encDatas.getLength());
+ assertEquals(2, encDatas.getLength());
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(2, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedData");
+ assertEquals(2, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedData");
}
attachmentCallbackHandler = new AttachmentCallbackHandler(encryptedAttachments);
@@ -541,15 +546,15 @@ public class AttachmentTest extends Abst
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
Map<String, String> attHeaders = responseAttachment.getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
}
@Test
@@ -585,18 +590,18 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList references = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "DataReference");
- Assert.assertEquals(2, references.getLength());
+ assertEquals(2, references.getLength());
NodeList cipherReferences = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "CipherReference");
- Assert.assertEquals(1, cipherReferences.getLength());
+ assertEquals(1, cipherReferences.getLength());
NodeList encDatas = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData");
- Assert.assertEquals(2, encDatas.getLength());
+ assertEquals(2, encDatas.getLength());
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(2, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedData");
+ assertEquals(2, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedData");
}
final PushbackInputStream pis = new PushbackInputStream(encryptedAttachments.get(0).getSourceStream(), 1);
@@ -614,17 +619,17 @@ public class AttachmentTest extends Abst
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
// Different behaviour here for different JDKs...
try {
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertFalse(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertFalse(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
Map<String, String> attHeaders = responseAttachment.getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
} catch (IOException ex) { //NOPMD
// expected
}
@@ -663,19 +668,19 @@ public class AttachmentTest extends Abst
encrypt.prependToHeader();
NodeList references = doc.getElementsByTagNameNS(WSConstants.ENC_NS, "DataReference");
- Assert.assertEquals(2, references.getLength());
+ assertEquals(2, references.getLength());
NodeList cipherReferences = doc.getElementsByTagNameNS(WSConstants.ENC_NS, "CipherReference");
- Assert.assertEquals(1, cipherReferences.getLength());
+ assertEquals(1, cipherReferences.getLength());
NodeList encDatas = doc.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData");
- Assert.assertEquals(2, encDatas.getLength());
+ assertEquals(2, encDatas.getLength());
NodeList securityHeaderElement = doc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(3, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "ReferenceList");
- Assert.assertEquals(childs.item(2).getLocalName(), "EncryptedData");
+ assertEquals(3, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "ReferenceList");
+ assertEquals(childs.item(2).getLocalName(), "EncryptedData");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -693,14 +698,14 @@ public class AttachmentTest extends Abst
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
Map<String, String> attHeaders = responseAttachment.getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
}
@Test
@@ -738,20 +743,20 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList references = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "DataReference");
- Assert.assertEquals(2, references.getLength());
+ assertEquals(2, references.getLength());
NodeList cipherReferences = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "CipherReference");
- Assert.assertEquals(1, cipherReferences.getLength());
+ assertEquals(1, cipherReferences.getLength());
NodeList encDatas = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData");
- Assert.assertEquals(2, encDatas.getLength());
+ assertEquals(2, encDatas.getLength());
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(2, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedData");
+ assertEquals(2, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedData");
- Assert.assertEquals(1, encryptedAttachments.get(0).getHeaders().size());
+ assertEquals(1, encryptedAttachments.get(0).getHeaders().size());
}
attachmentCallbackHandler = new AttachmentCallbackHandler(encryptedAttachments);
@@ -766,14 +771,14 @@ public class AttachmentTest extends Abst
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
Map<String, String> attHeaders = responseAttachment.getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
}
@Test
@@ -811,20 +816,20 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList references = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "DataReference");
- Assert.assertEquals(2, references.getLength());
+ assertEquals(2, references.getLength());
NodeList cipherReferences = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "CipherReference");
- Assert.assertEquals(1, cipherReferences.getLength());
+ assertEquals(1, cipherReferences.getLength());
NodeList encDatas = securedDoc.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData");
- Assert.assertEquals(2, encDatas.getLength());
+ assertEquals(2, encDatas.getLength());
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(2, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedData");
+ assertEquals(2, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedData");
- Assert.assertEquals(1, encryptedAttachments.get(0).getHeaders().size());
+ assertEquals(1, encryptedAttachments.get(0).getHeaders().size());
}
final PushbackInputStream pis = new PushbackInputStream(encryptedAttachments.get(0).getSourceStream(), 1);
@@ -842,16 +847,16 @@ public class AttachmentTest extends Abst
try {
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof WSSecurityException);
- // Assert.assertEquals(e.getCause().getMessage(), "The signature or decryption was invalid");
+ assertTrue(e.getCause() instanceof WSSecurityException);
+ // assertEquals(e.getCause().getMessage(), "The signature or decryption was invalid");
return;
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachmentBytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertFalse(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertFalse(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
}
}
@@ -909,22 +914,22 @@ public class AttachmentTest extends Abst
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
}
- Assert.assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
+ assertFalse(attachmentCallbackHandler.getResponseAttachments().isEmpty());
Attachment responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(0);
byte[] attachment1Bytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachment1Bytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachment1Bytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", responseAttachment.getMimeType());
Map<String, String> att1Headers = responseAttachment.getHeaders();
- Assert.assertEquals(6, att1Headers.size());
+ assertEquals(6, att1Headers.size());
responseAttachment = attachmentCallbackHandler.getResponseAttachments().get(1);
byte[] attachment2Bytes = readInputStream(responseAttachment.getSourceStream());
- Assert.assertTrue(Arrays.equals(attachment2Bytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/plain", responseAttachment.getMimeType());
+ assertTrue(Arrays.equals(attachment2Bytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/plain", responseAttachment.getMimeType());
Map<String, String> att2Headers = responseAttachment.getHeaders();
- Assert.assertEquals(6, att2Headers.size());
+ assertEquals(6, att2Headers.size());
}
@Test
@@ -980,14 +985,14 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(3, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedData");
- Assert.assertEquals(childs.item(2).getLocalName(), "Signature");
+ assertEquals(3, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedData");
+ assertEquals(childs.item(2).getLocalName(), "Signature");
- Assert.assertEquals(1, attachment[0].getHeaders().size());
+ assertEquals(1, attachment[0].getHeaders().size());
}
{
@@ -1021,11 +1026,11 @@ public class AttachmentTest extends Abst
}
byte[] attachmentBytes = readInputStream(attachment[0].getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", attachment[0].getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", attachment[0].getMimeType());
Map<String, String> attHeaders = attachment[0].getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
}
@Test
@@ -1113,10 +1118,10 @@ public class AttachmentTest extends Abst
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertTrue(e.getCause() instanceof XMLSecurityException);
- Assert.assertTrue(e.getCause().getMessage().startsWith("Invalid digest of reference cid:"));
+ assertTrue(e.getCause() instanceof XMLSecurityException);
+ assertTrue(e.getCause().getMessage().startsWith("Invalid digest of reference cid:"));
}
}
}
@@ -1174,14 +1179,14 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(3, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "Signature");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(2).getLocalName(), "EncryptedData");
+ assertEquals(3, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "Signature");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(2).getLocalName(), "EncryptedData");
- Assert.assertEquals(1, attachment[0].getHeaders().size());
+ assertEquals(1, attachment[0].getHeaders().size());
}
{
@@ -1215,11 +1220,11 @@ public class AttachmentTest extends Abst
}
byte[] attachmentBytes = readInputStream(attachment[0].getSourceStream());
- Assert.assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
- Assert.assertEquals("text/xml", attachment[0].getMimeType());
+ assertTrue(Arrays.equals(attachmentBytes, SOAPUtil.SAMPLE_SOAP_MSG.getBytes(StandardCharsets.UTF_8)));
+ assertEquals("text/xml", attachment[0].getMimeType());
Map<String, String> attHeaders = attachment[0].getHeaders();
- Assert.assertEquals(6, attHeaders.size());
+ assertEquals(6, attHeaders.size());
}
@Test
@@ -1275,12 +1280,12 @@ public class AttachmentTest extends Abst
Document securedDoc = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList securityHeaderElement = securedDoc.getElementsByTagNameNS(WSConstants.WSSE_NS, "Security");
- Assert.assertEquals(1, securityHeaderElement.getLength());
+ assertEquals(1, securityHeaderElement.getLength());
NodeList childs = securityHeaderElement.item(0).getChildNodes();
- Assert.assertEquals(3, childs.getLength());
- Assert.assertEquals(childs.item(0).getLocalName(), "Signature");
- Assert.assertEquals(childs.item(1).getLocalName(), "EncryptedKey");
- Assert.assertEquals(childs.item(2).getLocalName(), "EncryptedData");
+ assertEquals(3, childs.getLength());
+ assertEquals(childs.item(0).getLocalName(), "Signature");
+ assertEquals(childs.item(1).getLocalName(), "EncryptedKey");
+ assertEquals(childs.item(2).getLocalName(), "EncryptedData");
}
{
@@ -1316,11 +1321,11 @@ public class AttachmentTest extends Abst
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
- Assert.fail("Exception expected");
+ fail("Exception expected");
} catch (XMLStreamException e) {
- Assert.assertNotNull(e.getMessage());
+ assertNotNull(e.getMessage());
}
}
}
-}
+}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java?rev=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java Thu Jan 3 11:48:56 2019
@@ -29,9 +29,13 @@ import org.apache.wss4j.stax.securityTok
import org.apache.wss4j.stax.setup.ConfigurationConverter;
import org.apache.wss4j.stax.setup.WSSec;
import org.apache.wss4j.stax.test.saml.SAMLCallbackHandlerImpl;
-import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Some tests for the ConfigurationConverter utility
*/
@@ -48,14 +52,14 @@ public class ConfigurationConverterTest
config.put(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, "false");
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getTokenUser(), "testuser");
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.USERNAMETOKEN);
- Assert.assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
- Assert.assertEquals(properties.getUsernameTokenPasswordType(),
+ assertEquals(properties.getTokenUser(), "testuser");
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.USERNAMETOKEN);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertEquals(properties.getUsernameTokenPasswordType(),
UsernameTokenPasswordType.PASSWORD_TEXT);
- Assert.assertTrue(properties.isAddUsernameTokenNonce());
- Assert.assertFalse(properties.isAddUsernameTokenCreated());
+ assertTrue(properties.isAddUsernameTokenNonce());
+ assertFalse(properties.isAddUsernameTokenCreated());
WSSec.validateAndApplyDefaultsToOutboundSecurityProperties(properties);
}
@@ -76,21 +80,21 @@ public class ConfigurationConverterTest
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getSignatureUser(), "transmitter");
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.SIGNATURE);
- Assert.assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
- Assert.assertEquals(properties.getSignatureAlgorithm(), sigAlgo);
- Assert.assertEquals(properties.getSignatureKeyIdentifiers().size(), 1);
- Assert.assertEquals(properties.getSignatureKeyIdentifiers().get(0),
+ assertEquals(properties.getSignatureUser(), "transmitter");
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.SIGNATURE);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertEquals(properties.getSignatureAlgorithm(), sigAlgo);
+ assertEquals(properties.getSignatureKeyIdentifiers().size(), 1);
+ assertEquals(properties.getSignatureKeyIdentifiers().get(0),
WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER);
- Assert.assertFalse(properties.isAddExcC14NInclusivePrefixes());
- Assert.assertNotNull(properties.getSignatureCrypto());
- Assert.assertNotNull(properties.getSignatureSecureParts());
- Assert.assertEquals(properties.getSignatureSecureParts().size(), 1);
- Assert.assertEquals(properties.getSignatureSecureParts().get(0).getName().getLocalPart(),
+ assertFalse(properties.isAddExcC14NInclusivePrefixes());
+ assertNotNull(properties.getSignatureCrypto());
+ assertNotNull(properties.getSignatureSecureParts());
+ assertEquals(properties.getSignatureSecureParts().size(), 1);
+ assertEquals(properties.getSignatureSecureParts().get(0).getName().getLocalPart(),
"Body");
- Assert.assertEquals(properties.getSignatureSecureParts().get(0).getName().getNamespaceURI(),
+ assertEquals(properties.getSignatureSecureParts().get(0).getName().getNamespaceURI(),
"http://schemas.xmlsoap.org/soap/envelope/");
WSSec.validateAndApplyDefaultsToOutboundSecurityProperties(properties);
@@ -108,12 +112,12 @@ public class ConfigurationConverterTest
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.SIGNATURE);
- Assert.assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
- Assert.assertTrue(properties.isDisableBSPEnforcement());
- Assert.assertTrue(properties.isEnableRevocation());
- Assert.assertNotNull(properties.getSignatureVerificationCrypto());
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.SIGNATURE);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertTrue(properties.isDisableBSPEnforcement());
+ assertTrue(properties.isEnableRevocation());
+ assertNotNull(properties.getSignatureVerificationCrypto());
WSSec.validateAndApplyDefaultsToInboundSecurityProperties(properties);
}
@@ -132,20 +136,20 @@ public class ConfigurationConverterTest
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getEncryptionUser(), "transmitter");
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPT);
- Assert.assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
- Assert.assertEquals(properties.getEncryptionKeyTransportAlgorithm(),
+ assertEquals(properties.getEncryptionUser(), "transmitter");
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPT);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertEquals(properties.getEncryptionKeyTransportAlgorithm(),
WSSConstants.NS_XENC_RSA15);
- Assert.assertEquals(properties.getEncryptionKeyIdentifier(),
+ assertEquals(properties.getEncryptionKeyIdentifier(),
WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER);
- Assert.assertNotNull(properties.getEncryptionCrypto());
- Assert.assertNotNull(properties.getEncryptionSecureParts());
- Assert.assertEquals(properties.getEncryptionSecureParts().size(), 1);
- Assert.assertEquals(properties.getEncryptionSecureParts().get(0).getName().getLocalPart(),
+ assertNotNull(properties.getEncryptionCrypto());
+ assertNotNull(properties.getEncryptionSecureParts());
+ assertEquals(properties.getEncryptionSecureParts().size(), 1);
+ assertEquals(properties.getEncryptionSecureParts().get(0).getName().getLocalPart(),
"Body");
- Assert.assertEquals(properties.getEncryptionSecureParts().get(0).getName().getNamespaceURI(),
+ assertEquals(properties.getEncryptionSecureParts().get(0).getName().getNamespaceURI(),
"http://schemas.xmlsoap.org/soap/envelope/");
WSSec.validateAndApplyDefaultsToOutboundSecurityProperties(properties);
@@ -161,10 +165,10 @@ public class ConfigurationConverterTest
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPT);
- Assert.assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
- Assert.assertNotNull(properties.getDecryptionCrypto());
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPT);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertNotNull(properties.getDecryptionCrypto());
WSSec.validateAndApplyDefaultsToInboundSecurityProperties(properties);
}
@@ -176,9 +180,9 @@ public class ConfigurationConverterTest
config.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAMLCallbackHandlerImpl());
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.SAML_TOKEN_UNSIGNED);
- Assert.assertTrue(properties.getSamlCallbackHandler() instanceof SAMLCallbackHandlerImpl);
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.SAML_TOKEN_UNSIGNED);
+ assertTrue(properties.getSamlCallbackHandler() instanceof SAMLCallbackHandlerImpl);
WSSec.validateAndApplyDefaultsToOutboundSecurityProperties(properties);
}
@@ -191,9 +195,9 @@ public class ConfigurationConverterTest
config.put(ConfigurationConstants.TTL_TIMESTAMP, "180");
WSSSecurityProperties properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getActions().size(), 1);
- Assert.assertEquals(properties.getActions().get(0), WSSConstants.TIMESTAMP);
- Assert.assertEquals(properties.getTimestampTTL(), Integer.valueOf(180));
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.TIMESTAMP);
+ assertEquals(properties.getTimestampTTL(), Integer.valueOf(180));
WSSec.validateAndApplyDefaultsToOutboundSecurityProperties(properties);
@@ -202,10 +206,10 @@ public class ConfigurationConverterTest
config.put(ConfigurationConstants.TIMESTAMP_STRICT, "false");
properties = ConfigurationConverter.convert(config);
- Assert.assertEquals(properties.getTimeStampFutureTTL(), Integer.valueOf(120));
- Assert.assertFalse(properties.isStrictTimestampCheck());
+ assertEquals(properties.getTimeStampFutureTTL(), Integer.valueOf(120));
+ assertFalse(properties.isStrictTimestampCheck());
WSSec.validateAndApplyDefaultsToInboundSecurityProperties(properties);
}
-}
+}
\ No newline at end of file
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=1850227&r1=1850226&r2=1850227&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 Thu Jan 3 11:48:56 2019
@@ -63,7 +63,6 @@ import org.apache.wss4j.stax.test.utils.
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -72,6 +71,8 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
+import static org.junit.Assert.assertEquals;
+
@RunWith(value = org.junit.runners.Parameterized.class)
public class DerivedKeyTokenTest extends AbstractTestBase {
@@ -118,7 +119,7 @@ public class DerivedKeyTokenTest extends
Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
}
{
String action = WSHandlerConstants.ENCRYPT;
@@ -161,7 +162,7 @@ public class DerivedKeyTokenTest extends
encrKeyBuilder.prependBSTElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -190,7 +191,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
securityEventListener.compare();
@@ -212,9 +213,9 @@ public class DerivedKeyTokenTest extends
}
}
- Assert.assertEquals(6, encryptedPartSecurityEvents.size());
- Assert.assertEquals(1, operationSecurityEvents.size());
- Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
+ assertEquals(6, encryptedPartSecurityEvents.size());
+ assertEquals(1, operationSecurityEvents.size());
+ assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -238,7 +239,7 @@ public class DerivedKeyTokenTest extends
//some test that we can really sure we get what we want from WSS4J
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
@@ -267,7 +268,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
securityEventListener.compare();
@@ -289,9 +290,9 @@ public class DerivedKeyTokenTest extends
}
}
- Assert.assertEquals(6, encryptedPartSecurityEvents.size());
- Assert.assertEquals(1, operationSecurityEvents.size());
- Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
+ assertEquals(6, encryptedPartSecurityEvents.size());
+ assertEquals(1, operationSecurityEvents.size());
+ assertEquals(securityEventListener.getReceivedSecurityEvents().size(), operationSecurityEvents.size() + encryptedPartSecurityEvents.size());
}
}
@@ -319,7 +320,7 @@ public class DerivedKeyTokenTest extends
Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
}
{
String action = WSHandlerConstants.ENCRYPT;
@@ -362,7 +363,7 @@ public class DerivedKeyTokenTest extends
encrKeyBuilder.prependBSTElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -377,7 +378,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
}
}
@@ -401,7 +402,7 @@ public class DerivedKeyTokenTest extends
//some test that we can really sure we get what we want from WSS4J
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
@@ -417,7 +418,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
}
}
@@ -447,7 +448,7 @@ public class DerivedKeyTokenTest extends
Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
}
{
String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
@@ -486,7 +487,7 @@ public class DerivedKeyTokenTest extends
encrKeyBuilder.prependBSTElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -503,7 +504,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
}
@@ -525,7 +526,7 @@ public class DerivedKeyTokenTest extends
//some test that we can really sure we get what we want from WSS4J
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
@@ -542,7 +543,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
}
@@ -570,20 +571,20 @@ public class DerivedKeyTokenTest extends
Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSC0512_SCT.getNamespaceURI(), WSSConstants.TAG_WSC0512_SCT.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedKey.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedKey.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSC0512_DKT.getNamespaceURI(), WSSConstants.TAG_WSC0512_DKT.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSSE_KEY_IDENTIFIER.getNamespaceURI(), WSSConstants.TAG_WSSE_KEY_IDENTIFIER.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
Attr attr = (Attr) nodeList.item(0).getAttributes().getNamedItem(WSSConstants.ATT_NULL_VALUE_TYPE.getLocalPart());
- Assert.assertEquals(attr.getValue(), WSSConstants.NS_THUMBPRINT);
+ assertEquals(attr.getValue(), WSSConstants.NS_THUMBPRINT);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
{
String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
@@ -617,7 +618,7 @@ public class DerivedKeyTokenTest extends
sigBuilder.prependDKElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -634,7 +635,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
}
@@ -656,7 +657,7 @@ public class DerivedKeyTokenTest extends
//some test that we can really sure we get what we want from WSS4J
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
@@ -673,7 +674,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
}
@@ -701,20 +702,20 @@ public class DerivedKeyTokenTest extends
Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSC0512_SCT.getNamespaceURI(), WSSConstants.TAG_WSC0512_SCT.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedKey.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedKey.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSC0512_DKT.getNamespaceURI(), WSSConstants.TAG_WSC0512_DKT.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSSE_KEY_IDENTIFIER.getNamespaceURI(), WSSConstants.TAG_WSSE_KEY_IDENTIFIER.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
Attr attr = (Attr) nodeList.item(0).getAttributes().getNamedItem(WSSConstants.ATT_NULL_VALUE_TYPE.getLocalPart());
- Assert.assertEquals(attr.getValue(), WSSConstants.NS_X509_SKI);
+ assertEquals(attr.getValue(), WSSConstants.NS_X509_SKI);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
{
String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
@@ -748,7 +749,7 @@ public class DerivedKeyTokenTest extends
sigBuilder.prependDKElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -765,7 +766,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
}
@@ -787,7 +788,7 @@ public class DerivedKeyTokenTest extends
//some test that we can really sure we get what we want from WSS4J
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
@@ -804,7 +805,7 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
}
@@ -835,16 +836,16 @@ public class DerivedKeyTokenTest extends
Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSC0512_SCT.getNamespaceURI(), WSSConstants.TAG_WSC0512_SCT.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedKey.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedKey.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSC0512_DKT.getNamespaceURI(), WSSConstants.TAG_WSC0512_DKT.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 2);
+ assertEquals(nodeList.getLength(), 2);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
}
{
String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
@@ -891,10 +892,10 @@ public class DerivedKeyTokenTest extends
encrKeyBuilder.prependBSTElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -931,10 +932,10 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
securityEventListener.compare();
@@ -966,10 +967,10 @@ public class DerivedKeyTokenTest extends
}
}
- Assert.assertEquals(5, encryptedPartSecurityEvents.size());
- Assert.assertEquals(3, signedElementSecurityEvents.size());
- Assert.assertEquals(6, signatureValueSecurityEvents.size());
- Assert.assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
+ assertEquals(5, encryptedPartSecurityEvents.size());
+ assertEquals(3, signedElementSecurityEvents.size());
+ assertEquals(6, signatureValueSecurityEvents.size());
+ assertEquals(securityEventListener.getReceivedSecurityEvents().size(),
operationSecurityEvents.size() + encryptedPartSecurityEvents.size() +
signedElementSecurityEvents.size() + signatureValueSecurityEvents.size());
}
@@ -1014,10 +1015,10 @@ public class DerivedKeyTokenTest extends
encrKeyBuilder.prependBSTElementToHeader();
NodeList nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = doc.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));
@@ -1034,10 +1035,10 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
}
}
@@ -1062,7 +1063,7 @@ public class DerivedKeyTokenTest extends
//some test that we can really sure we get what we want from WSS4J
NodeList nodeList = securedDocument.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(securedDocument), new StreamResult(baos));
@@ -1079,10 +1080,10 @@ public class DerivedKeyTokenTest extends
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 1);
+ assertEquals(nodeList.getLength(), 1);
nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
- Assert.assertEquals(nodeList.getLength(), 0);
+ assertEquals(nodeList.getLength(), 0);
}
}
-}
+}
\ No newline at end of file