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 19cead0cd Replace assertConsumed with AssertJ assertion on
getFirstOMChild
19cead0cd is described below
commit 19cead0cd6b4d716aee43991cf430113a9bd1041
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 14 14:24:01 2026 +0000
Replace assertConsumed with AssertJ assertion on getFirstOMChild
Replace the custom assertConsumed helper in AxiomTestCase with idiomatic
AssertJ assertThatThrownBy assertions that verify getFirstOMChild throws
NodeUnavailableException on consumed nodes.
Remove assertConsumed and its unused imports from AxiomTestCase.
---
.../src/main/java/org/apache/axiom/ts/AxiomTestCase.java | 14 --------------
.../org/apache/axiom/ts/om/container/TestSerialize.java | 6 ++++--
.../axiom/ts/om/document/TestSerializeAndConsume.java | 5 ++++-
.../TestSerializeAndConsumeWithIncompleteDescendant.java | 5 ++++-
.../TestSerializeAndConsumeWithIncompleteDescendant.java | 6 +++++-
5 files changed, 17 insertions(+), 19 deletions(-)
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
index cab547a77..30e488fda 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
@@ -20,12 +20,10 @@ package org.apache.axiom.ts;
import javax.xml.stream.XMLInputFactory;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.apache.axiom.util.stax.dialect.StAXDialect;
-import org.apache.commons.io.output.NullOutputStream;
public abstract class AxiomTestCase extends MatrixTestCase {
public static final StAXParserConfiguration TEST_PARSER_CONFIGURATION =
@@ -50,16 +48,4 @@ public abstract class AxiomTestCase extends MatrixTestCase {
public AxiomTestCase(OMMetaFactory metaFactory) {
this.metaFactory = metaFactory;
}
-
- protected void assertConsumed(OMContainer container) {
- assertFalse("Expected the node to be incomplete",
container.isComplete());
- boolean isConsumed;
- try {
- container.serialize(NullOutputStream.INSTANCE);
- isConsumed = false;
- } catch (Exception ex) {
- isConsumed = true;
- }
- assertTrue(isConsumed);
- }
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
index 159f73ae9..712e8e606 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
@@ -20,12 +20,14 @@ package org.apache.axiom.ts.om.container;
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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URL;
+import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
@@ -84,9 +86,9 @@ public class TestSerialize extends ConformanceTestCase {
if (serializationStrategy.isCaching()) {
assertTrue(container.isComplete());
} else {
- // TODO: need to investigate why assertConsumed is not working
here
assertFalse(container.isComplete());
- // assertConsumed(element);
+ assertThatThrownBy(container::getFirstOMChild)
+ .isInstanceOf(NodeUnavailableException.class);
}
} finally {
builder.close();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
index 67f125d72..e2e7d06f1 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
@@ -18,8 +18,11 @@
*/
package org.apache.axiom.ts.om.document;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
+import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -45,6 +48,6 @@ public class TestSerializeAndConsume extends AxiomTestCase {
OMXMLBuilderFactory.createOMBuilder(factory, new
StringReader("<elem>text</elem>"))
.getDocument();
document.serializeAndConsume(NullOutputStream.INSTANCE);
- assertConsumed(document);
+
assertThatThrownBy(document::getFirstOMChild).isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java
index fdd8aef46..35819f6cf 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsumeWithIncompleteDescendant.java
@@ -20,10 +20,12 @@ package org.apache.axiom.ts.om.document;
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;
import java.io.StringWriter;
+import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -55,6 +57,7 @@ public class TestSerializeAndConsumeWithIncompleteDescendant
extends AxiomTestCa
StringWriter out = new StringWriter();
document.serializeAndConsume(out);
assertAbout(xml()).that(out.toString()).hasSameContentAs("<root><elem>text</elem></root>");
- assertConsumed(incompleteElement);
+ assertThatThrownBy(incompleteElement::getFirstOMChild)
+ .isInstanceOf(NodeUnavailableException.class);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
index 1bcf25e56..73b4af7ca 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeWithIncompleteDescendant.java
@@ -18,9 +18,12 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.StringReader;
import java.io.StringWriter;
+import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -51,6 +54,7 @@ public class TestSerializeAndConsumeWithIncompleteDescendant
extends AxiomTestCa
StringWriter out = new StringWriter();
root.serializeAndConsume(out);
assertEquals("<root><child><elem>text</elem></child></root>",
out.toString());
- assertConsumed(incompleteElement);
+ assertThatThrownBy(incompleteElement::getFirstOMChild)
+ .isInstanceOf(NodeUnavailableException.class);
}
}
