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 7760c1eda Modernize some of the code in the DOM test suite
7760c1eda is described below
commit 7760c1eda22b7a4c51c70086fe0401543a87f978
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Dec 17 17:37:20 2023 +0000
Modernize some of the code in the DOM test suite
---
.../apache/axiom/ts/dom/attr/TestCloneNode.java | 14 ++++---
.../axiom/ts/dom/attr/TestGetChildNodes.java | 8 ++--
.../axiom/ts/dom/attr/TestGetFirstChild.java | 8 ++--
.../dom/attr/TestGetValueWithMultipleChildren.java | 4 +-
.../TestLookupNamespaceURIWithoutOwnerElement.java | 4 +-
.../attr/TestSetPrefixNotNullWithNamespace.java | 6 ++-
.../attr/TestSetPrefixNotNullWithoutNamespace.java | 17 +++++---
.../dom/attr/TestSetPrefixNullWithNamespace.java | 4 +-
.../axiom/ts/dom/document/TestAdoptNode.java | 10 +++--
.../dom/document/TestAdoptNodeToSameDocument.java | 10 +++--
.../ts/dom/document/TestAdoptNodeWithParent.java | 10 +++--
.../axiom/ts/dom/document/TestAllowedChildren.java | 45 +++++++++++++---------
.../TestAppendChildForeignImplementation.java | 15 +++++---
.../dom/document/TestAppendChildWrongDocument.java | 17 +++++---
.../ts/dom/document/TestCreateAttributeNS.java | 18 +++++----
.../dom/document/TestCreateAttributeNSInvalid.java | 20 ++++++----
.../TestCreateAttributeNSWithoutNamespace.java | 8 ++--
.../ts/dom/document/TestCreateCDATASection.java | 6 ++-
.../axiom/ts/dom/document/TestCreateElementNS.java | 8 ++--
.../TestCreateElementNSWithInvalidName.java | 17 +++++---
.../TestCreateElementNSWithoutNamespace.java | 8 ++--
.../ts/dom/document/TestCreateEntityReference.java | 10 +++--
.../axiom/ts/dom/document/TestCreateText.java | 4 +-
.../ts/dom/document/TestDocumentSiblings.java | 8 ++--
.../ts/dom/document/TestGetDomConfigDefaults.java | 31 ++++++++-------
.../ts/dom/document/TestGetOwnerDocument.java | 4 +-
.../ts/dom/document/TestLookupNamespaceURI.java | 6 ++-
.../TestLookupNamespaceURIWithEmptyDocument.java | 4 +-
.../TestLookupPrefixWithEmptyDocument.java | 4 +-
.../document/TestNormalizeDocumentNamespace.java | 12 +++---
.../ts/dom/documentfragment/TestCloneNodeDeep.java | 16 ++++----
.../dom/documentfragment/TestCloneNodeShallow.java | 10 +++--
.../documentfragment/TestLookupNamespaceURI.java | 4 +-
.../ts/dom/documentfragment/TestLookupPrefix.java | 4 +-
.../axiom/ts/dom/documenttype/TestWithParser1.java | 10 +++--
.../axiom/ts/dom/documenttype/TestWithParser2.java | 10 +++--
.../axiom/ts/dom/element/TestAppendChild.java | 10 +++--
.../ts/dom/element/TestAppendChildCyclic.java | 17 +++++---
.../axiom/ts/dom/element/TestAppendChildSelf.java | 17 +++++---
.../dom/element/TestAppendChildWrongDocument.java | 17 +++++---
.../axiom/ts/dom/element/TestAttributes.java | 32 +++++++--------
.../axiom/ts/dom/element/TestAttributes2.java | 16 ++++----
...stRemoveAttributeNodeForeignImplementation.java | 15 +++++---
.../element/TestRemoveAttributeNodeNotOwner.java | 17 +++++---
.../ts/dom/element/TestReplaceChildCyclic.java | 17 +++++---
.../ts/dom/element/TestReplaceChildNotFound.java | 17 +++++---
.../dom/element/TestReplaceChildNullNewChild.java | 13 ++++---
.../dom/element/TestReplaceChildWrongDocument.java | 17 +++++---
.../ts/dom/element/TestSetAttributeNSInvalid.java | 21 ++++++----
...estSetAttributeNodeNSForeignImplementation.java | 15 +++++---
.../dom/element/TestSetAttributeNodeNSInUse.java | 17 +++++---
.../TestSetAttributeNodeNSWrongDocument.java | 17 +++++---
.../element/TestSetAttributeNodeWrongDocument.java | 17 +++++---
.../TestSetPrefixNotNullWithoutNamespace.java | 17 +++++---
.../TestSetNamedItemNSWrongDocument.java | 17 +++++---
.../attributes/TestSetNamedItemWrongDocument.java | 17 +++++---
.../apache/axiom/ts/dom/text/TestSetPrefix.java | 17 +++++---
57 files changed, 469 insertions(+), 285 deletions(-)
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java
index df2255ab5..2eb6b45ed 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -43,12 +45,12 @@ public class TestCloneNode extends DOMTestCase {
// Note that for an attribute, cloneNode always copies the children,
even if deep=false
Attr clone = (Attr) attr.cloneNode(deep);
Node child = clone.getFirstChild();
- assertNotNull(child);
- assertEquals(Node.TEXT_NODE, child.getNodeType());
- assertEquals("foo", child.getNodeValue());
+ assertThat(child).isNotNull();
+ assertThat(child.getNodeType()).isEqualTo(Node.TEXT_NODE);
+ assertThat(child.getNodeValue()).isEqualTo("foo");
child = child.getNextSibling();
- assertEquals(Node.TEXT_NODE, child.getNodeType());
- assertEquals("bar", child.getNodeValue());
- assertNull(child.getNextSibling());
+ assertThat(child.getNodeType()).isEqualTo(Node.TEXT_NODE);
+ assertThat(child.getNodeValue()).isEqualTo("bar");
+ assertThat(child.getNextSibling()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
index 6167cddbc..31b71eb65 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -38,9 +40,9 @@ public class TestGetChildNodes extends DOMTestCase {
Attr attr = document.createAttributeNS(null, "name");
attr.setValue("value");
NodeList children = attr.getChildNodes();
- assertEquals(1, children.getLength());
+ assertThat(children.getLength()).isEqualTo(1);
Node child = children.item(0);
- assertTrue(child instanceof Text);
- assertEquals("value", ((Text) child).getData());
+ assertThat(child).isInstanceOf(Text.class);
+ assertThat(((Text) child).getData()).isEqualTo("value");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetFirstChild.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetFirstChild.java
index 8c6612293..f7e83fa95 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetFirstChild.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetFirstChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -37,8 +39,8 @@ public class TestGetFirstChild extends DOMTestCase {
Attr attr = document.createAttributeNS(null, "name");
attr.setValue("value");
Node child = attr.getFirstChild();
- assertNotNull("Expected Attr to have a child node", child);
- assertTrue(child instanceof Text);
- assertEquals("value", ((Text) child).getData());
+ assertThat(child).isNotNull();
+ assertThat(child).isInstanceOf(Text.class);
+ assertThat(((Text) child).getData()).isEqualTo("value");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetValueWithMultipleChildren.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetValueWithMultipleChildren.java
index a8ad96b3c..60096686e 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetValueWithMultipleChildren.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetValueWithMultipleChildren.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -36,6 +38,6 @@ public class TestGetValueWithMultipleChildren extends
DOMTestCase {
attr.appendChild(document.createTextNode("A"));
attr.appendChild(document.createTextNode("B"));
attr.appendChild(document.createTextNode("C"));
- assertEquals("ABC", attr.getValue());
+ assertThat(attr.getValue()).isEqualTo("ABC");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestLookupNamespaceURIWithoutOwnerElement.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestLookupNamespaceURIWithoutOwnerElement.java
index 7a1e3587c..0863d32f8 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestLookupNamespaceURIWithoutOwnerElement.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestLookupNamespaceURIWithoutOwnerElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -38,6 +40,6 @@ public class TestLookupNamespaceURIWithoutOwnerElement
extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Attr attr = document.createAttributeNS("urn:test", "p:attr");
- assertNull(attr.lookupNamespaceURI("p"));
+ assertThat(attr.lookupNamespaceURI("p")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithNamespace.java
index 3afd3dcdb..3ad4c6407 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -39,7 +41,7 @@ public class TestSetPrefixNotNullWithNamespace extends
DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Attr attr = document.createAttributeNS("urn:ns", "p:test");
attr.setPrefix("q");
- assertEquals("q", attr.getPrefix());
- assertEquals("q:test", attr.getName());
+ assertThat(attr.getPrefix()).isEqualTo("q");
+ assertThat(attr.getName()).isEqualTo("q:test");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithoutNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithoutNamespace.java
index 087b38692..b5cf64d01 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithoutNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNotNullWithoutNamespace.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -39,11 +42,13 @@ public class TestSetPrefixNotNullWithoutNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Attr attr = document.createAttributeNS(null, "test");
- try {
- attr.setPrefix("p");
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NAMESPACE_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ attr.setPrefix("p");
+ })
+ .code)
+ .isEqualTo(DOMException.NAMESPACE_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNullWithNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNullWithNamespace.java
index 658ee71be..e633cb02c 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNullWithNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestSetPrefixNullWithNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.attr;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -40,6 +42,6 @@ public class TestSetPrefixNullWithNamespace extends
DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Attr attr = document.createAttributeNS("urn:test", "p:test");
attr.setPrefix(null);
- assertNull(attr.getPrefix());
+ assertThat(attr.getPrefix()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNode.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNode.java
index 23ca65062..5a75e0434 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNode.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -41,9 +43,9 @@ public class TestAdoptNode extends DOMTestCase {
Element element = document1.createElementNS(null, "test");
Text child = document1.createTextNode("test");
element.appendChild(child);
- assertSame(element, document2.adoptNode(element));
- assertSame(document2, element.getOwnerDocument());
- assertSame(child, element.getFirstChild());
- assertSame(document2, element.getFirstChild().getOwnerDocument());
+ assertThat(document2.adoptNode(element)).isSameAs(element);
+ assertThat(element.getOwnerDocument()).isSameAs(document2);
+ assertThat(element.getFirstChild()).isSameAs(child);
+
assertThat(element.getFirstChild().getOwnerDocument()).isSameAs(document2);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeToSameDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeToSameDocument.java
index aabedb99a..c9110fe5b 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeToSameDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeToSameDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -43,9 +45,9 @@ public class TestAdoptNodeToSameDocument extends DOMTestCase {
Element parent = document.createElementNS(null, "test");
Text node = document.createTextNode("test");
parent.appendChild(node);
- assertSame(node, document.adoptNode(node));
- assertSame(document, node.getOwnerDocument());
- assertNull(node.getParentNode());
- assertNull(parent.getFirstChild());
+ assertThat(document.adoptNode(node)).isSameAs(node);
+ assertThat(node.getOwnerDocument()).isSameAs(document);
+ assertThat(node.getParentNode()).isNull();
+ assertThat(parent.getFirstChild()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeWithParent.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeWithParent.java
index c5598780c..34c384e63 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeWithParent.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAdoptNodeWithParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,9 +46,9 @@ public class TestAdoptNodeWithParent extends DOMTestCase {
Element parent = document1.createElementNS(null, "test");
Text node = document1.createTextNode("test");
parent.appendChild(node);
- assertSame(node, document2.adoptNode(node));
- assertSame(document2, node.getOwnerDocument());
- assertNull(node.getParentNode());
- assertNull(parent.getFirstChild());
+ assertThat(document2.adoptNode(node)).isSameAs(node);
+ assertThat(node.getOwnerDocument()).isSameAs(document2);
+ assertThat(node.getParentNode()).isNull();
+ assertThat(parent.getFirstChild()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAllowedChildren.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAllowedChildren.java
index 1fe5b516f..989cc376f 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAllowedChildren.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAllowedChildren.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -38,33 +41,39 @@ public class TestAllowedChildren extends DOMTestCase {
// Document Object Model (DOM) Level 3 Core Specification, section
1.1.1
// says that text nodes are not allowed as children of a document.
- try {
- doc.appendChild(doc.createTextNode(" "));
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
doc.appendChild(doc.createTextNode(" "));
+ })
+ .code)
+ .isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
doc.appendChild(doc.createElement("root1"));
// Multiple document elements are not allowed
- try {
- doc.appendChild(doc.createElement("root2"));
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
doc.appendChild(doc.createElement("root2"));
+ })
+ .code)
+ .isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
// PIs and comments after the document element are allowed
doc.appendChild(doc.createProcessingInstruction("pi", "data"));
doc.appendChild(doc.createComment("some comment"));
// Again, text nodes are not allowed
- try {
- doc.appendChild(doc.createTextNode(" "));
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
doc.appendChild(doc.createTextNode(" "));
+ })
+ .code)
+ .isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildForeignImplementation.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildForeignImplementation.java
index 829d2c65b..94039a990 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildForeignImplementation.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildForeignImplementation.java
@@ -19,6 +19,7 @@
package org.apache.axiom.ts.dom.document;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -37,11 +38,13 @@ public class TestAppendChildForeignImplementation extends
DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = mock(Element.class);
- try {
- document.appendChild(element);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertThat(ex.code).isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ document.appendChild(element);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildWrongDocument.java
index 1d1ef66be..597c9d705 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestAppendChildWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -42,11 +45,13 @@ public class TestAppendChildWrongDocument extends
DOMTestCase {
Document document1 = documentBuilder.newDocument();
Document document2 = documentBuilder.newDocument();
Element element = document2.createElementNS(null, "element");
- try {
- document1.appendChild(element);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ document1.appendChild(element);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java
index d90098a84..c938cff0d 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -48,15 +50,15 @@ public class TestCreateAttributeNS extends DOMTestCase {
Attr attr = doc.createAttributeNS(uri, name);
// Check name
- assertEquals("Attr name mismatch", localName, attr.getLocalName());
- assertEquals("NamsspaceURI mismatch", uri, attr.getNamespaceURI());
- assertEquals("namespace prefix mismatch", prefix, attr.getPrefix());
- assertEquals(name, attr.getName());
+ assertThat(attr.getLocalName()).isEqualTo(localName);
+ assertThat(attr.getNamespaceURI()).isEqualTo(uri);
+ assertThat(attr.getPrefix()).isEqualTo(prefix);
+ assertThat(attr.getName()).isEqualTo(name);
// Check defaults
- assertSame(doc, attr.getOwnerDocument());
- assertNull(attr.getOwnerElement());
- assertNull(attr.getFirstChild());
- assertEquals("", attr.getValue());
+ assertThat(attr.getOwnerDocument()).isSameAs(doc);
+ assertThat(attr.getOwnerElement()).isNull();
+ assertThat(attr.getFirstChild()).isNull();
+ assertThat(attr.getValue()).isEqualTo("");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java
index 62caada81..7127e4c5f 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,12 +42,15 @@ public class TestCreateAttributeNSInvalid extends
DOMTestCase {
@Override
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
- try {
- document.createAttributeNS(
- DOMUtils.getNamespaceURI(qname),
DOMUtils.getQualifiedName(qname));
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NAMESPACE_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ document.createAttributeNS(
+
DOMUtils.getNamespaceURI(qname),
+
DOMUtils.getQualifiedName(qname));
+ })
+ .code)
+ .isEqualTo(DOMException.NAMESPACE_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSWithoutNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSWithoutNamespace.java
index 044ff46c4..53ce96ae8 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSWithoutNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,8 +35,8 @@ public class TestCreateAttributeNSWithoutNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().newDocument();
Attr attr = doc.createAttributeNS(null, "attr");
- assertNull(attr.getPrefix());
- assertNull(attr.getNamespaceURI());
- assertEquals("attr", attr.getName());
+ assertThat(attr.getPrefix()).isNull();
+ assertThat(attr.getNamespaceURI()).isNull();
+ assertThat(attr.getName()).isEqualTo("attr");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateCDATASection.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateCDATASection.java
index db6464060..8ab953b34 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateCDATASection.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateCDATASection.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,7 +35,7 @@ public class TestCreateCDATASection extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
CDATASection cdataSection = document.createCDATASection("content");
- assertEquals("content", cdataSection.getData());
- assertSame(document, cdataSection.getOwnerDocument());
+ assertThat(cdataSection.getData()).isEqualTo("content");
+ assertThat(cdataSection.getOwnerDocument()).isSameAs(document);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNS.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNS.java
index 077644672..9070f2111 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNS.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNS.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -35,9 +37,9 @@ public class TestCreateElementNS extends DOMTestCase {
String namespace = "http://ws.apache.org/axis2/ns";;
Document doc = dbf.newDocumentBuilder().newDocument();
Element elem = doc.createElementNS(namespace, "axis2:" + tagName);
- assertEquals("Local name misnatch", tagName, elem.getLocalName());
- assertEquals("Namespace misnatch", namespace, elem.getNamespaceURI());
+ assertThat(elem.getLocalName()).isEqualTo(tagName);
+ assertThat(elem.getNamespaceURI()).isEqualTo(namespace);
// In contrast to Axiom, DOM doesn't generate namespace declarations
automatically
- assertEquals(0, elem.getAttributes().getLength());
+ assertThat(elem.getAttributes().getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithInvalidName.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithInvalidName.java
index c6112353c..db87866df 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithInvalidName.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithInvalidName.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -32,11 +35,13 @@ public class TestCreateElementNSWithInvalidName extends
DOMTestCase {
@Override
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().newDocument();
- try {
- doc.createElementNS("urn:ns", "IN|/ALID");
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ doc.createElementNS("urn:ns",
"IN|/ALID");
+ })
+ .code)
+ .isEqualTo(DOMException.INVALID_CHARACTER_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithoutNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithoutNamespace.java
index c88f0435b..30c7156b8 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithoutNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateElementNSWithoutNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,8 +35,8 @@ public class TestCreateElementNSWithoutNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document doc = dbf.newDocumentBuilder().newDocument();
Element element = doc.createElementNS(null, "test");
- assertNull(element.getPrefix());
- assertNull(element.getNamespaceURI());
- assertEquals("test", element.getTagName());
+ assertThat(element.getPrefix()).isNull();
+ assertThat(element.getNamespaceURI()).isNull();
+ assertThat(element.getTagName()).isEqualTo("test");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateEntityReference.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateEntityReference.java
index 5eb37e81c..3614f61e5 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateEntityReference.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateEntityReference.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -34,9 +36,9 @@ public class TestCreateEntityReference extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
EntityReference entref = document.createEntityReference("myentity");
- assertEquals(Node.ENTITY_REFERENCE_NODE, entref.getNodeType());
- assertEquals("myentity", entref.getNodeName());
- assertNull(entref.getNodeValue());
- assertSame(document, entref.getOwnerDocument());
+ assertThat(entref.getNodeType()).isEqualTo(Node.ENTITY_REFERENCE_NODE);
+ assertThat(entref.getNodeName()).isEqualTo("myentity");
+ assertThat(entref.getNodeValue()).isNull();
+ assertThat(entref.getOwnerDocument()).isSameAs(document);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateText.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateText.java
index afb02667e..f828b7df4 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateText.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -36,6 +38,6 @@ public class TestCreateText extends DOMTestCase {
Document doc = dbf.newDocumentBuilder().newDocument();
Text txt = doc.createTextNode(textValue);
- assertEquals("Text value mismatch", textValue, txt.getData());
+ assertThat(txt.getData()).isEqualTo(textValue);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestDocumentSiblings.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestDocumentSiblings.java
index 560c3735c..d67b0bfd3 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestDocumentSiblings.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestDocumentSiblings.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -37,10 +39,10 @@ public class TestDocumentSiblings extends DOMTestCase {
doc.appendChild(elem);
Node node = doc.getNextSibling();
- assertNull("Document's next sibling has to be null", node);
+ assertThat(node).isNull();
Node node2 = doc.getPreviousSibling();
- assertNull("Document's previous sibling has to be null", node2);
+ assertThat(node2).isNull();
Node node3 = doc.getParentNode();
- assertNull("Document's parent has to be null", node3);
+ assertThat(node3).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetDomConfigDefaults.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetDomConfigDefaults.java
index 912bcea8a..a13961d24 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetDomConfigDefaults.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetDomConfigDefaults.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -37,19 +39,20 @@ public class TestGetDomConfigDefaults extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
DOMConfiguration domConfig = document.getDomConfig();
- assertEquals(Boolean.FALSE, domConfig.getParameter("canonical-form"));
- assertEquals(Boolean.TRUE, domConfig.getParameter("cdata-sections"));
- assertEquals(Boolean.FALSE,
domConfig.getParameter("check-character-normalization"));
- assertEquals(Boolean.TRUE, domConfig.getParameter("comments"));
- assertEquals(Boolean.FALSE,
domConfig.getParameter("datatype-normalization"));
- assertEquals(Boolean.TRUE,
domConfig.getParameter("element-content-whitespace"));
- assertEquals(Boolean.TRUE, domConfig.getParameter("entities"));
- assertEquals(Boolean.TRUE, domConfig.getParameter("namespaces"));
- assertEquals(Boolean.TRUE,
domConfig.getParameter("namespace-declarations"));
- assertEquals(Boolean.FALSE,
domConfig.getParameter("normalize-characters"));
- assertEquals(Boolean.TRUE,
domConfig.getParameter("split-cdata-sections"));
- assertEquals(Boolean.FALSE, domConfig.getParameter("validate"));
- assertEquals(Boolean.FALSE,
domConfig.getParameter("validate-if-schema"));
- assertEquals(Boolean.TRUE, domConfig.getParameter("well-formed"));
+
assertThat(domConfig.getParameter("canonical-form")).isEqualTo(Boolean.FALSE);
+
assertThat(domConfig.getParameter("cdata-sections")).isEqualTo(Boolean.TRUE);
+ assertThat(domConfig.getParameter("check-character-normalization"))
+ .isEqualTo(Boolean.FALSE);
+ assertThat(domConfig.getParameter("comments")).isEqualTo(Boolean.TRUE);
+
assertThat(domConfig.getParameter("datatype-normalization")).isEqualTo(Boolean.FALSE);
+
assertThat(domConfig.getParameter("element-content-whitespace")).isEqualTo(Boolean.TRUE);
+ assertThat(domConfig.getParameter("entities")).isEqualTo(Boolean.TRUE);
+
assertThat(domConfig.getParameter("namespaces")).isEqualTo(Boolean.TRUE);
+
assertThat(domConfig.getParameter("namespace-declarations")).isEqualTo(Boolean.TRUE);
+
assertThat(domConfig.getParameter("normalize-characters")).isEqualTo(Boolean.FALSE);
+
assertThat(domConfig.getParameter("split-cdata-sections")).isEqualTo(Boolean.TRUE);
+
assertThat(domConfig.getParameter("validate")).isEqualTo(Boolean.FALSE);
+
assertThat(domConfig.getParameter("validate-if-schema")).isEqualTo(Boolean.FALSE);
+
assertThat(domConfig.getParameter("well-formed")).isEqualTo(Boolean.TRUE);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetOwnerDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetOwnerDocument.java
index 9fd1242eb..551827535 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetOwnerDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestGetOwnerDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -36,6 +38,6 @@ public class TestGetOwnerDocument extends DOMTestCase {
@Override
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
- assertNull(document.getOwnerDocument());
+ assertThat(document.getOwnerDocument()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURI.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURI.java
index 0114ca129..be33f083f 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURI.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURI.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -43,11 +45,11 @@ public class TestLookupNamespaceURI extends DOMTestCase {
documentElement.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
"xmlns:ns", "urn:test");
document.appendChild(documentElement);
// Note: this part is also tested by the W3C test suite (see
nodelookupnamespaceuri02)
- assertEquals("urn:test", document.lookupNamespaceURI("ns"));
+ assertThat(document.lookupNamespaceURI("ns")).isEqualTo("urn:test");
// The following assertion is important to check that there is no
infinite recursion
// (Document delegates the lookup to its document element, but the
document element must
// not delegate to its parent if no matching declaration is found).
// This is not tested by the W3C test suite.
- assertNull(document.lookupNamespaceURI("p"));
+ assertThat(document.lookupNamespaceURI("p")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURIWithEmptyDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURIWithEmptyDocument.java
index 09de64dc5..37533cfd8 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURIWithEmptyDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupNamespaceURIWithEmptyDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,6 +35,6 @@ public class TestLookupNamespaceURIWithEmptyDocument extends
DOMTestCase {
@Override
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
- assertNull(document.lookupNamespaceURI("p"));
+ assertThat(document.lookupNamespaceURI("p")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupPrefixWithEmptyDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupPrefixWithEmptyDocument.java
index e8ff1bb8f..da24e695d 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupPrefixWithEmptyDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestLookupPrefixWithEmptyDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -33,6 +35,6 @@ public class TestLookupPrefixWithEmptyDocument extends
DOMTestCase {
@Override
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
- assertNull(document.lookupPrefix("urn:test"));
+ assertThat(document.lookupPrefix("urn:test")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestNormalizeDocumentNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestNormalizeDocumentNamespace.java
index a06a86402..824d4014b 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestNormalizeDocumentNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestNormalizeDocumentNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.document;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,11 +46,11 @@ public class TestNormalizeDocumentNamespace extends
DOMTestCase {
domConfig.setParameter("namespaces", Boolean.TRUE);
document.normalizeDocument();
NamedNodeMap attributes = element.getAttributes();
- assertEquals(1, attributes.getLength());
+ assertThat(attributes.getLength()).isEqualTo(1);
Attr attr = (Attr) attributes.item(0);
- assertNull(attr.getPrefix());
- assertEquals(XMLConstants.XMLNS_ATTRIBUTE, attr.getLocalName());
- assertEquals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
attr.getNamespaceURI());
- assertEquals("urn:ns", attr.getValue());
+ assertThat(attr.getPrefix()).isNull();
+
assertThat(attr.getLocalName()).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE);
+
assertThat(attr.getNamespaceURI()).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE_NS_URI);
+ assertThat(attr.getValue()).isEqualTo("urn:ns");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeDeep.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeDeep.java
index ad66ccf48..6e2030b58 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeDeep.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeDeep.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.documentfragment;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -38,15 +40,15 @@ public class TestCloneNodeDeep extends DOMTestCase {
fragment.appendChild(document.createComment("comment"));
fragment.appendChild(document.createElementNS(null, "test"));
DocumentFragment clone = (DocumentFragment) fragment.cloneNode(true);
- assertSame(document, clone.getOwnerDocument());
+ assertThat(clone.getOwnerDocument()).isSameAs(document);
Node child = clone.getFirstChild();
- assertNotNull(child);
- assertEquals(Node.COMMENT_NODE, child.getNodeType());
+ assertThat(child).isNotNull();
+ assertThat(child.getNodeType()).isEqualTo(Node.COMMENT_NODE);
child = child.getNextSibling();
- assertNotNull(child);
- assertEquals(Node.ELEMENT_NODE, child.getNodeType());
- assertEquals("test", child.getLocalName());
+ assertThat(child).isNotNull();
+ assertThat(child.getNodeType()).isEqualTo(Node.ELEMENT_NODE);
+ assertThat(child.getLocalName()).isEqualTo("test");
child = child.getNextSibling();
- assertNull(child);
+ assertThat(child).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeShallow.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeShallow.java
index 51466729d..8e3815878 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeShallow.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestCloneNodeShallow.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.documentfragment;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -37,9 +39,9 @@ public class TestCloneNodeShallow extends DOMTestCase {
DocumentFragment fragment = document.createDocumentFragment();
fragment.appendChild(document.createElementNS(null, "test"));
DocumentFragment clone = (DocumentFragment) fragment.cloneNode(false);
- assertSame(document, clone.getOwnerDocument());
- assertNull(clone.getFirstChild());
- assertNull(clone.getLastChild());
- assertEquals(0, clone.getChildNodes().getLength());
+ assertThat(clone.getOwnerDocument()).isSameAs(document);
+ assertThat(clone.getFirstChild()).isNull();
+ assertThat(clone.getLastChild()).isNull();
+ assertThat(clone.getChildNodes().getLength()).isEqualTo(0);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupNamespaceURI.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupNamespaceURI.java
index ac822efb9..55e1c8862 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupNamespaceURI.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupNamespaceURI.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.documentfragment;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,6 +46,6 @@ public class TestLookupNamespaceURI extends DOMTestCase {
Element element = document.createElementNS("urn:test", "ns:root");
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
"xmlns:ns", "urn:test");
fragment.appendChild(element);
- assertNull(fragment.lookupNamespaceURI("ns"));
+ assertThat(fragment.lookupNamespaceURI("ns")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupPrefix.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupPrefix.java
index 1315db7c4..9d70fd318 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupPrefix.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documentfragment/TestLookupPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.documentfragment;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,6 +46,6 @@ public class TestLookupPrefix extends DOMTestCase {
Element element = document.createElementNS("urn:test", "ns:root");
element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
"xmlns:ns", "urn:test");
fragment.appendChild(element);
- assertNull(fragment.lookupPrefix("urn:test"));
+ assertThat(fragment.lookupPrefix("urn:test")).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser1.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser1.java
index 924117cd5..fbdca0257 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser1.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.documenttype;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -35,9 +37,9 @@ public class TestWithParser1 extends DOMTestCase {
dbf.newDocumentBuilder()
.parse(TestWithParser1.class.getResource("test1.xml").toString());
DocumentType doctype = document.getDoctype();
- assertEquals("root", doctype.getName());
- assertNull(doctype.getPublicId());
- assertNull(doctype.getSystemId());
- assertEquals("<!ELEMENT root (#PCDATA)>",
doctype.getInternalSubset().trim());
+ assertThat(doctype.getName()).isEqualTo("root");
+ assertThat(doctype.getPublicId()).isNull();
+ assertThat(doctype.getSystemId()).isNull();
+ assertThat(doctype.getInternalSubset().trim()).isEqualTo("<!ELEMENT
root (#PCDATA)>");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser2.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser2.java
index 72c527704..fd003d5d0 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser2.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/documenttype/TestWithParser2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.documenttype;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -35,9 +37,9 @@ public class TestWithParser2 extends DOMTestCase {
dbf.newDocumentBuilder()
.parse(TestWithParser2.class.getResource("test2.xml").toString());
DocumentType doctype = document.getDoctype();
- assertEquals("root", doctype.getName());
- assertEquals("dummy", doctype.getPublicId());
- assertEquals("test.dtd", doctype.getSystemId());
- assertNull(doctype.getInternalSubset());
+ assertThat(doctype.getName()).isEqualTo("root");
+ assertThat(doctype.getPublicId()).isEqualTo("dummy");
+ assertThat(doctype.getSystemId()).isEqualTo("test.dtd");
+ assertThat(doctype.getInternalSubset()).isNull();
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChild.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChild.java
index e0b784a81..4cdc47ad6 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChild.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -44,15 +46,15 @@ public class TestAppendChild extends DOMTestCase {
elem.appendChild(childElem);
Element addedChild = (Element) elem.getFirstChild();
- assertNotNull("Child Element node missing", addedChild);
- assertEquals("Incorre node object", childElem, addedChild);
+ assertThat(addedChild).isNotNull();
+ assertThat(addedChild).isEqualTo(childElem);
elem = doc.createElement(elementName);
Text text = doc.createTextNode(childTextValue);
elem.appendChild(text);
Text addedTextnode = (Text) elem.getFirstChild();
- assertNotNull("Child Text node missing", addedTextnode);
- assertEquals("Incorrect node object", text, addedTextnode);
+ assertThat(addedTextnode).isNotNull();
+ assertThat(addedTextnode).isEqualTo(text);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildCyclic.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildCyclic.java
index 478fd4de3..36c2b4943 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildCyclic.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildCyclic.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -44,11 +47,13 @@ public class TestAppendChildCyclic extends DOMTestCase {
grandparent.appendChild(parent);
Element element = document.createElementNS(null, "element");
parent.appendChild(element);
- try {
- element.appendChild(grandparent);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.appendChild(grandparent);
+ })
+ .code)
+ .isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildSelf.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildSelf.java
index 41c1759a6..0956c6863 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildSelf.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildSelf.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -39,11 +42,13 @@ public class TestAppendChildSelf extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS("urn:test", "test");
- try {
- element.appendChild(element);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.appendChild(element);
+ })
+ .code)
+ .isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildWrongDocument.java
index 65491e86b..50ca4db75 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAppendChildWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,11 +47,13 @@ public class TestAppendChildWrongDocument extends
DOMTestCase {
Document document2 = documentBuilder.newDocument();
Element element = document1.createElementNS(null, "element");
Text text = document2.createTextNode("test");
- try {
- element.appendChild(text);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.appendChild(text);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes.java
index 4296b2719..53d7734ff 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -39,44 +41,44 @@ public class TestAttributes extends DOMTestCase {
// Check whether body has attributes
Element bodyElement = doc.getDocumentElement();
- assertTrue(bodyElement.hasAttributes());
+ assertThat(bodyElement.hasAttributes()).isTrue();
Element directionResponse =
(Element)
bodyElement.getElementsByTagName("GetDirectionsResponse").item(0);
- assertTrue(directionResponse.hasAttributes());
+ assertThat(directionResponse.hasAttributes()).isTrue();
NamedNodeMap attributes = directionResponse.getAttributes();
Attr attr = (Attr) attributes.item(0);
- assertEquals("xmlns", attr.getName());
- assertEquals("http://www.example.org/webservices/";, attr.getValue());
+ assertThat(attr.getName()).isEqualTo("xmlns");
+
assertThat(attr.getValue()).isEqualTo("http://www.example.org/webservices/";);
Element directionResult =
(Element)
bodyElement.getElementsByTagName("GetDirectionsResult").item(0);
- assertFalse(directionResult.hasAttributes());
+ assertThat(directionResult.hasAttributes()).isFalse();
Element drivingDirection =
(Element)
directionResult.getElementsByTagName("drivingdirections").item(0);
- assertTrue(drivingDirection.hasAttributes());
+ assertThat(drivingDirection.hasAttributes()).isTrue();
attributes = drivingDirection.getAttributes();
attr = (Attr) attributes.item(0);
- assertEquals("xmlns", attr.getName());
- assertEquals("", attr.getValue());
+ assertThat(attr.getName()).isEqualTo("xmlns");
+ assertThat(attr.getValue()).isEqualTo("");
Element route = (Element)
drivingDirection.getElementsByTagName("route").item(0);
- assertTrue(route.hasAttributes());
+ assertThat(route.hasAttributes()).isTrue();
attributes = route.getAttributes();
attr = (Attr) attributes.item(0);
- assertEquals("distanceToTravel", attr.getName());
- assertEquals("500m", attr.getValue());
+ assertThat(attr.getName()).isEqualTo("distanceToTravel");
+ assertThat(attr.getValue()).isEqualTo("500m");
attr = (Attr) attributes.item(1);
- assertEquals("finalStep", attr.getName());
- assertEquals("false", attr.getValue());
+ assertThat(attr.getName()).isEqualTo("finalStep");
+ assertThat(attr.getValue()).isEqualTo("false");
attr = (Attr) attributes.item(2);
- assertEquals("id", attr.getName());
- assertEquals("0", attr.getValue());
+ assertThat(attr.getName()).isEqualTo("id");
+ assertThat(attr.getValue()).isEqualTo("0");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes2.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes2.java
index 219227d84..2ff62167e 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes2.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestAttributes2.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;
@@ -43,14 +45,14 @@ public class TestAttributes2 extends DOMTestCase {
new InputSource(
new StringReader("<root><child
xmlns=\"\"/></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", attr.getName());
- assertNull(attr.getPrefix());
- assertEquals("xmlns", attr.getLocalName());
- assertEquals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
attr.getNamespaceURI());
- assertEquals("", attr.getValue());
+ assertThat(attr.getName()).isEqualTo("xmlns");
+ assertThat(attr.getPrefix()).isNull();
+ assertThat(attr.getLocalName()).isEqualTo("xmlns");
+
assertThat(attr.getNamespaceURI()).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE_NS_URI);
+ assertThat(attr.getValue()).isEqualTo("");
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeForeignImplementation.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeForeignImplementation.java
index d372c668e..fc1d1eb2c 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeForeignImplementation.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeForeignImplementation.java
@@ -19,6 +19,7 @@
package org.apache.axiom.ts.dom.element;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,11 +40,13 @@ public class TestRemoveAttributeNodeForeignImplementation
extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS(null, "test");
Attr attr = mock(Attr.class);
- try {
- element.removeAttributeNode(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertThat(ex.code).isEqualTo(DOMException.NOT_FOUND_ERR);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.removeAttributeNode(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.NOT_FOUND_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeNotOwner.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeNotOwner.java
index 936cd507f..a6efa994e 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeNotOwner.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestRemoveAttributeNodeNotOwner.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -44,11 +47,13 @@ public class TestRemoveAttributeNodeNotOwner extends
DOMTestCase {
Element element2 = document.createElementNS(null, "test");
Attr attr2 = document.createAttributeNS(null, "attr");
element2.setAttributeNodeNS(attr2);
- try {
- element1.removeAttributeNode(attr2);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NOT_FOUND_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
element1.removeAttributeNode(attr2);
+ })
+ .code)
+ .isEqualTo(DOMException.NOT_FOUND_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildCyclic.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildCyclic.java
index 9bf5e9d15..42532ccd5 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildCyclic.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildCyclic.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -43,11 +46,13 @@ public class TestReplaceChildCyclic extends DOMTestCase {
ancestor.appendChild(element);
Element child = document.createElementNS(null, "child");
element.appendChild(child);
- try {
- element.replaceChild(ancestor, child);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.replaceChild(ancestor,
child);
+ })
+ .code)
+ .isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNotFound.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNotFound.java
index 52bbd2c14..66950f094 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNotFound.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNotFound.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -43,11 +46,13 @@ public class TestReplaceChildNotFound extends DOMTestCase {
root.appendChild(document.createElementNS(null, "child"));
Text node1 = document.createTextNode("test1");
Text node2 = document.createTextNode("test2");
- try {
- root.replaceChild(node2, node1);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NOT_FOUND_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ root.replaceChild(node2, node1);
+ })
+ .code)
+ .isEqualTo(DOMException.NOT_FOUND_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNullNewChild.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNullNewChild.java
index 828660985..bd7a2a46b 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNullNewChild.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildNullNewChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -41,11 +43,10 @@ public class TestReplaceChildNullNewChild extends
DOMTestCase {
Element root = document.createElementNS(null, "root");
Element child = document.createElementNS(null, "child");
root.appendChild(child);
- try {
- root.replaceChild(null, child);
- fail("Expected exception");
- } catch (Exception ex) {
- // Expected
- }
+ assertThrows(
+ Exception.class,
+ () -> {
+ root.replaceChild(null, child);
+ });
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildWrongDocument.java
index e2d7a87f3..3e9c3b936 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestReplaceChildWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -44,11 +47,13 @@ public class TestReplaceChildWrongDocument extends
DOMTestCase {
parent.appendChild(child2);
parent.appendChild(child3);
Element replacementChild = document2.createElementNS(null, "newchild");
- try {
- parent.replaceChild(replacementChild, child2);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
parent.replaceChild(replacementChild, child2);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java
index 1b410eaf3..4ed5f7742 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -41,12 +44,16 @@ public class TestSetAttributeNSInvalid extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS(null, "test");
- try {
- element.setAttributeNS(
- DOMUtils.getNamespaceURI(qname),
DOMUtils.getQualifiedName(qname), "value");
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NAMESPACE_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.setAttributeNS(
+
DOMUtils.getNamespaceURI(qname),
+
DOMUtils.getQualifiedName(qname),
+ "value");
+ })
+ .code)
+ .isEqualTo(DOMException.NAMESPACE_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSForeignImplementation.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSForeignImplementation.java
index 0da998ff7..4752fcf67 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSForeignImplementation.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSForeignImplementation.java
@@ -19,6 +19,7 @@
package org.apache.axiom.ts.dom.element;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,11 +40,13 @@ public class TestSetAttributeNodeNSForeignImplementation
extends DOMTestCase {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS(null, "test");
Attr attr = mock(Attr.class);
- try {
- element.setAttributeNodeNS(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertThat(ex.code).isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.setAttributeNodeNS(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSInUse.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSInUse.java
index 5750689d2..40c35d5d0 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSInUse.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSInUse.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -38,11 +41,13 @@ public class TestSetAttributeNodeNSInUse extends
DOMTestCase {
Element element2 = document.createElementNS(null, "test");
Attr attr = document.createAttributeNS(null, "test");
element1.setAttributeNodeNS(attr);
- try {
- element2.setAttributeNodeNS(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.INUSE_ATTRIBUTE_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element2.setAttributeNodeNS(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.INUSE_ATTRIBUTE_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSWrongDocument.java
index b0ad17cc9..c56ca2aa9 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeNSWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,11 +42,13 @@ public class TestSetAttributeNodeNSWrongDocument extends
DOMTestCase {
Document document2 = db.newDocument();
Element element = document1.createElementNS(null, "test");
Attr attr = document2.createAttributeNS(null, "test");
- try {
- element.setAttributeNodeNS(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.setAttributeNodeNS(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeWrongDocument.java
index 8d4667a9d..5274742ed 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNodeWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,11 +42,13 @@ public class TestSetAttributeNodeWrongDocument extends
DOMTestCase {
Document document2 = db.newDocument();
Element element = document1.createElementNS(null, "test");
Attr attr = document2.createAttributeNS(null, "test");
- try {
- element.setAttributeNode(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.setAttributeNode(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithoutNamespace.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithoutNamespace.java
index 62c6a1341..dbd75db53 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithoutNamespace.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetPrefixNotNullWithoutNamespace.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -39,11 +42,13 @@ public class TestSetPrefixNotNullWithoutNamespace extends
DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Element element = document.createElementNS(null, "test");
- try {
- element.setPrefix("p");
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NAMESPACE_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ element.setPrefix("p");
+ })
+ .code)
+ .isEqualTo(DOMException.NAMESPACE_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemNSWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemNSWrongDocument.java
index b580b8009..c860e15b8 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemNSWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemNSWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element.attributes;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,11 +42,13 @@ public class TestSetNamedItemNSWrongDocument extends
DOMTestCase {
Document document2 = db.newDocument();
Element element = document1.createElementNS(null, "test");
Attr attr = document2.createAttributeNS(null, "test");
- try {
- element.getAttributes().setNamedItemNS(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
element.getAttributes().setNamedItemNS(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemWrongDocument.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemWrongDocument.java
index f61870109..ce1b38e29 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemWrongDocument.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/attributes/TestSetNamedItemWrongDocument.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.element.attributes;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -39,11 +42,13 @@ public class TestSetNamedItemWrongDocument extends
DOMTestCase {
Document document2 = db.newDocument();
Element element = document1.createElementNS(null, "test");
Attr attr = document2.createAttributeNS(null, "test");
- try {
- element.getAttributes().setNamedItem(attr);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+
element.getAttributes().setNamedItem(attr);
+ })
+ .code)
+ .isEqualTo(DOMException.WRONG_DOCUMENT_ERR);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSetPrefix.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSetPrefix.java
index 7fcfdc19f..df5bb25a4 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSetPrefix.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/text/TestSetPrefix.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.dom.text;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.ts.dom.DOMTestCase;
@@ -36,11 +39,13 @@ public class TestSetPrefix extends DOMTestCase {
protected void runTest() throws Throwable {
Document document = dbf.newDocumentBuilder().newDocument();
Text text = document.createTextNode("test");
- try {
- text.setPrefix("p");
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertEquals(DOMException.NAMESPACE_ERR, ex.code);
- }
+ assertThat(
+ assertThrows(
+ DOMException.class,
+ () -> {
+ text.setPrefix("p");
+ })
+ .code)
+ .isEqualTo(DOMException.NAMESPACE_ERR);
}
}
