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 35f1bfea3 Use assertj's assertThatThrownBy to assert exceptions in
tests
35f1bfea3 is described below
commit 35f1bfea355adc7691ad594ca474144d7d8fd8a7
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun May 10 16:22:31 2026 +0100
Use assertj's assertThatThrownBy to assert exceptions in tests
---
.../stax/dialect/TestNextAfterEndDocument.java | 18 +++-----
.../axiom/om/ds/jaxb/JAXBOMDataSourceTest.java | 17 ++++----
.../axiom/blob/suite/TestWriteAfterCommit.java | 51 ++++++++--------------
systests/old-tests/pom.xml | 5 +++
.../java/org/apache/axiom/om/OMCachingTest.java | 28 +++++-------
.../apache/axiom/ts/om/SetNamespaceTestCase.java | 17 +++-----
.../ts/om/element/TestGetChildrenRemove1.java | 9 ++--
.../ts/om/element/TestGetChildrenRemove2.java | 9 ++--
.../axiom/ts/om/sourcedelement/TestSerialize.java | 19 ++++----
.../apache/axiom/ts/soap/builder/BadInputTest.java | 29 ++++++------
.../CreateSOAPElementWithoutParentTestCase.java | 10 ++---
.../factory/TestCreateSOAPElementWithParent.java | 14 +++---
.../axiom/ts/soap/headerblock/TestSetRole.java | 6 +--
.../apache/axiom/ts/soap11/fault/TestSetNode.java | 11 ++---
.../soap11/faultreason/TestGetFirstSOAPText.java | 11 ++---
.../apache/axiom/ts/soap12/fault/TestSetNode.java | 11 ++---
.../TestAddSOAPTextWithSOAPVersionMismatch.java | 13 +++---
17 files changed, 117 insertions(+), 161 deletions(-)
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestNextAfterEndDocument.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestNextAfterEndDocument.java
index cd5d32977..c6916583e 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestNextAfterEndDocument.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestNextAfterEndDocument.java
@@ -18,11 +18,13 @@
*/
package org.apache.axiom.util.stax.dialect;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import java.util.NoSuchElementException;
import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
/**
@@ -37,15 +39,9 @@ public class TestNextAfterEndDocument extends
DialectTestCase {
while (reader.next() != XMLStreamReader.END_DOCUMENT) {
// Just loop
}
- try {
- reader.next();
- fail("Expected exception");
- } catch (IllegalStateException ex) {
- // Expected
- } catch (NoSuchElementException ex) {
- // This is also OK
- } catch (XMLStreamException ex) {
- fail("Expected IllegalStateException or NoSuchElementException");
- }
+ assertThatThrownBy(() -> reader.next())
+ .satisfiesAnyOf(
+ e ->
assertThat(e).isInstanceOf(IllegalStateException.class),
+ e ->
assertThat(e).isInstanceOf(NoSuchElementException.class));
}
}
diff --git
a/axiom-jakarta-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
b/axiom-jakarta-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
index 13d749cdd..78a4e1217 100644
---
a/axiom-jakarta-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
+++
b/axiom-jakarta-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
@@ -19,7 +19,8 @@
package org.apache.axiom.om.ds.jaxb;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -183,14 +184,12 @@ public class JAXBOMDataSourceTest {
object.setId("test");
OMSourcedElement element = omFactory.createOMElement(new
JAXBOMDataSource(context, object));
XMLStreamException exception = new XMLStreamException("TEST");
- try {
- element.serialize(
- new ExceptionXMLStreamWriterWrapper(
- StAX.createNullXMLStreamWriter(), exception));
- fail("Expected XMLStreamException");
- } catch (XMLStreamException ex) {
- assertThat(ex).isSameAs(exception);
- }
+ assertThatThrownBy(
+ () ->
+ element.serialize(
+ new ExceptionXMLStreamWriterWrapper(
+
StAX.createNullXMLStreamWriter(), exception)))
+ .isSameAs(exception);
}
/**
diff --git
a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java
b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java
index 97784a954..f7cd98d62 100644
---
a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java
+++
b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java
@@ -18,6 +18,9 @@
*/
package org.apache.axiom.blob.suite;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -38,39 +41,23 @@ public class TestWriteAfterCommit extends
WritableBlobTestCase {
protected void runTest(WritableBlob blob) throws Throwable {
OutputStream out = blob.getOutputStream();
out.close();
- try {
- out.write(new byte[10]);
- fail("Expected exception");
- } catch (IllegalStateException ex) {
- // OK
- } catch (IOException ex) {
- // OK
- }
- try {
- out.write(new byte[10], 3, 5);
- fail("Expected exception");
- } catch (IllegalStateException ex) {
- // OK
- } catch (IOException ex) {
- // OK
- }
- try {
- out.write(0);
- fail("Expected exception");
- } catch (IllegalStateException ex) {
- // OK
- } catch (IOException ex) {
- // OK
- }
+ assertThatThrownBy(() -> out.write(new byte[10]))
+ .satisfiesAnyOf(
+ e ->
assertThat(e).isInstanceOf(IllegalStateException.class),
+ e -> assertThat(e).isInstanceOf(IOException.class));
+ assertThatThrownBy(() -> out.write(new byte[10], 3, 5))
+ .satisfiesAnyOf(
+ e ->
assertThat(e).isInstanceOf(IllegalStateException.class),
+ e -> assertThat(e).isInstanceOf(IOException.class));
+ assertThatThrownBy(() -> out.write(0))
+ .satisfiesAnyOf(
+ e ->
assertThat(e).isInstanceOf(IllegalStateException.class),
+ e -> assertThat(e).isInstanceOf(IOException.class));
if (out instanceof ReadFromSupport readFromSupport) {
- try {
- readFromSupport.readFrom(new NullInputStream(10), -1);
- fail("Expected exception");
- } catch (IllegalStateException ex) {
- // OK
- } catch (IOException ex) {
- // OK
- }
+ assertThatThrownBy(() -> readFromSupport.readFrom(new
NullInputStream(10), -1))
+ .satisfiesAnyOf(
+ e ->
assertThat(e).isInstanceOf(IllegalStateException.class),
+ e ->
assertThat(e).isInstanceOf(IOException.class));
}
}
}
diff --git a/systests/old-tests/pom.xml b/systests/old-tests/pom.xml
index 3631bb39f..8c0be2033 100644
--- a/systests/old-tests/pom.xml
+++ b/systests/old-tests/pom.xml
@@ -72,6 +72,11 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xml-truth</artifactId>
diff --git
a/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
b/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
index 39af41d31..f03c0de53 100644
--- a/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
+++ b/systests/old-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
@@ -19,6 +19,8 @@
package org.apache.axiom.om;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import javax.xml.stream.XMLStreamException;
import org.apache.axiom.ts.soap.SOAPSpec;
@@ -30,25 +32,15 @@ public class OMCachingTest extends TestCase {
/** This will first serialize the element without caching. Then it tries
to serialize again . */
public void testCachingOne() throws Exception {
- OMElement documentElement = null;
- try {
- // first build the OM tree without caching and see whether up can
cosume it again
- OMXMLParserWrapper builder =
- OMXMLBuilderFactory.createOMBuilder(
-
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
- documentElement = builder.getDocumentElement();
- String envelopeString = documentElement.toStringWithConsume();
- } catch (XMLStreamException e) {
- e.printStackTrace(); // To change body of catch statement use File
| Settings |
- // File Templates.
- }
+ // first build the OM tree without caching and see whether up can
cosume it again
+ OMXMLParserWrapper builder =
+ OMXMLBuilderFactory.createOMBuilder(
+
SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
+ OMElement documentElement = builder.getDocumentElement();
+ String envelopeString = documentElement.toStringWithConsume();
- try {
- String envelopeString = documentElement.toStringWithConsume();
- fail("Parser should fail as its already being accessed without
caching");
- } catch (NodeUnavailableException e) {
- assertTrue(true);
- }
+ assertThatThrownBy(() -> documentElement.toStringWithConsume())
+ .isInstanceOf(NodeUnavailableException.class);
documentElement.close(false);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
index dfa47c4e4..20065d735 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/SetNamespaceTestCase.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -113,17 +115,12 @@ public abstract class SetNamespaceTestCase extends
AxiomTestCase {
params.namespaceURI() == null
? null
: factory.createOMNamespace(params.namespaceURI(),
params.prefix());
- try {
+ if (params.invalid()) {
+ assertThatThrownBy(() -> setNamespace(node, ns))
+ .isInstanceOf(IllegalArgumentException.class);
+ return;
+ } else {
setNamespace(node, ns);
- if (params.invalid()) {
- fail("Expected IllegalArgumentException");
- }
- } catch (IllegalArgumentException ex) {
- if (params.invalid()) {
- return;
- } else {
- throw ex;
- }
}
String expectedPrefix;
if (params.expectedPrefix() == null) {
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
index 2bb5603e7..d85161317 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.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 java.util.Iterator;
@@ -46,12 +48,7 @@ public class TestGetChildrenRemove1 extends AxiomTestCase {
Iterator<OMNode> iter = elt.getChildren();
// this is supposed to throw an illegal state exception
- try {
- iter.remove();
- fail("remove should throw an exception");
- } catch (IllegalStateException e) {
- // ok. this is what should happen
- }
+ assertThatThrownBy(() ->
iter.remove()).isInstanceOf(IllegalStateException.class);
elt.close(false);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
index 6dd471c49..67f8b0c2c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.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 java.util.Iterator;
@@ -50,12 +52,7 @@ public class TestGetChildrenRemove2 extends AxiomTestCase {
iter.remove();
// this call must generate an exception
- try {
- iter.remove();
- fail("calling remove twice without a call to next is prohibited");
- } catch (IllegalStateException e) {
- // ok if we come here :)
- }
+ assertThatThrownBy(() ->
iter.remove()).isInstanceOf(IllegalStateException.class);
elt.close(false);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
index e646a7b05..2d76ca7c6 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.om.sourcedelement;
import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.StringReader;
@@ -107,17 +108,15 @@ public class TestSerialize extends AxiomTestCase {
&&
!serializationStrategy.isCaching()
&& !parentComplete);
XML result;
- try {
+ if (expectException) {
+ assertThatThrownBy(
+ () ->
+ serializationStrategy.serialize(
+ serializeParent ? parent :
element))
+ .isInstanceOf(Exception.class);
+ continue;
+ } else {
result = serializationStrategy.serialize(serializeParent ?
parent : element);
- if (expectException) {
- fail("Expected exception");
- }
- } catch (Exception ex) {
- if (!expectException) {
- throw ex;
- } else {
- continue;
- }
}
InputSource expectedXML =
new InputSource(new
StringReader(TestDocument.DOCUMENT1.getContent()));
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
index bdd5d3f63..b5c987754 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
@@ -19,6 +19,8 @@
package org.apache.axiom.ts.soap.builder;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.axiom.om.OMMetaFactory;
@@ -38,19 +40,18 @@ public class BadInputTest extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
- try {
- SOAPEnvelope soapEnvelope =
- OMXMLBuilderFactory.createSOAPModelBuilder(
- metaFactory,
- BadInputTest.class
- .getClassLoader()
- .getResourceAsStream("badsoap/" +
file),
- null)
- .getSOAPEnvelope();
- OMTestUtils.walkThrough(soapEnvelope);
- fail("this must failed gracefully with SOAPProcessingException");
- } catch (SOAPProcessingException e) {
- return;
- }
+ assertThatThrownBy(
+ () -> {
+ SOAPEnvelope soapEnvelope =
+ OMXMLBuilderFactory.createSOAPModelBuilder(
+ metaFactory,
+ BadInputTest.class
+ .getClassLoader()
+
.getResourceAsStream("badsoap/" + file),
+ null)
+ .getSOAPEnvelope();
+ OMTestUtils.walkThrough(soapEnvelope);
+ })
+ .isInstanceOf(SOAPProcessingException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
index 8861fc741..dae1abd23 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -43,12 +45,8 @@ public abstract class CreateSOAPElementWithoutParentTestCase
extends SOAPTestCas
protected final void runTest() throws Throwable {
QName expectedName = type.getQName(spec);
if (expectedName == null) {
- try {
- createSOAPElement();
- fail("Expect UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(() -> createSOAPElement())
+ .isInstanceOf(UnsupportedOperationException.class);
} else {
String expectedPrefix =
expectedName.getNamespaceURI().length() == 0
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
index 000022dfd..62ffd747a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap.factory;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
import javax.xml.namespace.QName;
@@ -70,13 +72,11 @@ public class TestCreateSOAPElementWithParent extends
SOAPTestCase {
OMElement parent =
parentType.getAdapter(SOAPElementTypeAdapter.class).create(soapFactory);
QName expectedName = type.getQName(spec);
if (expectedName == null) {
- try {
- type.getAdapter(SOAPElementTypeAdapter.class)
- .create(soapFactory, parentType, parent);
- fail("Expect UnsupportedOperationException");
- } catch (UnsupportedOperationException ex) {
- // Expected
- }
+ assertThatThrownBy(
+ () ->
+
type.getAdapter(SOAPElementTypeAdapter.class)
+ .create(soapFactory, parentType,
parent))
+ .isInstanceOf(UnsupportedOperationException.class);
} else {
String expectedPrefix =
expectedName.getNamespaceURI().length() == 0
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
index ff2e13d90..53e0d201f 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
@@ -38,10 +38,6 @@ public class TestSetRole extends SOAPTestCase {
"SOAP HeaderBlock Test : - After calling setRole method,
getRole method returns incorrect role value",
"http://example.org/my-role";,
soapHeaderBlock.getRole());
- try {
- soapHeaderBlock.setRole("Any Value");
- } catch (Exception e) {
- fail("SOAP HeaderBlock Test : - role value can not be set to any
value");
- }
+ soapHeaderBlock.setRole("Any Value");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
index 005e5742d..e4b258b71 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap11.fault;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import com.google.inject.Inject;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -33,12 +35,7 @@ public class TestSetNode extends SOAPTestCase {
@Override
protected void runTest() throws Throwable {
SOAPFault soapFault = soapFactory.createSOAPFault();
- try {
- soapFault.setNode(soapFactory.createSOAPFaultNode(soapFault));
- } catch (UnsupportedOperationException e) {
- // Exactly!
- return;
- }
- fail("Didn't get UnsupportedOperationException");
+ assertThatThrownBy(() ->
soapFault.setNode(soapFactory.createSOAPFaultNode(soapFault)))
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
index 987beb94b..363b3cd37 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap11.faultreason;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import com.google.inject.Inject;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -35,12 +37,7 @@ public class TestGetFirstSOAPText extends SOAPTestCase {
protected void runTest() throws Throwable {
SOAPFault fault = soapFactory.createSOAPFault();
SOAPFaultReason faultReason = soapFactory.createSOAPFaultReason(fault);
- try {
- faultReason.getFirstSOAPText();
- } catch (UnsupportedOperationException e) {
- // Cool, continue.
- return;
- }
- fail("Didn't get expected Exception for getFirstSOAPText()!");
+ assertThatThrownBy(() -> faultReason.getFirstSOAPText())
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
index 5b77aefc3..45a9cf4c4 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap12.fault;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import com.google.inject.Inject;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAP12Constants;
@@ -42,12 +44,7 @@ public class TestSetNode extends SOAPTestCase {
"SOAP 1.2 Fault Test:- Fault node local name mismatch",
SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME,
soapFault.getNode().getLocalName());
- try {
- soapFault.setNode(altSoapFactory.createSOAPFaultNode());
- fail("SOAP11FaultNode should nott be set in to a SOAP12Fault");
-
- } catch (Exception e) {
- assertTrue(true);
- }
+ assertThatThrownBy(() ->
soapFault.setNode(altSoapFactory.createSOAPFaultNode()))
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
index 36196e86b..6359db6ed 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.soap12.faultreason;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import com.google.inject.Inject;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -37,11 +39,10 @@ public class TestAddSOAPTextWithSOAPVersionMismatch extends
SOAPTestCase {
SOAPFaultReason soap12FaultReason =
soapFactory.createSOAPFaultReason(soap12Fault);
SOAPFault soap11Fault = altSoapFactory.createSOAPFault();
SOAPFaultReason soap11FaultReason =
altSoapFactory.createSOAPFaultReason(soap11Fault);
- try {
-
soap12FaultReason.addSOAPText(altSoapFactory.createSOAPFaultText(soap11FaultReason));
- fail("SOAP11FaultText should not be added to SOAP12FaultReason");
- } catch (Exception e) {
- assertTrue(true);
- }
+ assertThatThrownBy(
+ () ->
+ soap12FaultReason.addSOAPText(
+
altSoapFactory.createSOAPFaultText(soap11FaultReason)))
+ .isInstanceOf(UnsupportedOperationException.class);
}
}
