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 5599b76f0 Replace getChildrenCount helper with plain AssertJ assertions
5599b76f0 is described below
commit 5599b76f07a7d05660216fd395eb191813ca262c
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 14 09:35:37 2026 +0000
Replace getChildrenCount helper with plain AssertJ assertions
---
.../src/main/java/org/apache/axiom/ts/AxiomTestCase.java | 12 ------------
.../axiom/ts/om/element/TestGetChildrenWithName2.java | 13 ++++++-------
.../axiom/ts/om/element/TestGetChildrenWithName4.java | 16 ++++++++--------
3 files changed, 14 insertions(+), 27 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 6ad3f8441..b475636a1 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
@@ -18,8 +18,6 @@
*/
package org.apache.axiom.ts;
-import java.util.Iterator;
-
import javax.xml.stream.XMLInputFactory;
import org.apache.axiom.om.OMContainer;
@@ -65,16 +63,6 @@ public abstract class AxiomTestCase extends MatrixTestCase {
assertTrue(isConsumed);
}
- protected static int getChildrenCount(Iterator<?> childrenIter) {
- int childCount = 0;
- while (childrenIter.hasNext()) {
- childrenIter.next();
- childCount++;
- }
-
- return childCount;
- }
-
protected static int getNumberOfOccurrences(String xml, String pattern) {
int index = -1;
int count = 0;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java
index b7a076c47..d68c39e40 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName2.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import java.util.Iterator;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
@@ -43,11 +43,10 @@ public class TestGetChildrenWithName2 extends AxiomTestCase
{
OMElement e = factory.createOMElement("Employee", testNamespace,
documentElement);
e.setText("Apache Developer");
- Iterator<OMElement> childrenIter =
- documentElement.getChildrenWithName(
- new QName("http://test.ws.org";, "Employee", "test"));
-
- int childCount = getChildrenCount(childrenIter);
- assertEquals("Iterator must return 1 child with the given qname",
childCount, 1);
+ assertThat(
+ documentElement.getChildrenWithName(
+ new QName("http://test.ws.org";, "Employee",
"test")))
+ .toIterable()
+ .hasSize(1);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
index 60db594c6..e3835210a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
@@ -51,33 +51,33 @@ public class TestGetChildrenWithName4 extends AxiomTestCase
{
// Test for fully qualified names
QName qName = new QName(NS_A, "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(1);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().hasSize(1);
qName = new QName(NS_B, "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(1);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().hasSize(1);
qName = new QName(NS_C, "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(0);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().isEmpty();
// Test for QName with no namespace.
// Axiom 1.2.x implemented a legacy behavior where an empty namespace
URI was interpreted
// as a wildcard (see AXIOM-11). In Axiom 1.3.x, the matching is
always strict.
qName = new QName("", "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(0);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().isEmpty();
// Now add an unqualified sample element to the documentElement
factory.createOMElement("sample", null, documentElement);
// Repeat the tests
qName = new QName(NS_A, "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(1);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().hasSize(1);
qName = new QName(NS_B, "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(1);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().hasSize(1);
qName = new QName(NS_C, "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(0);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().isEmpty();
// Since there actually is an unqualified element child, the most
accurate
// interpretation of getChildrenWithName should be to return this one
// child
qName = new QName("", "sample");
-
assertThat(getChildrenCount(documentElement.getChildrenWithName(qName))).isEqualTo(1);
+
assertThat(documentElement.getChildrenWithName(qName)).toIterable().hasSize(1);
}
}
