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 f0b3e9ef6 Introduce Params record for element TestSerialization test
parameters
f0b3e9ef6 is described below
commit f0b3e9ef6392c04b7d331cd3791cc6fb28806228
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun Mar 22 20:21:51 2026 +0000
Introduce Params record for element TestSerialization test parameters
---
.../org/apache/axiom/ts/om/OMTestSuiteBuilder.java | 57 +------------------
.../axiom/ts/om/element/TestSerialization.java | 64 +++++++++++++++++-----
2 files changed, 54 insertions(+), 67 deletions(-)
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
index df0acc7b7..798797974 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
@@ -601,60 +601,9 @@ public class OMTestSuiteBuilder extends
MatrixTestSuiteBuilder {
metaFactory));
addTest(new
org.apache.axiom.ts.om.element.TestResolveQNameWithoutNamespace(metaFactory));
addTest(new
org.apache.axiom.ts.om.element.TestResolveQNameWithUnboundPrefix(metaFactory));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "D",
- "D",
- "<person
xmlns=\"urn:ns\"><name>John</name><age>34</age><weight>50</weight></person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "D",
- "U",
- "<person xmlns=\"urn:ns\"><name
xmlns=\"\">John</name><age xmlns=\"\">34</age><weight
xmlns=\"\">50</weight></person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "D",
- "Q",
- "<person xmlns=\"urn:ns\"><p:name
xmlns:p=\"urn:ns\">John</p:name><p:age xmlns:p=\"urn:ns\">34</p:age><p:weight
xmlns:p=\"urn:ns\">50</p:weight></person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "Q",
- "Q",
- "<p:person
xmlns:p=\"urn:ns\"><p:name>John</p:name><p:age>34</p:age><p:weight>50</p:weight></p:person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "Q",
- "U",
- "<p:person
xmlns:p=\"urn:ns\"><name>John</name><age>34</age><weight>50</weight></p:person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "Q",
- "D",
- "<p:person xmlns:p=\"urn:ns\"><name
xmlns=\"urn:ns\">John</name><age xmlns=\"urn:ns\">34</age><weight
xmlns=\"urn:ns\">50</weight></p:person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "U",
- "U",
-
"<person><name>John</name><age>34</age><weight>50</weight></person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "U",
- "Q",
- "<person><p:name
xmlns:p=\"urn:ns\">John</p:name><p:age xmlns:p=\"urn:ns\">34</p:age><p:weight
xmlns:p=\"urn:ns\">50</p:weight></person>"));
- addTest(
- new org.apache.axiom.ts.om.element.TestSerialization(
- metaFactory,
- "U",
- "D",
- "<person><name xmlns=\"urn:ns\">John</name><age
xmlns=\"urn:ns\">34</age><weight xmlns=\"urn:ns\">50</weight></person>"));
+ for (var params :
org.apache.axiom.ts.om.element.TestSerialization.PARAMS) {
+ addTest(new
org.apache.axiom.ts.om.element.TestSerialization(metaFactory, params));
+ }
addTest(
new
org.apache.axiom.ts.om.element.TestSerializationWithTwoNonBuiltOMElements(
metaFactory));
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
index 5f4a7374f..1df385f02 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.element;
+import com.google.common.collect.ImmutableList;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
@@ -47,18 +49,54 @@ public class TestSerialization extends AxiomTestCase {
private static final String NS = "urn:ns";
private static final String PREFIX = "p";
- private final String parent;
- private final String children;
- private final String expected;
+ public record Params(String parent, String children, String expected) {}
+
+ public static final ImmutableList<Params> PARAMS =
+ ImmutableList.of(
+ new Params(
+ "D",
+ "D",
+ "<person
xmlns=\"urn:ns\"><name>John</name><age>34</age><weight>50</weight></person>"),
+ new Params(
+ "D",
+ "U",
+ "<person xmlns=\"urn:ns\"><name
xmlns=\"\">John</name><age xmlns=\"\">34</age><weight
xmlns=\"\">50</weight></person>"),
+ new Params(
+ "D",
+ "Q",
+ "<person xmlns=\"urn:ns\"><p:name
xmlns:p=\"urn:ns\">John</p:name><p:age xmlns:p=\"urn:ns\">34</p:age><p:weight
xmlns:p=\"urn:ns\">50</p:weight></person>"),
+ new Params(
+ "Q",
+ "Q",
+ "<p:person
xmlns:p=\"urn:ns\"><p:name>John</p:name><p:age>34</p:age><p:weight>50</p:weight></p:person>"),
+ new Params(
+ "Q",
+ "U",
+ "<p:person
xmlns:p=\"urn:ns\"><name>John</name><age>34</age><weight>50</weight></p:person>"),
+ new Params(
+ "Q",
+ "D",
+ "<p:person xmlns:p=\"urn:ns\"><name
xmlns=\"urn:ns\">John</name><age xmlns=\"urn:ns\">34</age><weight
xmlns=\"urn:ns\">50</weight></p:person>"),
+ new Params(
+ "U",
+ "U",
+
"<person><name>John</name><age>34</age><weight>50</weight></person>"),
+ new Params(
+ "U",
+ "Q",
+ "<person><p:name
xmlns:p=\"urn:ns\">John</p:name><p:age xmlns:p=\"urn:ns\">34</p:age><p:weight
xmlns:p=\"urn:ns\">50</p:weight></person>"),
+ new Params(
+ "U",
+ "D",
+ "<person><name xmlns=\"urn:ns\">John</name><age
xmlns=\"urn:ns\">34</age><weight xmlns=\"urn:ns\">50</weight></person>"));
+
+ private final Params params;
- public TestSerialization(
- OMMetaFactory metaFactory, String parent, String children, String
expected) {
+ public TestSerialization(OMMetaFactory metaFactory, Params params) {
super(metaFactory);
- this.parent = parent;
- this.children = children;
- this.expected = expected;
- addTestParameter("parent", parent);
- addTestParameter("children", children);
+ this.params = params;
+ addTestParameter("parent", params.parent());
+ addTestParameter("children", params.children());
}
private static OMNamespace createNamespace(OMFactory factory, String type)
{
@@ -77,8 +115,8 @@ public class TestSerialization extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory fac = metaFactory.getOMFactory();
- OMNamespace nsParent = createNamespace(fac, parent);
- OMNamespace nsChildren = createNamespace(fac, children);
+ OMNamespace nsParent = createNamespace(fac, params.parent());
+ OMNamespace nsChildren = createNamespace(fac, params.children());
OMElement personElem = fac.createOMElement("person", nsParent);
OMElement nameElem = fac.createOMElement("name", nsChildren);
@@ -95,6 +133,6 @@ public class TestSerialization extends AxiomTestCase {
personElem.addChild(ageElem);
personElem.addChild(weightElem);
- assertEquals(expected, personElem.toString());
+ assertEquals(params.expected(), personElem.toString());
}
}
