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 18594e473 Use StringUtils.countMatches and AssertJ in
TestDeclareDefaultNamespace1/2
18594e473 is described below
commit 18594e4738a0b13d0b1339a51213c1fb30862e3a
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 14 11:21:57 2026 +0000
Use StringUtils.countMatches and AssertJ in TestDeclareDefaultNamespace1/2
---
pom.xml | 5 +++++
testing/axiom-testsuite/pom.xml | 4 ++++
.../src/main/java/org/apache/axiom/ts/AxiomTestCase.java | 10 ----------
.../axiom/ts/om/element/TestDeclareDefaultNamespace1.java | 13 +++++++++----
.../axiom/ts/om/element/TestDeclareDefaultNamespace2.java | 15 +++++++++++----
5 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 292d0da9a..7444d20e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,6 +455,11 @@
<artifactId>commons-codec</artifactId>
<version>1.21.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.17.0</version>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/testing/axiom-testsuite/pom.xml b/testing/axiom-testsuite/pom.xml
index 80ba2d31a..a3d0e1af2 100644
--- a/testing/axiom-testsuite/pom.xml
+++ b/testing/axiom-testsuite/pom.xml
@@ -112,6 +112,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
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 b475636a1..cab547a77 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
@@ -62,14 +62,4 @@ public abstract class AxiomTestCase extends MatrixTestCase {
}
assertTrue(isConsumed);
}
-
- protected static int getNumberOfOccurrences(String xml, String pattern) {
- int index = -1;
- int count = 0;
- while ((index = xml.indexOf(pattern, index + 1)) != -1) {
- count++;
- }
-
- return count;
- }
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace1.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace1.java
index 8fdf2136b..0ad471122 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace1.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace1.java
@@ -18,6 +18,10 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.commons.lang3.StringUtils;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -49,9 +53,10 @@ public class TestDeclareDefaultNamespace1 extends
AxiomTestCase {
omFac.createOMElement(
"ChildElementTwo",
omFac.createOMNamespace("http://one.org";, ""), childOne);
- assertEquals(
- 2,
- getNumberOfOccurrences(
- documentElement.toStringWithConsume(),
"xmlns=\"http://one.org\"";));
+ assertThat(documentElement.toStringWithConsume())
+ .satisfies(
+ s ->
+ assertThat(StringUtils.countMatches(s,
"xmlns=\"http://one.org\"";))
+ .isEqualTo(2));
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace2.java
index b43bc63d5..bfea9dfe3 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareDefaultNamespace2.java
@@ -18,6 +18,10 @@
*/
package org.apache.axiom.ts.om.element;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.commons.lang3.StringUtils;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -46,9 +50,12 @@ public class TestDeclareDefaultNamespace2 extends
AxiomTestCase {
OMElement childTwo = omFac.createOMElement("ChildElementTwo", ns1,
childOne);
- assertEquals(
- 1,
- getNumberOfOccurrences(
- documentElement.toStringWithConsume(),
"xmlns:ns2=\"http://one.org\"";));
+ assertThat(documentElement.toStringWithConsume())
+ .satisfies(
+ s ->
+ assertThat(
+ StringUtils.countMatches(
+ s,
"xmlns:ns2=\"http://one.org\"";))
+ .isEqualTo(1));
}
}
