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 5ca1e9691 Replace try/fail/catch pattern with AssertJ
assertThatThrownBy in axiom-testsuite
5ca1e9691 is described below
commit 5ca1e9691a95e14db414fa5db4ca52e4c74d01c8
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 14 14:53:18 2026 +0000
Replace try/fail/catch pattern with AssertJ assertThatThrownBy in
axiom-testsuite
---
...ilderFromDOMWithNSUnawarePrefixedAttribute.java | 17 ++++++-----
.../TestCreateStAXOMBuilderIncorrectState.java | 13 ++++----
...tElementWithDiscardDocumentIllFormedEpilog.java | 9 ++----
...estGetDocumentElementWithIllFormedDocument.java | 9 ++----
.../ts/om/builder/TestIOExceptionInGetText.java | 16 +++-------
.../axiom/ts/om/builder/TestMalformedDocument.java | 9 ++----
.../TestAddChildWithExistingDocumentElement.java | 10 +++----
.../om/document/TestSetOMDocumentElementNull.java | 10 +++----
.../TestAddAttributeWithInvalidNamespace1.java | 18 +++++------
.../TestAddAttributeWithInvalidNamespace2.java | 16 +++++-----
.../axiom/ts/om/element/TestAddChildDiscarded.java | 10 +++----
.../axiom/ts/om/element/TestBuildDiscarded.java | 9 ++----
.../TestDeclareDefaultNamespaceConflict1.java | 10 +++----
.../TestDeclareDefaultNamespaceConflict2.java | 10 +++----
.../om/element/TestDeclareNamespaceInvalid1.java | 10 +++----
.../om/element/TestDeclareNamespaceInvalid2.java | 10 +++----
...llDeclaredNamespacesNoSuchElementException.java | 9 ++----
...TestGetChildElementsConcurrentModification.java | 9 ++----
.../om/element/TestGetChildElementsConsumed.java | 19 ++++++------
.../TestGetChildrenConcurrentModification.java | 9 ++----
.../element/TestGetFirstOMChildAfterConsume.java | 9 ++----
.../element/TestGetFirstOMChildAfterDiscard.java | 9 ++----
.../ts/om/element/TestRemoveAttributeNotOwner.java | 9 ++----
.../element/TestSerializeAndConsumeConsumed.java | 11 ++++---
...TestCreateOMAttributeWithInvalidNamespace1.java | 13 ++++----
...TestCreateOMAttributeWithInvalidNamespace2.java | 11 ++++---
.../TestCreateOMElementWithInvalidNamespace.java | 17 +++++++----
.../TestCreateOMElementWithNullOMDataSource1.java | 13 ++++----
.../TestCreateOMElementWithNullOMDataSource2.java | 10 +++----
.../TestCreateOMElementWithNullURIAndPrefix.java | 14 +++++----
.../factory/TestCreateOMNamespaceWithNullURI.java | 10 +++----
.../om/node/TestGetNextOMSiblingAfterDiscard.java | 9 ++----
.../ts/om/node/TestInsertSiblingAfterOnChild.java | 9 ++----
.../ts/om/node/TestInsertSiblingAfterOnOrphan.java | 9 ++----
.../ts/om/node/TestInsertSiblingAfterOnSelf.java | 9 ++----
.../ts/om/node/TestInsertSiblingBeforeOnChild.java | 9 ++----
.../om/node/TestInsertSiblingBeforeOnOrphan.java | 9 ++----
.../ts/om/node/TestInsertSiblingBeforeOnSelf.java | 9 ++----
.../sourcedelement/TestGetDocumentFromBuilder.java | 17 ++++-------
.../om/sourcedelement/TestGetReaderException.java | 15 +++++-----
...ourceWithPushOMDataSourceThrowingException.java | 15 ++++------
.../ts/om/sourcedelement/push/CloseScenario.java | 10 ++-----
.../WriteEmptyElementNamespaceUnawareScenario.java | 11 +++----
.../WriteStartElementNamespaceUnawareScenario.java | 11 +++----
.../push/WriteStartEndDocumentScenario.java | 35 +++++++---------------
.../omdom/document/TestAppendChildForbidden.java | 13 ++++----
.../omdom/document/TestInsertBeforeForbidden.java | 16 ++++++----
...ateSOAPModelBuilderMTOMContentTypeMismatch.java | 22 +++++++-------
.../org/apache/axiom/ts/soap/builder/TestDTD.java | 20 +++++++------
.../ts/soap/envelope/TestAddElementAfterBody.java | 10 +++----
.../axiom/ts/soap/fault/TestWrongParent1.java | 10 +++----
.../axiom/ts/soap/fault/TestWrongParent2.java | 10 +++----
.../axiom/ts/soap/fault/TestWrongParent3.java | 10 +++----
...estAddHeaderBlockFromQNameWithoutNamespace.java | 10 +++----
.../TestAddHeaderBlockWithoutNamespace1.java | 10 +++----
.../TestAddHeaderBlockWithoutNamespace2.java | 9 ++----
.../TestGetBooleanAttributeInvalid.java | 14 +++++----
.../TestGetBooleanAttributeUnspported.java | 14 +++++----
.../TestSetBooleanAttributeUnsupported.java | 14 +++++----
.../ts/soap/headerblock/TestWrongParent1.java | 9 ++----
.../ts/soap/headerblock/TestWrongParent2.java | 10 +++----
.../ts/soap/headerblock/TestWrongParent3.java | 10 +++----
.../TestSetOMDocumentElementNonSOAPEnvelope.java | 10 +++----
.../ts/soap/misc/TestSetChildVersionMismatch.java | 10 +++----
64 files changed, 322 insertions(+), 444 deletions(-)
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawarePrefixedAttribute.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawarePrefixedAttribute.java
index 2faf794e1..57219dc96 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawarePrefixedAttribute.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawarePrefixedAttribute.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
@@ -34,13 +36,12 @@ public class
TestCreateOMBuilderFromDOMWithNSUnawarePrefixedAttribute extends Ax
protected void runTest() throws Throwable {
Element domElement =
DOMImplementation.XERCES.newDocument().createElementNS(null, "test");
domElement.setAttribute("p:attr", "value");
- try {
- OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
domElement, false)
- .getDocument()
- .build();
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ OMXMLBuilderFactory.createOMBuilder(
+ metaFactory.getOMFactory(),
domElement, false)
+ .getDocument()
+ .build())
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderIncorrectState.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderIncorrectState.java
index 1acad3cf2..711d302db 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderIncorrectState.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderIncorrectState.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import javax.xml.stream.XMLStreamConstants;
@@ -48,11 +50,10 @@ public class TestCreateStAXOMBuilderIncorrectState extends
AxiomTestCase {
while (reader.getEventType() != XMLStreamReader.CHARACTERS) {
reader.next();
}
- try {
-
OMXMLBuilderFactory.createStAXOMBuilder(metaFactory.getOMFactory(), reader);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ OMXMLBuilderFactory.createStAXOMBuilder(
+ metaFactory.getOMFactory(), reader))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithDiscardDocumentIllFormedEpilog.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithDiscardDocumentIllFormedEpilog.java
index 30631a660..a62f0e4aa 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithDiscardDocumentIllFormedEpilog.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithDiscardDocumentIllFormedEpilog.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import org.apache.axiom.om.OMElement;
@@ -45,11 +47,6 @@ public class
TestGetDocumentElementWithDiscardDocumentIllFormedEpilog extends Ax
OMXMLBuilderFactory.createOMBuilder(
factory, new StringReader("<root/> there shouldn't be
text here!"));
OMElement element = builder.getDocumentElement(true);
- try {
- element.build();
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(element::build).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithIllFormedDocument.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithIllFormedDocument.java
index 1b5520975..9accebcdf 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithIllFormedDocument.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElementWithIllFormedDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import org.apache.axiom.om.OMException;
@@ -40,11 +42,6 @@ public class TestGetDocumentElementWithIllFormedDocument
extends AxiomTestCase {
OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(
metaFactory.getOMFactory(), new
StringReader("<!--comment1-->"));
- try {
- builder.getDocumentElement();
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+
assertThatThrownBy(builder::getDocumentElement).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
index 137283dbe..4c6cf994f 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -67,22 +69,12 @@ public class TestIOExceptionInGetText extends AxiomTestCase
{
OMXMLBuilderFactory.createStAXOMBuilder(metaFactory.getOMFactory(), reader)
.getDocumentElement();
- try {
- element.getNextOMSibling();
- fail("Expected exception");
- } catch (Exception ex) {
- // Expected
- }
+ assertThatThrownBy(element::getNextOMSibling);
assertTrue(invocationCounter.getInvocationCount() > 0);
invocationCounter.reset();
- try {
- element.getNextOMSibling();
- fail("Expected exception");
- } catch (Exception ex) {
- // Expected
- }
+ assertThatThrownBy(element::getNextOMSibling);
assertEquals(0, invocationCounter.getInvocationCount());
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestMalformedDocument.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestMalformedDocument.java
index 8a07feeb0..03d7d2580 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestMalformedDocument.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestMalformedDocument.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
@@ -39,12 +41,7 @@ public class TestMalformedDocument extends AxiomTestCase {
metaFactory.getOMFactory(),
new StringReader("<Root><Child attr='a'
attr='a'/></Root>"))
.getDocument();
- try {
- document.serialize(new ByteArrayOutputStream());
- fail("Expected exception");
- } catch (Exception ex) {
- // We expect an exception here
- }
+ assertThatThrownBy(() -> document.serialize(new
ByteArrayOutputStream()));
document.close(false);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildWithExistingDocumentElement.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildWithExistingDocumentElement.java
index e614a44b4..7d078736f 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildWithExistingDocumentElement.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestAddChildWithExistingDocumentElement.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMContainer;
@@ -43,11 +45,7 @@ public class TestAddChildWithExistingDocumentElement extends
AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMDocument document = factory.createOMDocument();
document.addChild(factory.createOMElement(new QName("root1")));
- try {
- document.addChild(factory.createOMElement(new QName("root2")));
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> document.addChild(factory.createOMElement(new
QName("root2"))))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNull.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNull.java
index 91874129f..681001043 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNull.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementNull.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -37,11 +39,7 @@ public class TestSetOMDocumentElementNull extends
AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMDocument document = factory.createOMDocument();
- try {
- document.setOMDocumentElement(null);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> document.setOMDocumentElement(null))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace1.java
index 0cbcf2872..aced6f9ce 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace1.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -44,15 +47,10 @@ public class TestAddAttributeWithInvalidNamespace1 extends
AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
OMNamespace ns = factory.createOMNamespace("", "p");
- try {
- element.addAttribute("attr", "value", ns);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- assertEquals(
- "Cannot create a prefixed attribute with an empty
namespace name",
- ex.getMessage());
- // No namespace declaration should have been added before throwing
the exception
- assertFalse(element.getAllDeclaredNamespaces().hasNext());
- }
+ assertThatThrownBy(() -> element.addAttribute("attr", "value", ns))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Cannot create a prefixed attribute with an empty
namespace name");
+ // No namespace declaration should have been added before throwing the
exception
+ assertThat(element.getAllDeclaredNamespaces().hasNext()).isFalse();
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace2.java
index 74ad5af0b..218f154e7 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithInvalidNamespace2.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -44,13 +47,10 @@ public class TestAddAttributeWithInvalidNamespace2 extends
AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
OMNamespace ns = factory.createOMNamespace("urn:test", "");
- try {
- element.addAttribute("attr", "value", ns);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- assertEquals("Cannot create an unprefixed attribute with a
namespace", ex.getMessage());
- // No namespace declaration should have been added before throwing
the exception
- assertFalse(element.getAllDeclaredNamespaces().hasNext());
- }
+ assertThatThrownBy(() -> element.addAttribute("attr", "value", ns))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Cannot create an unprefixed attribute with a
namespace");
+ // No namespace declaration should have been added before throwing the
exception
+ assertThat(element.getAllDeclaredNamespaces().hasNext()).isFalse();
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildDiscarded.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildDiscarded.java
index d8aac5727..3437df1ee 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildDiscarded.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildDiscarded.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import org.apache.axiom.om.NodeUnavailableException;
@@ -48,11 +50,7 @@ public class TestAddChildDiscarded extends AxiomTestCase {
// Partially build the parent
parent.getFirstOMChild();
parent.discard();
- try {
- parent.addChild(factory.createOMElement("c", null));
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> parent.addChild(factory.createOMElement("c",
null)))
+ .isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestBuildDiscarded.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestBuildDiscarded.java
index df8efb2d8..735b7ef2c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestBuildDiscarded.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestBuildDiscarded.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import org.apache.axiom.om.NodeUnavailableException;
@@ -47,11 +49,6 @@ public class TestBuildDiscarded extends AxiomTestCase {
// Partially build the parent
parent.getFirstOMChild();
parent.discard();
- try {
- parent.build();
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException ex) {
- // Expected
- }
+
assertThatThrownBy(parent::build).isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict1.java
index 5f92b2be4..df8e252af 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -40,11 +42,7 @@ public class TestDeclareDefaultNamespaceConflict1 extends
AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement("test", null);
- try {
- element.declareDefaultNamespace("urn:test");
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> element.declareDefaultNamespace("urn:test"))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict2.java
index 14fb43368..1bb61f6d7 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespaceConflict2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -42,11 +44,7 @@ public class TestDeclareDefaultNamespaceConflict2 extends
AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("urn:ns1", "");
OMElement element = factory.createOMElement("test", ns);
- try {
- element.declareDefaultNamespace("urn:ns2");
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> element.declareDefaultNamespace("urn:ns2"))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid1.java
index db16909c7..4400914e9 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -37,11 +39,7 @@ public class TestDeclareNamespaceInvalid1 extends
AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMElement element = metaFactory.getOMFactory().createOMElement(new
QName("test"));
- try {
- element.declareNamespace("", "ns");
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> element.declareNamespace("", "ns"))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid2.java
index 5b786c595..ef2eae014 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceInvalid2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
@@ -41,11 +43,7 @@ public class TestDeclareNamespaceInvalid2 extends
AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName("test"));
OMNamespace ns = factory.createOMNamespace("", "ns");
- try {
- element.declareNamespace(ns);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> element.declareNamespace(ns))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java
index 13727529e..c8700147f 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesNoSuchElementException.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -43,11 +45,6 @@ public class
TestGetAllDeclaredNamespacesNoSuchElementException extends AxiomTes
metaFactory.getOMFactory(), "<e xmlns:p='urn:test'
p:attr='test'/>");
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
it.next();
- try {
- it.next();
- fail("Expected NoSuchElementException");
- } catch (NoSuchElementException ex) {
- // Expected
- }
+
assertThatThrownBy(it::next).isInstanceOf(NoSuchElementException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java
index cbc8d8690..472f63602 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConcurrentModification.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.ConcurrentModificationException;
import java.util.Iterator;
@@ -48,11 +50,6 @@ public class TestGetChildElementsConcurrentModification
extends AxiomTestCase {
it.next();
OMElement child2 = it.next();
child2.detach();
- try {
- it.next();
- fail("Expected ConcurrentModificationException");
- } catch (ConcurrentModificationException ex) {
- // Expected
- }
+
assertThatThrownBy(it::next).isInstanceOf(ConcurrentModificationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
index 2fe366533..85142e719 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElementsConsumed.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Iterator;
import javax.xml.stream.XMLStreamReader;
@@ -59,15 +61,14 @@ public class TestGetChildElementsConsumed extends
AxiomTestCase {
// try to find the children of the document element. This should
produce an
// error since the underlying stream is fully consumed without
building the object tree
- try {
- Iterator<OMElement> childElements =
documentElement.getChildElements();
- while (childElements.hasNext()) {
- childElements.next();
- }
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () -> {
+ Iterator<OMElement> childElements =
documentElement.getChildElements();
+ while (childElements.hasNext()) {
+ childElements.next();
+ }
+ })
+ .isInstanceOf(NodeUnavailableException.class);
documentElement.close(false);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java
index c3684e331..d63979653 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenConcurrentModification.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.ConcurrentModificationException;
import java.util.Iterator;
@@ -49,11 +51,6 @@ public class TestGetChildrenConcurrentModification extends
AxiomTestCase {
it.next();
OMElement child2 = (OMElement) it.next();
child2.detach();
- try {
- it.next();
- fail("Expected ConcurrentModificationException");
- } catch (ConcurrentModificationException ex) {
- // Expected
- }
+
assertThatThrownBy(it::next).isInstanceOf(ConcurrentModificationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterConsume.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterConsume.java
index c324a6dea..bec472284 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterConsume.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterConsume.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import javax.xml.stream.XMLStreamReader;
@@ -53,11 +55,6 @@ public class TestGetFirstOMChildAfterConsume extends
AxiomTestCase {
while (reader.hasNext()) {
reader.next();
}
- try {
- element.getFirstOMChild();
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException ex) {
- // Expected
- }
+
assertThatThrownBy(element::getFirstOMChild).isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterDiscard.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterDiscard.java
index a9efdce7a..b1d9bdb67 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterDiscard.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetFirstOMChildAfterDiscard.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import org.apache.axiom.om.NodeUnavailableException;
@@ -48,11 +50,6 @@ public class TestGetFirstOMChildAfterDiscard extends
AxiomTestCase {
"<element><!--comment--><a/><!--comment--></element>"))
.getDocumentElement();
element.discard();
- try {
- element.getFirstOMChild();
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException ex) {
- // Expected
- }
+
assertThatThrownBy(element::getFirstOMChild).isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttributeNotOwner.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttributeNotOwner.java
index 19da45fca..3a7df5ef7 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttributeNotOwner.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveAttributeNotOwner.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -41,11 +43,6 @@ public class TestRemoveAttributeNotOwner extends
AxiomTestCase {
element1.addAttribute("attr", "value", null);
OMElement element2 = factory.createOMElement("test", null);
OMAttribute attr = element2.addAttribute("attr", "value", null);
- try {
- element1.removeAttribute(attr);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
element1.removeAttribute(attr)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
index 4e0e7d03f..d14e379af 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -62,12 +64,9 @@ public class TestSerializeAndConsumeConsumed extends
AxiomTestCase {
// try to find the children of the document element. This should
produce an
// error since the underlying stream is fully consumed without
building the object tree
- try {
-
documentElement.serializeAndConsume(StAX.createNullXMLStreamWriter());
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException e) {
- // wea re cool
- }
+ assertThatThrownBy(
+ () ->
documentElement.serializeAndConsume(StAX.createNullXMLStreamWriter()))
+ .isInstanceOf(NodeUnavailableException.class);
documentElement.close(false);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace1.java
index dfc0fd047..84d21f4df 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -37,13 +39,8 @@ public class TestCreateOMAttributeWithInvalidNamespace1
extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("", "p");
- try {
- factory.createOMAttribute("attr", ns, "value");
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- assertEquals(
- "Cannot create a prefixed attribute with an empty
namespace name",
- ex.getMessage());
- }
+ assertThatThrownBy(() -> factory.createOMAttribute("attr", ns,
"value"))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Cannot create a prefixed attribute with an empty
namespace name");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace2.java
index c06241122..925119c5b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeWithInvalidNamespace2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -37,11 +39,8 @@ public class TestCreateOMAttributeWithInvalidNamespace2
extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("urn:test", "");
- try {
- factory.createOMAttribute("attr", ns, "value");
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- assertEquals("Cannot create an unprefixed attribute with a
namespace", ex.getMessage());
- }
+ assertThatThrownBy(() -> factory.createOMAttribute("attr", ns,
"value"))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Cannot create an unprefixed attribute with a
namespace");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithInvalidNamespace.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithInvalidNamespace.java
index 50e90ee7e..e2e07fcd1 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithInvalidNamespace.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithInvalidNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -36,11 +38,14 @@ public class TestCreateOMElementWithInvalidNamespace
extends CreateOMElementTest
@Override
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- try {
- variant.createOMElement(factory,
parentSupplier.createParent(factory), "test", "", "p");
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ variant.createOMElement(
+ factory,
+ parentSupplier.createParent(factory),
+ "test",
+ "",
+ "p"))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource1.java
index c880769ac..3d995dc63 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -36,11 +38,10 @@ public class TestCreateOMElementWithNullOMDataSource1
extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- try {
- factory.createOMElement(null, "test",
factory.createOMNamespace("urn:test", "p"));
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ factory.createOMElement(
+ null, "test",
factory.createOMNamespace("urn:test", "p")))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource2.java
index af38609bd..88dd09f74 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullOMDataSource2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMDataSource;
@@ -37,11 +39,7 @@ public class TestCreateOMElementWithNullOMDataSource2
extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- try {
- factory.createOMElement(null, new QName("urn:test", "test", "p"));
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> factory.createOMElement(null, new
QName("urn:test", "test", "p")))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullURIAndPrefix.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullURIAndPrefix.java
index bc2c06ca2..c5fb653f0 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullURIAndPrefix.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNullURIAndPrefix.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -28,11 +30,11 @@ public class TestCreateOMElementWithNullURIAndPrefix
extends AxiomTestCase {
@Override
protected void runTest() {
- try {
- metaFactory.getOMFactory().createOMElement("test", (String) null,
(String) null);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ metaFactory
+ .getOMFactory()
+ .createOMElement("test", (String)
null, (String) null))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespaceWithNullURI.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespaceWithNullURI.java
index 16e34fda6..ca24e89e3 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespaceWithNullURI.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMNamespaceWithNullURI.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.ts.AxiomTestCase;
@@ -28,11 +30,7 @@ public class TestCreateOMNamespaceWithNullURI extends
AxiomTestCase {
@Override
protected void runTest() throws Throwable {
- try {
- metaFactory.getOMFactory().createOMNamespace(null, "t");
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
metaFactory.getOMFactory().createOMNamespace(null, "t"))
+ .isInstanceOf(IllegalArgumentException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestGetNextOMSiblingAfterDiscard.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestGetNextOMSiblingAfterDiscard.java
index 47e732687..814aeec29 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestGetNextOMSiblingAfterDiscard.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestGetNextOMSiblingAfterDiscard.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import org.apache.axiom.om.NodeUnavailableException;
@@ -44,11 +46,6 @@ public class TestGetNextOMSiblingAfterDiscard extends
AxiomTestCase {
.getDocumentElement();
OMNode child = element.getFirstOMChild();
element.discard();
- try {
- child.getNextOMSibling();
- fail("Expected NodeUnavailableException");
- } catch (NodeUnavailableException ex) {
- // Expected
- }
+
assertThatThrownBy(child::getNextOMSibling).isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnChild.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnChild.java
index 3b15eefe6..293ad6884 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnChild.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -36,11 +38,6 @@ public class TestInsertSiblingAfterOnChild extends
AxiomTestCase {
OMElement element = factory.createOMElement("test", null);
OMText text = factory.createOMText("test");
element.addChild(text);
- try {
- text.insertSiblingAfter(element);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
text.insertSiblingAfter(element)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnOrphan.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnOrphan.java
index 04d83024f..1ff032a5c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnOrphan.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnOrphan.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -38,11 +40,6 @@ public class TestInsertSiblingAfterOnOrphan extends
AxiomTestCase {
OMFactory fac = metaFactory.getOMFactory();
OMText text1 = fac.createOMText("text1");
OMText text2 = fac.createOMText("text2");
- try {
- text1.insertSiblingBefore(text2);
- fail("Expected OMException because node has no parent");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
text1.insertSiblingBefore(text2)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnSelf.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnSelf.java
index 005ad5b12..2fc791906 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnSelf.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingAfterOnSelf.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -36,11 +38,6 @@ public class TestInsertSiblingAfterOnSelf extends
AxiomTestCase {
OMElement parent = factory.createOMElement("test", null);
OMText text = factory.createOMText("test");
parent.addChild(text);
- try {
- text.insertSiblingAfter(text);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
text.insertSiblingAfter(text)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnChild.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnChild.java
index 6606795a2..f5f260b16 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnChild.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnChild.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -36,11 +38,6 @@ public class TestInsertSiblingBeforeOnChild extends
AxiomTestCase {
OMElement element = factory.createOMElement("test", null);
OMText text = factory.createOMText("test");
element.addChild(text);
- try {
- text.insertSiblingBefore(element);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
text.insertSiblingBefore(element)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnOrphan.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnOrphan.java
index a927a4d1f..b661d37eb 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnOrphan.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnOrphan.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -36,11 +38,6 @@ public class TestInsertSiblingBeforeOnOrphan extends
AxiomTestCase {
OMFactory fac = metaFactory.getOMFactory();
OMText text1 = fac.createOMText("text1");
OMText text2 = fac.createOMText("text2");
- try {
- text1.insertSiblingAfter(text2);
- fail("Expected OMException because node has no parent");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
text1.insertSiblingAfter(text2)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnSelf.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnSelf.java
index 8ad6b3b64..fd97163df 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnSelf.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestInsertSiblingBeforeOnSelf.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.node;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -36,11 +38,6 @@ public class TestInsertSiblingBeforeOnSelf extends
AxiomTestCase {
OMElement parent = factory.createOMElement("test", null);
OMText text = factory.createOMText("test");
parent.addChild(text);
- try {
- text.insertSiblingBefore(text);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
text.insertSiblingBefore(text)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetDocumentFromBuilder.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetDocumentFromBuilder.java
index cdb9b1fab..686009c5c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetDocumentFromBuilder.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetDocumentFromBuilder.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -44,17 +46,8 @@ public class TestGetDocumentFromBuilder extends
AxiomTestCase {
// Force expansion
element.getFirstOMChild();
OMXMLParserWrapper builder = element.getBuilder();
- try {
- builder.getDocument();
- fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
- try {
- builder.getDocumentElement();
- fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+
assertThatThrownBy(builder::getDocument).isInstanceOf(UnsupportedOperationException.class);
+ assertThatThrownBy(builder::getDocumentElement)
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetReaderException.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetReaderException.java
index 3127e6da7..0edd874ba 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetReaderException.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetReaderException.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -55,13 +57,10 @@ public class TestGetReaderException extends AxiomTestCase {
return true;
}
});
- try {
- element.getLocalName();
- fail("Expected OMException");
- } catch (OMException ex) {
- Throwable cause = ex.getCause();
- assertTrue(cause instanceof XMLStreamException);
- assertEquals("Test exception", cause.getMessage());
- }
+ assertThatThrownBy(element::getLocalName)
+ .isInstanceOf(OMException.class)
+ .cause()
+ .isInstanceOf(XMLStreamException.class)
+ .hasMessage("Test exception");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
index ac936720b..b7e81ee70 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -59,13 +59,10 @@ public class
TestGetSAXSourceWithPushOMDataSourceThrowingException extends Axiom
SAXSource saxSource = element.getSAXSource(true);
XMLReader reader = saxSource.getXMLReader();
reader.setContentHandler(SAX.createNullContentHandler());
- try {
- reader.parse(saxSource.getInputSource());
- fail("Expected SAXException");
- } catch (SAXException ex) {
- Throwable cause = ex.getCause();
- assertThat(cause).isInstanceOf(XMLStreamException.class);
- assertThat(cause.getMessage()).isEqualTo("TEST");
- }
+ assertThatThrownBy(() -> reader.parse(saxSource.getInputSource()))
+ .isInstanceOf(SAXException.class)
+ .cause()
+ .isInstanceOf(XMLStreamException.class)
+ .hasMessage("TEST");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java
index a55c0fc58..e463b2981 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/CloseScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Collections;
import java.util.Map;
@@ -27,7 +29,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.TestParameterTarget;
-import org.junit.Assert;
/**
* Scenario that calls {@link XMLStreamWriter#close()} which is forbidden by
the contract of {@link
@@ -47,12 +48,7 @@ public class CloseScenario implements
PushOMDataSourceScenario {
@Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeEmptyElement(null, "root", null);
- try {
- writer.close();
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+
assertThatThrownBy(writer::close).isInstanceOf(UnsupportedOperationException.class);
}
@Override
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java
index 7260f60b8..4fddcce0b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteEmptyElementNamespaceUnawareScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Collections;
import java.util.Map;
@@ -27,7 +29,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.TestParameterTarget;
-import org.junit.Assert;
/**
* Scenario that attempts to use {@link
XMLStreamWriter#writeEmptyElement(String)} which is
@@ -47,12 +48,8 @@ public class WriteEmptyElementNamespaceUnawareScenario
implements PushOMDataSour
@Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(null, "root", null);
- try {
- writer.writeEmptyElement("child");
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> writer.writeEmptyElement("child"))
+ .isInstanceOf(UnsupportedOperationException.class);
writer.writeEndElement();
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java
index 2d2b48329..a3e36c036 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartElementNamespaceUnawareScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Collections;
import java.util.Map;
@@ -27,7 +29,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.TestParameterTarget;
-import org.junit.Assert;
/**
* Scenario that attempts to use {@link
XMLStreamWriter#writeStartElement(String)} which is
@@ -47,12 +48,8 @@ public class WriteStartElementNamespaceUnawareScenario
implements PushOMDataSour
@Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(null, "root", null);
- try {
- writer.writeStartElement("child");
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> writer.writeStartElement("child"))
+ .isInstanceOf(UnsupportedOperationException.class);
writer.writeEndElement();
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartEndDocumentScenario.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartEndDocumentScenario.java
index b0e01a332..376ea4e8a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartEndDocumentScenario.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteStartEndDocumentScenario.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.sourcedelement.push;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Collections;
import java.util.Map;
@@ -27,7 +29,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.testutils.suite.TestParameterTarget;
-import org.junit.Assert;
/**
* Scenario that attempts to use {@link XMLStreamWriter#writeStartDocument()},
{@link
@@ -48,31 +49,15 @@ public class WriteStartEndDocumentScenario implements
PushOMDataSourceScenario {
@Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- try {
- writer.writeStartDocument();
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
- try {
- writer.writeStartDocument("1.0");
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
- try {
- writer.writeStartDocument("UTF-8", "1.0");
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(writer::writeStartDocument)
+ .isInstanceOf(UnsupportedOperationException.class);
+ assertThatThrownBy(() -> writer.writeStartDocument("1.0"))
+ .isInstanceOf(UnsupportedOperationException.class);
+ assertThatThrownBy(() -> writer.writeStartDocument("UTF-8", "1.0"))
+ .isInstanceOf(UnsupportedOperationException.class);
writer.writeEmptyElement(null, "root", null);
- try {
- writer.writeEndDocument();
- Assert.fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(writer::writeEndDocument)
+ .isInstanceOf(UnsupportedOperationException.class);
}
@Override
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
index 036f36d5d..6786f841e 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
@@ -19,6 +19,7 @@
package org.apache.axiom.ts.omdom.document;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.StringReader;
@@ -46,11 +47,11 @@ public class TestAppendChildForbidden extends OMDOMTestCase
{
omDocument.build();
}
Document document = (Document) omDocument;
- try {
- document.appendChild(document.createElementNS(null, "test"));
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertThat(ex.code).isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
- }
+ assertThatThrownBy(() ->
document.appendChild(document.createElementNS(null, "test")))
+ .isInstanceOf(DOMException.class)
+ .satisfies(
+ e ->
+ assertThat(((DOMException) e).code)
+
.isEqualTo(DOMException.HIERARCHY_REQUEST_ERR));
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
index 311b5a96a..cea7cb4ee 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
@@ -19,6 +19,7 @@
package org.apache.axiom.ts.omdom.document;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.StringReader;
@@ -48,11 +49,14 @@ public class TestInsertBeforeForbidden extends
OMDOMTestCase {
}
Document document = (Document) omDocument;
Comment comment = (Comment) document.getFirstChild();
- try {
- document.insertBefore(document.createElementNS(null, "test"),
comment);
- fail("Expected DOMException");
- } catch (DOMException ex) {
- assertThat(ex.code).isEqualTo(DOMException.HIERARCHY_REQUEST_ERR);
- }
+ assertThatThrownBy(
+ () ->
+ document.insertBefore(
+ document.createElementNS(null,
"test"), comment))
+ .isInstanceOf(DOMException.class)
+ .satisfies(
+ e ->
+ assertThat(((DOMException) e).code)
+
.isEqualTo(DOMException.HIERARCHY_REQUEST_ERR));
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
index f383dc89a..e137577c4 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.mime.ContentType;
@@ -105,16 +107,14 @@ public class
TestCreateSOAPModelBuilderMTOMContentTypeMismatch extends SOAPTestC
mp.writeTo(out);
out.close();
// Now attempt to create an Axiom builder
- try {
- OMXMLBuilderFactory.createSOAPModelBuilder(
- metaFactory,
- MultipartBody.builder()
- .setInputStream(blob.getInputStream())
- .setContentType(contentType)
- .build());
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ OMXMLBuilderFactory.createSOAPModelBuilder(
+ metaFactory,
+ MultipartBody.builder()
+
.setInputStream(blob.getInputStream())
+ .setContentType(contentType)
+ .build()))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
index ccc65f2c5..55687cba1 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
@@ -22,6 +22,8 @@ import java.io.StringReader;
import javax.xml.stream.XMLStreamReader;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.util.StAXUtils;
@@ -45,14 +47,14 @@ public class TestDTD extends SOAPTestCase {
String message = "<!DOCTYPE test []>" +
soapFactory.getDefaultEnvelope();
XMLStreamReader parser = StAXUtils.createXMLStreamReader(new
StringReader(message));
;
- try {
- SOAPModelBuilder builder =
-
OMXMLBuilderFactory.createStAXSOAPModelBuilder(metaFactory, parser);
- // The processing must fail before we can get the SOAPEnvelope
- builder.getSOAPEnvelope();
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () -> {
+ SOAPModelBuilder builder =
+
OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+ metaFactory, parser);
+ // The processing must fail before we can get the
SOAPEnvelope
+ builder.getSOAPEnvelope();
+ })
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
index 2189682a4..17395cfed 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
@@ -20,6 +20,8 @@ package org.apache.axiom.ts.soap.envelope;
import javax.xml.namespace.QName;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -51,12 +53,8 @@ public class TestAddElementAfterBody extends SOAPTestCase {
if (spec.isAllowsElementsAfterBody()) {
env.addChild(elem);
} else {
- try {
- env.addChild(elem);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // expected
- }
+ assertThatThrownBy(() -> env.addChild(elem))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
index 3474fa841..df3dd02f9 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.fault;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -41,11 +43,7 @@ public class TestWrongParent1 extends SOAPTestCase {
protected void runTest() throws Throwable {
SOAPFaultCode parent = soapFactory.createSOAPFaultCode();
SOAPFault fault = soapFactory.createSOAPFault();
- try {
- parent.addChild(fault);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> parent.addChild(fault))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
index b06064a6c..e847ddc12 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.fault;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -42,11 +44,7 @@ public class TestWrongParent2 extends SOAPTestCase {
SOAPEnvelope parent = soapFactory.createSOAPEnvelope();
OMElement child1 = soapFactory.createSOAPHeader(parent);
SOAPFault fault = soapFactory.createSOAPFault();
- try {
- child1.insertSiblingAfter(fault);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> child1.insertSiblingAfter(fault))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
index de6914b34..8900e58b3 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.fault;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -44,11 +46,7 @@ public class TestWrongParent3 extends SOAPTestCase {
soapFactory.createSOAPHeaderBlock(
"child1", soapFactory.createOMNamespace("urn:test",
"p"), parent);
SOAPFault fault = soapFactory.createSOAPFault();
- try {
- child1.insertSiblingBefore(fault);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> child1.insertSiblingBefore(fault))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
index a2b0ef5ef..1a01c8cd3 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
@@ -20,6 +20,8 @@ package org.apache.axiom.ts.soap.header;
import javax.xml.namespace.QName;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -40,11 +42,7 @@ public class TestAddHeaderBlockFromQNameWithoutNamespace
extends SOAPTestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPHeader header = soapFactory.createSOAPHeader(envelope);
- try {
- header.addHeaderBlock(new QName("test"));
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> header.addHeaderBlock(new QName("test")))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
index a98538a08..730a58e92 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.header;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -39,11 +41,7 @@ public class TestAddHeaderBlockWithoutNamespace1 extends
SOAPTestCase {
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPHeader header = soapFactory.createSOAPHeader(envelope);
- try {
- header.addHeaderBlock("test", null);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> header.addHeaderBlock("test", null))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
index 64a3b10b2..f3e870c08 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.header;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
@@ -40,11 +42,6 @@ public class TestAddHeaderBlockWithoutNamespace2 extends
SOAPTestCase {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPHeader header = soapFactory.createSOAPHeader(envelope);
OMNamespace ns = soapFactory.createOMNamespace("", "");
- try {
- header.addHeaderBlock("test", ns);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> header.addHeaderBlock("test",
ns)).isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
index 77e10b20b..fe97f52ca 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.headerblock;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -51,11 +53,11 @@ public class TestGetBooleanAttributeInvalid extends
BooleanAttributeTestCase {
SOAPHeader header =
soapFactory.getDefaultEnvelope().getOrCreateHeader();
SOAPHeaderBlock headerBlock = header.addHeaderBlock(new
QName("urn:test", "test", "p"));
headerBlock.addAttribute(attribute.getName(spec), value,
header.getNamespace());
- try {
-
attribute.getAdapter(BooleanAttributeAccessor.class).getValue(headerBlock);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ attribute
+
.getAdapter(BooleanAttributeAccessor.class)
+ .getValue(headerBlock))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
index 16020e185..1973f6280 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.headerblock;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -41,11 +43,11 @@ public class TestGetBooleanAttributeUnspported extends
BooleanAttributeTestCase
protected void runTest() throws Throwable {
SOAPHeader header =
soapFactory.getDefaultEnvelope().getOrCreateHeader();
SOAPHeaderBlock headerBlock = header.addHeaderBlock(new
QName("urn:test", "test", "p"));
- try {
-
attribute.getAdapter(BooleanAttributeAccessor.class).getValue(headerBlock);
- fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ attribute
+
.getAdapter(BooleanAttributeAccessor.class)
+ .getValue(headerBlock))
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
index 2eb623d50..61fd088b8 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.headerblock;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
@@ -37,11 +39,11 @@ public class TestSetBooleanAttributeUnsupported extends
BooleanAttributeTestCase
protected void runTest() throws Throwable {
SOAPHeader header =
soapFactory.getDefaultEnvelope().getOrCreateHeader();
SOAPHeaderBlock headerBlock = header.addHeaderBlock(new
QName("urn:test", "test", "p"));
- try {
-
attribute.getAdapter(BooleanAttributeAccessor.class).setValue(headerBlock,
true);
- fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+ attribute
+
.getAdapter(BooleanAttributeAccessor.class)
+ .setValue(headerBlock, true))
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
index 1e853dd38..4b8b5aff9 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.headerblock;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -43,11 +45,6 @@ public class TestWrongParent1 extends SOAPTestCase {
SOAPHeaderBlock hb =
soapFactory.createSOAPHeaderBlock(
"MyHeader", soapFactory.createOMNamespace("urn:test",
"p"));
- try {
- parent.addChild(hb);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() ->
parent.addChild(hb)).isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
index 307035470..a0b72f770 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.headerblock;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -44,11 +46,7 @@ public class TestWrongParent2 extends SOAPTestCase {
SOAPHeaderBlock hb =
soapFactory.createSOAPHeaderBlock(
"MyHeader", soapFactory.createOMNamespace("urn:test",
"p"));
- try {
- child1.insertSiblingAfter(hb);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> child1.insertSiblingAfter(hb))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
index dc04363d3..d2cf8ef3b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.headerblock;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -44,11 +46,7 @@ public class TestWrongParent3 extends SOAPTestCase {
SOAPHeaderBlock hb =
soapFactory.createSOAPHeaderBlock(
"MyHeader", soapFactory.createOMNamespace("urn:test",
"p"));
- try {
- child1.insertSiblingBefore(hb);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> child1.insertSiblingBefore(hb))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
index dc5002495..cad758c50 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
@@ -20,6 +20,8 @@ package org.apache.axiom.ts.soap.message;
import javax.xml.namespace.QName;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -43,11 +45,7 @@ public class TestSetOMDocumentElementNonSOAPEnvelope extends
SOAPTestCase {
protected void runTest() throws Throwable {
SOAPMessage message = soapFactory.createSOAPMessage();
OMElement element = soapFactory.createOMElement(new QName("test"));
- try {
- message.setOMDocumentElement(element);
- fail("Expected OMException");
- } catch (OMException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> message.setOMDocumentElement(element))
+ .isInstanceOf(OMException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
index 75fb13127..bafa1d99a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.misc;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -37,11 +39,7 @@ public class TestSetChildVersionMismatch extends
GetSetChildTestCase {
@Override
protected void runTest(OMElement parent, SOAPElementTypeAdapter adapter) {
OMElement child = adapter.create(altSoapFactory);
- try {
- adapter.getSetter().invoke(parent, child);
- fail("Expected SOAPProcessingException");
- } catch (SOAPProcessingException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> adapter.getSetter().invoke(parent, child))
+ .isInstanceOf(SOAPProcessingException.class);
}
}
