This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 56c4c6008 Migrate JUnit 3 assertions to AssertJ in dom-testsuite and
spring-ws-testsuite
56c4c6008 is described below
commit 56c4c600815399d6de80a7b8bf75a4d556eb6436
Author: Copilot <[email protected]>
AuthorDate: Sun May 17 15:13:21 2026 +0100
Migrate JUnit 3 assertions to AssertJ in dom-testsuite and
spring-ws-testsuite
Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
.../axiom/ts/dom/element/TestAttributes3.java | 16 +++++++------
.../axiom/ts/dom/element/TestAttributes4.java | 4 +++-
.../apache/axiom/ts/dom/element/TestCloneNode.java | 10 +++++----
...oneNodeWithAttributeHavingMultipleChildren.java | 8 ++++---
.../dom/element/TestCloneNodeWithAttributes.java | 16 +++++++------
.../ts/dom/element/TestGetElementsByTagName.java | 6 +++--
.../ts/dom/element/TestGetElementsByTagNameNS.java | 6 +++--
.../element/TestGetElementsByTagNameRecursive.java | 4 +++-
.../TestGetElementsByTagNameWithNamespaces.java | 6 +++--
.../TestGetElementsByTagNameWithWildcard.java | 4 +++-
.../TestGetNamespaceURIWithNoNamespace.java | 8 ++++---
.../element/TestGetPrefixWithDefaultNamespace.java | 4 +++-
.../axiom/ts/dom/element/TestGetTextContent.java | 4 +++-
.../axiom/ts/dom/element/TestInsertBefore.java | 16 +++++++------
.../TestInsertBeforeWithDocumentFragment.java | 26 ++++++++++++----------
.../element/TestLookupNamespaceURIExplicit.java | 20 +++++++++--------
.../element/TestLookupNamespaceURIImplicit.java | 17 +++++++-------
.../element/TestLookupPrefixEmptyNamespace.java | 5 ++++-
.../element/TestLookupPrefixExplicitMasked.java | 5 ++++-
.../element/TestLookupPrefixImplicitMasked.java | 4 +++-
.../axiom/ts/dom/element/TestRemoveFirstChild.java | 6 +++--
.../axiom/ts/dom/element/TestRemoveLastChild.java | 6 +++--
.../ts/dom/element/TestRemoveSingleChild.java | 14 +++++++-----
.../ts/dom/element/TestReplaceChildFirst.java | 18 ++++++++-------
.../TestReplaceChildFirstWithDocumentFragment.java | 24 +++++++++++---------
.../axiom/ts/dom/element/TestReplaceChildLast.java | 18 ++++++++-------
.../TestReplaceChildLastWithDocumentFragment.java | 24 +++++++++++---------
.../ts/dom/element/TestReplaceChildMiddle.java | 10 +++++----
...TestReplaceChildMiddleWithDocumentFragment.java | 26 ++++++++++++----------
.../ts/dom/element/TestReplaceChildSingle.java | 10 +++++----
.../axiom/ts/dom/element/TestSetAttributeNS.java | 23 ++++++++++---------
.../ts/dom/element/TestSetAttributeNSExisting.java | 6 +++--
...ibuteNSExistingDefaultNamespaceDeclaration.java | 6 +++--
.../dom/element/TestSetAttributeNodeNSReplace.java | 12 +++++-----
.../element/TestSetPrefixNotNullWithNamespace.java | 8 ++++---
.../axiom/ts/dom/element/TestSetPrefixNull.java | 8 ++++---
.../axiom/ts/dom/element/TestSetTextContent.java | 12 +++++-----
.../apache/axiom/ts/dom/text/TestAppendData.java | 4 +++-
.../axiom/ts/dom/text/TestGetChildNodes.java | 6 +++--
.../apache/axiom/ts/dom/text/TestGetLength.java | 4 +++-
.../apache/axiom/ts/dom/text/TestGetWholeText.java | 4 +++-
.../dom/text/TestGetWholeTextWithCDATASection.java | 4 +++-
.../ts/dom/text/TestGetWholeTextWithComment.java | 4 +++-
.../text/TestLookupNamespaceURIWithoutParent.java | 4 +++-
.../apache/axiom/ts/dom/text/TestSplitText.java | 17 ++++++--------
.../scenario/broker/BrokerScenarioTest.java | 12 +++++-----
.../ts/springws/scenario/jaxb2/JAXB2Test.java | 7 ++++--
.../springws/scenario/jdom/ClientServerTest.java | 7 ++++--
.../scenario/secureecho/SecureEchoTest.java | 8 ++++---
.../scenario/soapaction/SoapActionTest.java | 8 ++++---
.../scenario/validation/ValidationTest.java | 3 ++-
.../scenario/wsadom/WSAddressingDOMTest.java | 8 ++++---
.../TestCreateWebServiceMessage.java | 14 +++++++-----
...TestCreateWebServiceMessageFromInputStream.java | 6 +++--
...CreateWebServiceMessageFromInputStreamMTOM.java | 4 +++-
55 files changed, 325 insertions(+), 219 deletions(-)
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes3.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes3.java
index 8cf5e8301..9153bff82 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes3.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.XMLConstants;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,14 +35,14 @@ public class TestAttributes3 extends DOMTestCase {
Document doc = dbf.newDocumentBuilder()
.parse(new InputSource(new StringReader("<root><child
xmlns:p=\"urn:ns1\"/></root>")));
Element element = (Element) doc.getDocumentElement().getFirstChild();
- assertTrue(element.hasAttributes());
+ assertThat(element.hasAttributes()).isTrue();
NamedNodeMap attributes = element.getAttributes();
- assertEquals(1, attributes.getLength());
+ assertThat(attributes.getLength()).isEqualTo(1);
Attr attr = (Attr) attributes.item(0);
- assertEquals("xmlns:p", attr.getName());
- assertEquals("xmlns", attr.getPrefix());
- assertEquals("p", attr.getLocalName());
- assertEquals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
attr.getNamespaceURI());
- assertEquals("urn:ns1", attr.getValue());
+ assertThat(attr.getName()).isEqualTo("xmlns:p");
+ assertThat(attr.getPrefix()).isEqualTo("xmlns");
+ assertThat(attr.getLocalName()).isEqualTo("p");
+
assertThat(attr.getNamespaceURI()).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE_NS_URI);
+ assertThat(attr.getValue()).isEqualTo("urn:ns1");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes4.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes4.java
index 63f43e822..240db1175 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes4.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes4.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
@@ -29,6 +31,6 @@ public class TestAttributes4 extends DOMTestCase {
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().parse(new InputSource(new
StringReader("<root><child/></root>")));
Element element = (Element) doc.getDocumentElement().getFirstChild();
- assertFalse(element.hasAttributes());
+ assertThat(element.hasAttributes()).isFalse();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNode.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNode.java
index 0bf7aa3df..1bd5c193e 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNode.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -28,9 +30,9 @@ public class TestCloneNode extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS("urn:test", "p:elem");
Element clone = (Element) element.cloneNode(true);
- assertEquals("urn:test", clone.getNamespaceURI());
- assertEquals("p", clone.getPrefix());
- assertEquals("elem", clone.getLocalName());
- assertSame(document, clone.getOwnerDocument());
+ assertThat(clone.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(clone.getPrefix()).isEqualTo("p");
+ assertThat(clone.getLocalName()).isEqualTo("elem");
+ assertThat(clone.getOwnerDocument()).isSameAs(document);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributeHavingMultipleChildren.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributeHavingMultipleChildren.java
index 9664939d6..4d3f64b43 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributeHavingMultipleChildren.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributeHavingMultipleChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -36,8 +38,8 @@ public class TestCloneNodeWithAttributeHavingMultipleChildren
extends DOMTestCas
Element clonedElement = (Element) element.cloneNode(false);
Attr clonedAttr = clonedElement.getAttributeNodeNS(null, "attr");
NodeList children = clonedAttr.getChildNodes();
- assertEquals(2, children.getLength());
- assertEquals("foo", children.item(0).getNodeValue());
- assertEquals("bar", children.item(1).getNodeValue());
+ assertThat(children.getLength()).isEqualTo(2);
+ assertThat(children.item(0).getNodeValue()).isEqualTo("foo");
+ assertThat(children.item(1).getNodeValue()).isEqualTo("bar");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
index 21c7c817c..c275f74f9 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -39,14 +41,14 @@ public class TestCloneNodeWithAttributes extends
DOMTestCase {
element.setAttributeNS(null, "attr1", "value1");
element.setAttributeNS("urn:ns2", "q:attr2", "value2");
Element clone = (Element) element.cloneNode(deep);
- assertEquals(2, clone.getAttributes().getLength());
+ assertThat(clone.getAttributes().getLength()).isEqualTo(2);
Attr attr1 = clone.getAttributeNodeNS(null, "attr1");
Attr attr2 = clone.getAttributeNodeNS("urn:ns2", "attr2");
- assertNotNull(attr1);
- assertNotNull(attr2);
- assertSame(clone, attr1.getOwnerElement());
- assertSame(clone, attr2.getOwnerElement());
- assertEquals("value1", attr1.getValue());
- assertEquals("value2", attr2.getValue());
+ assertThat(attr1).isNotNull();
+ assertThat(attr2).isNotNull();
+ assertThat(attr1.getOwnerElement()).isSameAs(clone);
+ assertThat(attr2.getOwnerElement()).isSameAs(clone);
+ assertThat(attr1.getValue()).isEqualTo("value1");
+ assertThat(attr2.getValue()).isEqualTo("value2");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagName.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagName.java
index 77293c7e6..e33201a1a 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagName.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagName.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -31,7 +33,7 @@ public class TestGetElementsByTagName extends DOMTestCase {
Document doc = dbf.newDocumentBuilder().newDocument();
Element docElem = doc.getDocumentElement();
- assertNull("The document element shoudl be null", docElem);
+ assertThat(docElem).isNull();
docElem = doc.createElement("Test");
docElem.appendChild(doc.createElement(childElementLN));
@@ -44,6 +46,6 @@ public class TestGetElementsByTagName extends DOMTestCase {
NodeList list = docElem.getElementsByTagName(childElementLN);
- assertEquals("Incorrect number of child elements", 7,
list.getLength());
+ assertThat(list.getLength()).isEqualTo(7);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameNS.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameNS.java
index e4a44ebca..d6a3322bf 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameNS.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameNS.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -32,7 +34,7 @@ public class TestGetElementsByTagNameNS extends DOMTestCase {
Document doc = dbf.newDocumentBuilder().newDocument();
Element docElem = doc.getDocumentElement();
- assertNull("The document element shoudl be null", docElem);
+ assertThat(docElem).isNull();
docElem = doc.createElementNS("http://test.org";, "test:Test");
@@ -46,6 +48,6 @@ public class TestGetElementsByTagNameNS extends DOMTestCase {
NodeList list = docElem.getElementsByTagNameNS(childElementNS,
childElementLN);
- assertEquals("Incorrect number of child elements", 7,
list.getLength());
+ assertThat(list.getLength()).isEqualTo(7);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameRecursive.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameRecursive.java
index 26ec2cadc..11fec5fc4 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameRecursive.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameRecursive.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -30,6 +32,6 @@ public class TestGetElementsByTagNameRecursive extends
DOMTestCase {
.parse(TestGetElementsByTagNameRecursive.class.getResourceAsStream("numbers.xml"));
Element element = doc.getDocumentElement();
NodeList list = element.getElementsByTagName("nr");
- assertEquals(10, list.getLength());
+ assertThat(list.getLength()).isEqualTo(10);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithNamespaces.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithNamespaces.java
index 631341aa5..a0358b6a3 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithNamespaces.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithNamespaces.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -30,7 +32,7 @@ public class TestGetElementsByTagNameWithNamespaces extends
DOMTestCase {
for (int i = 0; i < 3; i++) {
root.appendChild(doc.createElementNS("urn:ns2", "ns2:child"));
}
- assertEquals(3, root.getElementsByTagName("ns2:child").getLength());
- assertEquals(0, root.getElementsByTagName("child").getLength());
+
assertThat(root.getElementsByTagName("ns2:child").getLength()).isEqualTo(3);
+
assertThat(root.getElementsByTagName("child").getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithWildcard.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithWildcard.java
index e34297bc9..a79201b03 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithWildcard.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetElementsByTagNameWithWildcard.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -30,6 +32,6 @@ public class TestGetElementsByTagNameWithWildcard extends
DOMTestCase {
for (int i = 0; i < 3; i++) {
root.appendChild(doc.createElement("child" + i));
}
- assertEquals(3, root.getElementsByTagName("*").getLength());
+ assertThat(root.getElementsByTagName("*").getLength()).isEqualTo(3);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetNamespaceURIWithNoNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetNamespaceURIWithNoNamespace.java
index 29f5b3b51..674f534ee 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetNamespaceURIWithNoNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetNamespaceURIWithNoNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -27,10 +29,10 @@ public class TestGetNamespaceURIWithNoNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().newDocument();
Element element = doc.createElement("test");
- assertNull(element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isNull();
element = doc.createElementNS(null, "test");
- assertNull(element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isNull();
element = doc.createElementNS("", "test");
- assertNull(element.getNamespaceURI());
+ assertThat(element.getNamespaceURI()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetPrefixWithDefaultNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetPrefixWithDefaultNamespace.java
index 70751079b..c10bf38b6 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetPrefixWithDefaultNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetPrefixWithDefaultNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -27,6 +29,6 @@ public class TestGetPrefixWithDefaultNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().newDocument();
Element element = doc.createElementNS("urn:test", "test");
- assertNull(element.getPrefix());
+ assertThat(element.getPrefix()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetTextContent.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetTextContent.java
index 59128efa8..b4eab2d3c 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetTextContent.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestGetTextContent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
@@ -27,6 +29,6 @@ public class TestGetTextContent extends DOMTestCase {
@Override
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().parse(new InputSource(new
StringReader("<a>1<!--c--><b>2</b>3</a>")));
- assertEquals("123", doc.getDocumentElement().getTextContent());
+ assertThat(doc.getDocumentElement().getTextContent()).isEqualTo("123");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBefore.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBefore.java
index 14c064136..3857328ab 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBefore.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBefore.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -45,14 +47,14 @@ public class TestInsertBefore extends DOMTestCase {
parent2.insertBefore(b, e);
NodeList children = parent1.getChildNodes();
- assertEquals(2, children.getLength());
- assertSame(a, children.item(0));
- assertSame(c, children.item(1));
+ assertThat(children.getLength()).isEqualTo(2);
+ assertThat(children.item(0)).isSameAs(a);
+ assertThat(children.item(1)).isSameAs(c);
children = parent2.getChildNodes();
- assertEquals(3, children.getLength());
- assertSame(d, children.item(0));
- assertSame(b, children.item(1));
- assertSame(e, children.item(2));
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0)).isSameAs(d);
+ assertThat(children.item(1)).isSameAs(b);
+ assertThat(children.item(2)).isSameAs(e);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBeforeWithDocumentFragment.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBeforeWithDocumentFragment.java
index 174d0fcad..d116cbf27 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBeforeWithDocumentFragment.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestInsertBeforeWithDocumentFragment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -44,17 +46,17 @@ public class TestInsertBeforeWithDocumentFragment extends
DOMTestCase {
element.insertBefore(fragment, b);
NodeList children = element.getChildNodes();
- assertEquals(4, children.getLength());
- assertSame(a, children.item(0));
- assertSame(x, children.item(1));
- assertSame(y, children.item(2));
- assertSame(b, children.item(3));
-
- assertSame(element, x.getParentNode());
- assertSame(element, y.getParentNode());
-
- assertNull(fragment.getFirstChild());
- assertNull(fragment.getLastChild());
- assertEquals(0, fragment.getChildNodes().getLength());
+ assertThat(children.getLength()).isEqualTo(4);
+ assertThat(children.item(0)).isSameAs(a);
+ assertThat(children.item(1)).isSameAs(x);
+ assertThat(children.item(2)).isSameAs(y);
+ assertThat(children.item(3)).isSameAs(b);
+
+ assertThat(x.getParentNode()).isSameAs(element);
+ assertThat(y.getParentNode()).isSameAs(element);
+
+ assertThat(fragment.getFirstChild()).isNull();
+ assertThat(fragment.getLastChild()).isNull();
+ assertThat(fragment.getChildNodes().getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIExplicit.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIExplicit.java
index db81ded8f..e3422aaec 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIExplicit.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIExplicit.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
@@ -52,16 +54,16 @@ public class TestLookupNamespaceURIExplicit extends
DOMTestCase {
e3.setAttributeNS(null, "q", "value");
e2.appendChild(e3);
- assertEquals("urn:ns1", e1.lookupNamespaceURI(null));
- assertEquals("urn:ns1", e2.lookupNamespaceURI(null));
- assertNull(e3.lookupNamespaceURI(null));
+ assertThat(e1.lookupNamespaceURI(null)).isEqualTo("urn:ns1");
+ assertThat(e2.lookupNamespaceURI(null)).isEqualTo("urn:ns1");
+ assertThat(e3.lookupNamespaceURI(null)).isNull();
- assertEquals("urn:ns2", e1.lookupNamespaceURI("p"));
- assertEquals("urn:ns3", e2.lookupNamespaceURI("p"));
- assertEquals("urn:ns3", e3.lookupNamespaceURI("p"));
+ assertThat(e1.lookupNamespaceURI("p")).isEqualTo("urn:ns2");
+ assertThat(e2.lookupNamespaceURI("p")).isEqualTo("urn:ns3");
+ assertThat(e3.lookupNamespaceURI("p")).isEqualTo("urn:ns3");
- assertEquals("urn:ns4", e1.lookupNamespaceURI("q"));
- assertEquals(null, e2.lookupNamespaceURI("q"));
- assertEquals(null, e3.lookupNamespaceURI("q"));
+ assertThat(e1.lookupNamespaceURI("q")).isEqualTo("urn:ns4");
+ assertThat(e2.lookupNamespaceURI("q")).isNull();
+ assertThat(e3.lookupNamespaceURI("q")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIImplicit.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIImplicit.java
index 11f820191..117e38b6b 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIImplicit.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIImplicit.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -55,17 +57,16 @@ public class TestLookupNamespaceURIImplicit extends
DOMTestCase {
element3.setAttributeNS("urn:test", "ns3:attr", "value");
parent.appendChild(element3);
- assertEquals("Incorrect default namespace returned for the element",
ns1, element1.lookupNamespaceURI(null));
- assertNull(element1.lookupNamespaceURI("ns0"));
+ assertThat(element1.lookupNamespaceURI(null)).isEqualTo(ns1);
+ assertThat(element1.lookupNamespaceURI("ns0")).isNull();
- assertEquals("Incorrect namespace returned for the element", ns2,
element2.lookupNamespaceURI(pref2));
- assertNull(element2.lookupNamespaceURI("ns0"));
- assertNull(element2.lookupNamespaceURI(null));
+ assertThat(element2.lookupNamespaceURI(pref2)).isEqualTo(ns2);
+ assertThat(element2.lookupNamespaceURI("ns0")).isNull();
+ assertThat(element2.lookupNamespaceURI(null)).isNull();
- assertEquals(
- "Incorrect namespace returned for the given prefix", nsParent,
element3.lookupNamespaceURI(prefParent));
+
assertThat(element3.lookupNamespaceURI(prefParent)).isEqualTo(nsParent);
// This asserts that namespaces can only be defined implicitly by
elements, but not
// attributes
- assertNull(element3.lookupNamespaceURI("ns3"));
+ assertThat(element3.lookupNamespaceURI("ns3")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixEmptyNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixEmptyNamespace.java
index 6406c07f7..bf52769cb 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixEmptyNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixEmptyNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
@@ -33,6 +35,7 @@ public class TestLookupPrefixEmptyNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder()
.parse(new InputSource(new StringReader("<a
xmlns='urn:test'><b xmlns=''/></a>")));
-
assertNull(document.getDocumentElement().getFirstChild().lookupPrefix(""));
+
assertThat(document.getDocumentElement().getFirstChild().lookupPrefix(""))
+ .isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixExplicitMasked.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixExplicitMasked.java
index c2ab65e61..cb1692535 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixExplicitMasked.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixExplicitMasked.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
@@ -34,6 +36,7 @@ public class TestLookupPrefixExplicitMasked extends
DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder()
.parse(new InputSource(new StringReader("<root
xmlns:p='urn:ns1'><child xmlns:p='urn:ns2'/></root>")));
-
assertNull(document.getDocumentElement().getFirstChild().lookupPrefix("urn:ns1"));
+
assertThat(document.getDocumentElement().getFirstChild().lookupPrefix("urn:ns1"))
+ .isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixImplicitMasked.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixImplicitMasked.java
index b101f42f0..81d9a5694 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixImplicitMasked.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupPrefixImplicitMasked.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -34,6 +36,6 @@ public class TestLookupPrefixImplicitMasked extends
DOMTestCase {
Element root = document.createElementNS("urn:ns1", "p:root");
Element child = document.createElementNS("urn:ns2", "p:child");
root.appendChild(child);
- assertNull(child.lookupPrefix("urn:ns1"));
+ assertThat(child.lookupPrefix("urn:ns1")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveFirstChild.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveFirstChild.java
index 49e4dc6a7..817cea29b 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveFirstChild.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveFirstChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -34,7 +36,7 @@ public class TestRemoveFirstChild extends DOMTestCase {
.getDocumentElement();
element.removeChild(element.getFirstChild());
Node firstChild = element.getFirstChild();
- assertNotNull(firstChild);
- assertEquals("b", firstChild.getNodeName());
+ assertThat(firstChild).isNotNull();
+ assertThat(firstChild.getNodeName()).isEqualTo("b");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveLastChild.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveLastChild.java
index f2c55d1f3..0265b710e 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveLastChild.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveLastChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,7 +35,7 @@ public class TestRemoveLastChild extends DOMTestCase {
.getDocumentElement();
element.removeChild(element.getLastChild());
Node lastChild = element.getLastChild();
- assertNotNull(lastChild);
- assertEquals("b", lastChild.getNodeName());
+ assertThat(lastChild).isNotNull();
+ assertThat(lastChild.getNodeName()).isEqualTo("b");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveSingleChild.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveSingleChild.java
index 37fedb379..2bec98531 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveSingleChild.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveSingleChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -34,11 +36,11 @@ public class TestRemoveSingleChild extends DOMTestCase {
Element element = document.getDocumentElement();
Node child = element.getFirstChild();
element.removeChild(child);
- assertNull(element.getFirstChild());
- assertNull(element.getLastChild());
- assertNull(child.getPreviousSibling());
- assertNull(child.getNextSibling());
- assertNull(child.getParentNode());
- assertSame(document, child.getOwnerDocument());
+ assertThat(element.getFirstChild()).isNull();
+ assertThat(element.getLastChild()).isNull();
+ assertThat(child.getPreviousSibling()).isNull();
+ assertThat(child.getNextSibling()).isNull();
+ assertThat(child.getParentNode()).isNull();
+ assertThat(child.getOwnerDocument()).isSameAs(document);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirst.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirst.java
index bbc010cbd..2c95c858f 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirst.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirst.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,14 +38,14 @@ public class TestReplaceChildFirst extends
ReplaceChildTestCase {
parent.appendChild(child1);
parent.appendChild(child2);
parent.replaceChild(newChild, child1);
- assertSame(newChild, parent.getFirstChild());
- assertSame(child2, parent.getLastChild());
- assertNull(newChild.getPreviousSibling());
- assertSame(child2, newChild.getNextSibling());
- assertSame(newChild, child2.getPreviousSibling());
+ assertThat(parent.getFirstChild()).isSameAs(newChild);
+ assertThat(parent.getLastChild()).isSameAs(child2);
+ assertThat(newChild.getPreviousSibling()).isNull();
+ assertThat(newChild.getNextSibling()).isSameAs(child2);
+ assertThat(child2.getPreviousSibling()).isSameAs(newChild);
NodeList children = parent.getChildNodes();
- assertEquals(2, children.getLength());
- assertSame(newChild, children.item(0));
- assertSame(child2, children.item(1));
+ assertThat(children.getLength()).isEqualTo(2);
+ assertThat(children.item(0)).isSameAs(newChild);
+ assertThat(children.item(1)).isSameAs(child2);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirstWithDocumentFragment.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirstWithDocumentFragment.java
index eb817fe27..9bedd922d 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirstWithDocumentFragment.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildFirstWithDocumentFragment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -50,19 +52,19 @@ public class TestReplaceChildFirstWithDocumentFragment
extends DOMTestCase {
element.replaceChild(fragment, a);
NodeList children = element.getChildNodes();
- assertEquals(3, children.getLength());
- assertSame(x, children.item(0));
- assertSame(y, children.item(1));
- assertSame(b, children.item(2));
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0)).isSameAs(x);
+ assertThat(children.item(1)).isSameAs(y);
+ assertThat(children.item(2)).isSameAs(b);
- assertSame(element, x.getParentNode());
- assertSame(element, y.getParentNode());
+ assertThat(x.getParentNode()).isSameAs(element);
+ assertThat(y.getParentNode()).isSameAs(element);
- assertNull(fragment.getFirstChild());
- assertNull(fragment.getLastChild());
- assertEquals(0, fragment.getChildNodes().getLength());
+ assertThat(fragment.getFirstChild()).isNull();
+ assertThat(fragment.getLastChild()).isNull();
+ assertThat(fragment.getChildNodes().getLength()).isEqualTo(0);
- assertSame(x, element.getFirstChild());
- assertSame(b, element.getLastChild());
+ assertThat(element.getFirstChild()).isSameAs(x);
+ assertThat(element.getLastChild()).isSameAs(b);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLast.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLast.java
index 4c562bec2..9aa8b6acd 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLast.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLast.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,14 +38,14 @@ public class TestReplaceChildLast extends
ReplaceChildTestCase {
parent.appendChild(child1);
parent.appendChild(child2);
parent.replaceChild(newChild, child2);
- assertSame(child1, parent.getFirstChild());
- assertSame(newChild, parent.getLastChild());
- assertSame(child1, newChild.getPreviousSibling());
- assertNull(newChild.getNextSibling());
- assertSame(newChild, child1.getNextSibling());
+ assertThat(parent.getFirstChild()).isSameAs(child1);
+ assertThat(parent.getLastChild()).isSameAs(newChild);
+ assertThat(newChild.getPreviousSibling()).isSameAs(child1);
+ assertThat(newChild.getNextSibling()).isNull();
+ assertThat(child1.getNextSibling()).isSameAs(newChild);
NodeList children = parent.getChildNodes();
- assertEquals(2, children.getLength());
- assertSame(child1, children.item(0));
- assertSame(newChild, children.item(1));
+ assertThat(children.getLength()).isEqualTo(2);
+ assertThat(children.item(0)).isSameAs(child1);
+ assertThat(children.item(1)).isSameAs(newChild);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLastWithDocumentFragment.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLastWithDocumentFragment.java
index 78473f95c..79c5e3472 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLastWithDocumentFragment.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildLastWithDocumentFragment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -50,19 +52,19 @@ public class TestReplaceChildLastWithDocumentFragment
extends DOMTestCase {
element.replaceChild(fragment, b);
NodeList children = element.getChildNodes();
- assertEquals(3, children.getLength());
- assertSame(a, children.item(0));
- assertSame(x, children.item(1));
- assertSame(y, children.item(2));
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0)).isSameAs(a);
+ assertThat(children.item(1)).isSameAs(x);
+ assertThat(children.item(2)).isSameAs(y);
- assertSame(element, x.getParentNode());
- assertSame(element, y.getParentNode());
+ assertThat(x.getParentNode()).isSameAs(element);
+ assertThat(y.getParentNode()).isSameAs(element);
- assertNull(fragment.getFirstChild());
- assertNull(fragment.getLastChild());
- assertEquals(0, fragment.getChildNodes().getLength());
+ assertThat(fragment.getFirstChild()).isNull();
+ assertThat(fragment.getLastChild()).isNull();
+ assertThat(fragment.getChildNodes().getLength()).isEqualTo(0);
- assertSame(a, element.getFirstChild());
- assertSame(y, element.getLastChild());
+ assertThat(element.getFirstChild()).isSameAs(a);
+ assertThat(element.getLastChild()).isSameAs(y);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddle.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddle.java
index 589a42189..b989a430c 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddle.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddle.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -39,9 +41,9 @@ public class TestReplaceChildMiddle extends
ReplaceChildTestCase {
parent.appendChild(child3);
parent.replaceChild(newChild, child2);
NodeList children = parent.getChildNodes();
- assertEquals(3, children.getLength());
- assertSame(child1, children.item(0));
- assertSame(newChild, children.item(1));
- assertSame(child3, children.item(2));
+ assertThat(children.getLength()).isEqualTo(3);
+ assertThat(children.item(0)).isSameAs(child1);
+ assertThat(children.item(1)).isSameAs(newChild);
+ assertThat(children.item(2)).isSameAs(child3);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddleWithDocumentFragment.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddleWithDocumentFragment.java
index 09903a106..6bf872843 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddleWithDocumentFragment.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildMiddleWithDocumentFragment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -52,20 +54,20 @@ public class TestReplaceChildMiddleWithDocumentFragment
extends DOMTestCase {
element.replaceChild(fragment, b);
NodeList children = element.getChildNodes();
- assertEquals(4, children.getLength());
- assertSame(a, children.item(0));
- assertSame(x, children.item(1));
- assertSame(y, children.item(2));
- assertSame(c, children.item(3));
+ assertThat(children.getLength()).isEqualTo(4);
+ assertThat(children.item(0)).isSameAs(a);
+ assertThat(children.item(1)).isSameAs(x);
+ assertThat(children.item(2)).isSameAs(y);
+ assertThat(children.item(3)).isSameAs(c);
- assertSame(element, x.getParentNode());
- assertSame(element, y.getParentNode());
+ assertThat(x.getParentNode()).isSameAs(element);
+ assertThat(y.getParentNode()).isSameAs(element);
- assertNull(fragment.getFirstChild());
- assertNull(fragment.getLastChild());
- assertEquals(0, fragment.getChildNodes().getLength());
+ assertThat(fragment.getFirstChild()).isNull();
+ assertThat(fragment.getLastChild()).isNull();
+ assertThat(fragment.getChildNodes().getLength()).isEqualTo(0);
- assertSame(a, element.getFirstChild());
- assertSame(c, element.getLastChild());
+ assertThat(element.getFirstChild()).isSameAs(a);
+ assertThat(element.getLastChild()).isSameAs(c);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildSingle.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildSingle.java
index 52b8bd614..32ed6da0f 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildSingle.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildSingle.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -34,10 +36,10 @@ public class TestReplaceChildSingle extends
ReplaceChildTestCase {
Element oldChild = doc.createElementNS(null, "oldChild");
parent.appendChild(oldChild);
parent.replaceChild(newChild, oldChild);
- assertSame(newChild, parent.getFirstChild());
- assertSame(newChild, parent.getLastChild());
+ assertThat(parent.getFirstChild()).isSameAs(newChild);
+ assertThat(parent.getLastChild()).isSameAs(newChild);
NodeList children = parent.getChildNodes();
- assertEquals(1, children.getLength());
- assertSame(newChild, children.item(0));
+ assertThat(children.getLength()).isEqualTo(1);
+ assertThat(children.item(0)).isSameAs(newChild);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java
index 8580835f4..554a8b6bc 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.inject.Inject;
import javax.xml.namespace.QName;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -36,17 +38,18 @@ public class TestSetAttributeNS extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS("urn:ns1", "p:element");
element.setAttributeNS(DOMUtils.getNamespaceURI(qname),
DOMUtils.getQualifiedName(qname), "value");
- assertTrue(element.hasAttributes());
+ assertThat(element.hasAttributes()).isTrue();
NamedNodeMap attributes = element.getAttributes();
- assertEquals(1, attributes.getLength());
+ assertThat(attributes.getLength()).isEqualTo(1);
Attr attr = (Attr) attributes.item(0);
- assertSame(document, attr.getOwnerDocument());
- assertSame(element, attr.getOwnerElement());
- assertEquals(DOMUtils.getNamespaceURI(qname), attr.getNamespaceURI());
- assertEquals(DOMUtils.getPrefix(qname), attr.getPrefix());
- assertEquals(qname.getLocalPart(), attr.getLocalName());
- assertEquals(DOMUtils.getQualifiedName(qname), attr.getName());
- assertEquals("value", attr.getValue());
- assertSame(attr,
element.getAttributeNodeNS(DOMUtils.getNamespaceURI(qname),
qname.getLocalPart()));
+ assertThat(attr.getOwnerDocument()).isSameAs(document);
+ assertThat(attr.getOwnerElement()).isSameAs(element);
+
assertThat(attr.getNamespaceURI()).isEqualTo(DOMUtils.getNamespaceURI(qname));
+ assertThat(attr.getPrefix()).isEqualTo(DOMUtils.getPrefix(qname));
+ assertThat(attr.getLocalName()).isEqualTo(qname.getLocalPart());
+ assertThat(attr.getName()).isEqualTo(DOMUtils.getQualifiedName(qname));
+ assertThat(attr.getValue()).isEqualTo("value");
+ assertThat(element.getAttributeNodeNS(DOMUtils.getNamespaceURI(qname),
qname.getLocalPart()))
+ .isSameAs(attr);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExisting.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExisting.java
index dd363702b..82d627e01 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExisting.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExisting.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -42,7 +44,7 @@ public class TestSetAttributeNSExisting extends DOMTestCase {
element.setAttributeNS("urn:test", "p2:attr", "value2");
// DOM is expected to change the original attribute, not to create a
new one
- assertEquals("value2", attr.getValue());
- assertEquals("p2", attr.getPrefix());
+ assertThat(attr.getValue()).isEqualTo("value2");
+ assertThat(attr.getPrefix()).isEqualTo("p2");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExistingDefaultNamespaceDeclaration.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExistingDefaultNamespaceDeclaration.java
index b0c6de421..0b571c93d 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExistingDefaultNamespaceDeclaration.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSExistingDefaultNamespaceDeclaration.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Attr;
@@ -43,7 +45,7 @@ public class
TestSetAttributeNSExistingDefaultNamespaceDeclaration extends DOMTe
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
XMLConstants.XMLNS_ATTRIBUTE, "urn:ns2");
// DOM is expected to change the original attribute, not to create a
new one
- assertEquals("urn:ns2", attr.getValue());
- assertNull(attr.getPrefix());
+ assertThat(attr.getValue()).isEqualTo("urn:ns2");
+ assertThat(attr.getPrefix()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSReplace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSReplace.java
index 037bdb7f7..ea0261861 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSReplace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSReplace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -44,10 +46,10 @@ public class TestSetAttributeNodeNSReplace extends
DOMTestCase {
attr2.setValue("value2");
element.setAttributeNodeNS(attr2);
- assertNull(attr1.getOwnerElement());
- assertSame(document, attr1.getOwnerDocument());
- assertSame(element, attr2.getOwnerElement());
- assertSame(document, attr2.getOwnerDocument());
- assertEquals("value2", element.getAttributeNS("urn:ns2", "attr"));
+ assertThat(attr1.getOwnerElement()).isNull();
+ assertThat(attr1.getOwnerDocument()).isSameAs(document);
+ assertThat(attr2.getOwnerElement()).isSameAs(element);
+ assertThat(attr2.getOwnerDocument()).isSameAs(document);
+ assertThat(element.getAttributeNS("urn:ns2",
"attr")).isEqualTo("value2");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithNamespace.java
index 1174d4dc7..22379f17c 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -33,9 +35,9 @@ public class TestSetPrefixNotNullWithNamespace extends
DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS("urn:ns", "test");
element.setPrefix("p");
- assertEquals("p", element.getPrefix());
- assertEquals("p:test", element.getTagName());
+ assertThat(element.getPrefix()).isEqualTo("p");
+ assertThat(element.getTagName()).isEqualTo("p:test");
// DOM doesn't add namespace declarations automatically
- assertEquals(0, element.getAttributes().getLength());
+ assertThat(element.getAttributes().getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNull.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNull.java
index 7aea42841..024d5a9bb 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNull.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNull.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -33,9 +35,9 @@ public class TestSetPrefixNull extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS("urn:ns", "p:test");
element.setPrefix(null);
- assertNull(element.getPrefix());
- assertEquals("test", element.getTagName());
+ assertThat(element.getPrefix()).isNull();
+ assertThat(element.getTagName()).isEqualTo("test");
// DOM doesn't add namespace declarations automatically
- assertEquals(0, element.getAttributes().getLength());
+ assertThat(element.getAttributes().getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetTextContent.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetTextContent.java
index 0f15b5f0a..905d52839 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetTextContent.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetTextContent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.StringReader;
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
@@ -34,10 +36,10 @@ public class TestSetTextContent extends DOMTestCase {
Node oldFirstChild = element.getFirstChild();
element.setTextContent("test");
Node firstChild = element.getFirstChild();
- assertTrue(firstChild instanceof Text);
- assertEquals("test", firstChild.getNodeValue());
- assertNull(firstChild.getNextSibling());
- assertNull(oldFirstChild.getParentNode());
- assertSame(doc, oldFirstChild.getOwnerDocument());
+ assertThat(firstChild).isInstanceOf(Text.class);
+ assertThat(firstChild.getNodeValue()).isEqualTo("test");
+ assertThat(firstChild.getNextSibling()).isNull();
+ assertThat(oldFirstChild.getParentNode()).isNull();
+ assertThat(oldFirstChild.getOwnerDocument()).isSameAs(doc);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestAppendData.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestAppendData.java
index f615b96a6..90cdbb6d7 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestAppendData.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestAppendData.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -39,6 +41,6 @@ public class TestAppendData extends DOMTestCase {
textNode.appendData(textToAppend);
- assertEquals("Text value mismatch", tempText + textToAppend,
textNode.getData());
+ assertThat(textNode.getData()).isEqualTo(tempText + textToAppend);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetChildNodes.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetChildNodes.java
index 53941928c..926222151 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetChildNodes.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetChildNodes.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -29,7 +31,7 @@ public class TestGetChildNodes extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Text text = document.createTextNode("test");
NodeList children = text.getChildNodes();
- assertNotNull(children);
- assertEquals(0, children.getLength());
+ assertThat(children).isNotNull();
+ assertThat(children.getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetLength.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetLength.java
index 8e07ffdc4..427b8f87e 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetLength.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetLength.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Document;
@@ -30,6 +32,6 @@ public class TestGetLength extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
String content = "This is a test string";
Text textNode = document.createTextNode(content);
- assertEquals(content.length(), textNode.getLength());
+ assertThat(textNode.getLength()).isEqualTo(content.length());
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeText.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeText.java
index af6fc3e44..7b32b1087 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeText.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -36,6 +38,6 @@ public class TestGetWholeText extends DOMTestCase {
element.appendChild(document.createTextNode("d"));
element.appendChild(document.createProcessingInstruction("test",
"test"));
element.appendChild(document.createTextNode("e"));
- assertEquals("bcd", c.getWholeText());
+ assertThat(c.getWholeText()).isEqualTo("bcd");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithCDATASection.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithCDATASection.java
index 29d068030..d6859382d 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithCDATASection.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithCDATASection.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -32,6 +34,6 @@ public class TestGetWholeTextWithCDATASection extends
DOMTestCase {
element.appendChild(a);
element.appendChild(document.createCDATASection("b"));
element.appendChild(document.createTextNode("c"));
- assertEquals("abc", a.getWholeText());
+ assertThat(a.getWholeText()).isEqualTo("abc");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithComment.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithComment.java
index 2a9ab6b82..c05bc22ac 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithComment.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestGetWholeTextWithComment.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -32,6 +34,6 @@ public class TestGetWholeTextWithComment extends DOMTestCase {
element.appendChild(a);
element.appendChild(document.createComment("comment"));
element.appendChild(document.createTextNode("b"));
- assertEquals("a", a.getWholeText());
+ assertThat(a.getWholeText()).isEqualTo("a");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestLookupNamespaceURIWithoutParent.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestLookupNamespaceURIWithoutParent.java
index 65c986885..d4904ba9d 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestLookupNamespaceURIWithoutParent.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestLookupNamespaceURIWithoutParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -32,6 +34,6 @@ public class TestLookupNamespaceURIWithoutParent extends
DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Text text = document.createTextNode("test");
- assertNull(text.lookupNamespaceURI("ns"));
+ assertThat(text.lookupNamespaceURI("ns")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSplitText.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSplitText.java
index d40ec2233..e1ec02ece 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSplitText.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSplitText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.dom.DOMTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -35,17 +37,12 @@ public class TestSplitText extends DOMTestCase {
element.appendChild(txt);
txt.splitText(3);
- assertNotNull("Text value missing in the original Text node",
txt.getNodeValue());
+ assertThat(txt.getNodeValue()).isNotNull();
- assertNotNull("Sibling missing after split", txt.getNextSibling());
- assertNotNull(
- "Text value missing in the new split Text node",
- txt.getNextSibling().getNodeValue());
+ assertThat(txt.getNextSibling()).isNotNull();
+ assertThat(txt.getNextSibling().getNodeValue()).isNotNull();
- assertEquals("Incorrect split point", textValue.substring(0, 3),
txt.getNodeValue());
- assertEquals(
- "Incorrect split point",
- textValue.substring(3, textValue.length()),
- txt.getNextSibling().getNodeValue());
+ assertThat(txt.getNodeValue()).isEqualTo(textValue.substring(0, 3));
+
assertThat(txt.getNextSibling().getNodeValue()).isEqualTo(textValue.substring(3,
textValue.length()));
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
index 48e2454bd..43287eb43 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/broker/BrokerScenarioTest.java
@@ -54,14 +54,14 @@ public class BrokerScenarioTest extends ScenarioTestCase {
item2.setCount(10);
order.setItems(new Order.Item[] {item1, item2});
OrderStatus status = client.order(order);
- assertNotNull(status.getReceived());
+ assertThat(status.getReceived()).isNotNull();
Order receivedOrder = client.receiveNextOrder();
- assertNotNull(receivedOrder);
- assertEquals(order.getCustomer(), receivedOrder.getCustomer());
- assertEquals(order.getItems().length, receivedOrder.getItems().length);
- assertEquals(order.getItems()[0].getStock(),
receivedOrder.getItems()[0].getStock());
- assertEquals(order.getItems()[0].getCount(),
receivedOrder.getItems()[0].getCount());
+ assertThat(receivedOrder).isNotNull();
+ assertThat(receivedOrder.getCustomer()).isEqualTo(order.getCustomer());
+
assertThat(receivedOrder.getItems().length).isEqualTo(order.getItems().length);
+
assertThat(receivedOrder.getItems()[0].getStock()).isEqualTo(order.getItems()[0].getStock());
+
assertThat(receivedOrder.getItems()[0].getCount()).isEqualTo(order.getItems()[0].getCount());
order.setCustomer(23629);
// SOAP 1.2 fault processing is locale dependent
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/JAXB2Test.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/JAXB2Test.java
index f401b8cbc..d643fe9b6 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/JAXB2Test.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jaxb2/JAXB2Test.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.springws.scenario.jaxb2;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
+
import org.apache.axiom.ts.springws.scenario.ScenarioTestCase;
import org.springframework.ws.client.core.WebServiceTemplate;
@@ -28,7 +31,7 @@ public class JAXB2Test extends ScenarioTestCase {
request.setSymbol("GOOG");
GetQuoteResponse response =
(GetQuoteResponse)
context.getBean(WebServiceTemplate.class).marshalSendAndReceive(request);
- assertNotNull(response);
- assertEquals(105.37, response.getPrice(), 0.001);
+ assertThat(response).isNotNull();
+ assertThat(response.getPrice()).isCloseTo(105.37, within(0.001));
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jdom/ClientServerTest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jdom/ClientServerTest.java
index f7cb3618e..c1dcb4d8b 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jdom/ClientServerTest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/jdom/ClientServerTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.springws.scenario.jdom;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
+
import org.apache.axiom.ts.springws.scenario.ScenarioTestCase;
import org.jdom2.input.SAXBuilder;
import org.jdom2.transform.JDOMResult;
@@ -32,7 +35,7 @@ public class ClientServerTest extends ScenarioTestCase {
.getRootElement());
JDOMResult result = new JDOMResult();
context.getBean(WebServiceTemplate.class).sendSourceAndReceiveToResult(source,
result);
- assertEquals(
- 8.0d,
Double.parseDouble(result.getDocument().getRootElement().getText()), 1e-6);
+
assertThat(Double.parseDouble(result.getDocument().getRootElement().getText()))
+ .isCloseTo(8.0d, within(1e-6));
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java
index fd885b9f7..3157dc0a2 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/secureecho/SecureEchoTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.springws.scenario.secureecho;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMResult;
@@ -42,8 +44,8 @@ public class SecureEchoTest extends ScenarioTestCase {
new SoapActionCallback("http://www.example.com/echo";),
new DOMResult(responseDocument));
Element response = responseDocument.getDocumentElement();
- assertEquals("urn:test", response.getNamespaceURI());
- assertEquals("Echo", response.getLocalName());
- assertEquals("Hello", response.getTextContent());
+ assertThat(response.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(response.getLocalName()).isEqualTo("Echo");
+ assertThat(response.getTextContent()).isEqualTo("Hello");
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/soapaction/SoapActionTest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/soapaction/SoapActionTest.java
index 69ebb3c77..6e10a026e 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/soapaction/SoapActionTest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/soapaction/SoapActionTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.springws.scenario.soapaction;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMResult;
@@ -42,8 +44,8 @@ public class SoapActionTest extends ScenarioTestCase {
new SoapActionCallback("http://www.example.com/echo";),
new DOMResult(responseDocument));
Element response = responseDocument.getDocumentElement();
- assertEquals("urn:test", response.getNamespaceURI());
- assertEquals("Echo", response.getLocalName());
- assertEquals("Hello", response.getTextContent());
+ assertThat(response.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(response.getLocalName()).isEqualTo("Echo");
+ assertThat(response.getTextContent()).isEqualTo("Hello");
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
index 62b2879a0..ccd899bac 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/validation/ValidationTest.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.springws.scenario.validation;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.within;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -32,7 +33,7 @@ public class ValidationTest extends ScenarioTestCase {
protected void runTest() throws Throwable {
StockQuoteClient client = context.getBean(StockQuoteClient.class);
- assertEquals(105.37, client.getQuote("GOOG"), 0.001);
+ assertThat(client.getQuote("GOOG")).isCloseTo(105.37, within(0.001));
assertThatThrownBy(() -> client.getQuote("TOOLONG"))
.isInstanceOfSatisfying(SoapFaultClientException.class, ex -> {
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/wsadom/WSAddressingDOMTest.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/wsadom/WSAddressingDOMTest.java
index 0297817c2..728011fce 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/wsadom/WSAddressingDOMTest.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/wsadom/WSAddressingDOMTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.springws.scenario.wsadom;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMResult;
@@ -42,8 +44,8 @@ public class WSAddressingDOMTest extends ScenarioTestCase {
new ActionCallback(EchoEndpoint.ACTION),
new DOMResult(responseDocument));
Element response = responseDocument.getDocumentElement();
- assertEquals("urn:test", response.getNamespaceURI());
- assertEquals("testRequest", response.getLocalName());
- assertEquals("test", response.getTextContent());
+ assertThat(response.getNamespaceURI()).isEqualTo("urn:test");
+ assertThat(response.getLocalName()).isEqualTo("testRequest");
+ assertThat(response.getTextContent()).isEqualTo("test");
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessage.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessage.java
index 757cd6435..ef27ea05c 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessage.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessage.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.springws.soap.messagefactory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.apache.axiom.ts.springws.SimpleTestCase;
import org.springframework.ws.soap.SoapBody;
import org.springframework.ws.soap.SoapEnvelope;
@@ -35,15 +37,15 @@ public class TestCreateWebServiceMessage extends
SimpleTestCase {
SoapMessage message = messageFactory.createWebServiceMessage();
SoapEnvelope env = message.getEnvelope();
- assertNotNull(env);
- assertEquals(spec.getEnvelopeQName(), env.getName());
+ assertThat(env).isNotNull();
+ assertThat(env.getName()).isEqualTo(spec.getEnvelopeQName());
SoapHeader header = env.getHeader();
- assertNotNull(header);
- assertEquals(spec.getHeaderQName(), header.getName());
+ assertThat(header).isNotNull();
+ assertThat(header.getName()).isEqualTo(spec.getHeaderQName());
SoapBody body = env.getBody();
- assertNotNull(body);
- assertEquals(spec.getHeaderQName(), header.getName());
+ assertThat(body).isNotNull();
+ assertThat(header.getName()).isEqualTo(spec.getHeaderQName());
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java
index b1bb703aa..0cdc58abd 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStream.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.springws.soap.messagefactory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStream;
import org.apache.axiom.ts.soap.SOAPSampleSet;
import org.apache.axiom.ts.springws.SimpleTestCase;
@@ -35,7 +37,7 @@ public class TestCreateWebServiceMessageFromInputStream
extends SimpleTestCase {
SoapMessage message = messageFactory.createWebServiceMessage(
new
TransportInputStreamImpl(SOAPSampleSet.NO_HEADER.getMessage(spec)));
SoapEnvelope env = message.getEnvelope();
- assertNull(env.getHeader());
- assertNotNull(env.getBody());
+ assertThat(env.getHeader()).isNull();
+ assertThat(env.getBody()).isNotNull();
}
}
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamMTOM.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamMTOM.java
index a608ee5a8..62ad16612 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamMTOM.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/soap/messagefactory/TestCreateWebServiceMessageFromInputStreamMTOM.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.springws.soap.messagefactory;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.InputStream;
import org.apache.axiom.ts.soap.MTOMSample;
import org.apache.axiom.ts.springws.SimpleTestCase;
@@ -32,6 +34,6 @@ public class TestCreateWebServiceMessageFromInputStreamMTOM
extends SimpleTestCa
@Override
protected void runTest(SoapMessageFactory messageFactory) throws Throwable
{
SoapMessage message = messageFactory.createWebServiceMessage(new
TransportInputStreamImpl(MTOMSample.SAMPLE1));
- assertNotNull(message.getEnvelope());
+ assertThat(message.getEnvelope()).isNotNull();
}
}
