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 f81768c25 Refactor TestSetNamespace: extract Params lists to static
fields
f81768c25 is described below
commit f81768c25693a1f9baa8447b3e7616ae3819f0b8
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 21 11:46:57 2026 +0000
Refactor TestSetNamespace: extract Params lists to static fields
Move the inline construction of Params instances for both
attribute.TestSetNamespace and element.TestSetNamespace out of
OMTestSuiteBuilder.addTests() into static ImmutableList<Params> PARAMS
fields on the respective TestSetNamespace classes. The builder now
simply iterates these lists.
---
.../org/apache/axiom/ts/om/OMTestSuiteBuilder.java | 158 +--------------------
.../axiom/ts/om/attribute/TestSetNamespace.java | 32 +++++
.../axiom/ts/om/element/TestSetNamespace.java | 27 ++++
3 files changed, 63 insertions(+), 154 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 f2dc41865..ddbd13dfe 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
@@ -81,89 +81,8 @@ public class OMTestSuiteBuilder extends
MatrixTestSuiteBuilder {
addTest(new
org.apache.axiom.ts.om.attribute.TestHasNameWithNamespace(metaFactory));
addTest(new
org.apache.axiom.ts.om.attribute.TestHasNameWithoutNamespace(metaFactory));
addTest(new
org.apache.axiom.ts.om.attribute.TestSetLocalName(metaFactory));
- for (int i = 0; i < 4; i++) {
- boolean declare = (i & 1) != 0;
- boolean owner = (i & 2) != 0;
- // Valid
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test",
- "p",
- declare,
- owner,
- null,
- false,
- "p",
- declare && owner)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test",
- null,
- declare,
- owner,
- null,
- false,
- null,
- declare && owner)));
- if (owner) {
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test", "p", declare, true, "p",
false, "p", false)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test", "p", declare, true, "q",
false, "p", declare)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test", null, declare, true, "p",
false, "p", false)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test",
- null,
- declare,
- true,
- "",
- false,
- null,
- declare)));
- }
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "", "", declare, owner, null, false, "",
false)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "", null, declare, owner, null, false, "",
false)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- null, null, declare, owner, null, false,
"", false)));
- // Invalid
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "urn:test", "", declare, owner, null,
true, null, false)));
- addTest(
- new org.apache.axiom.ts.om.attribute.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.attribute.TestSetNamespace.Params(
- "", "p", declare, owner, null, true, null,
false)));
+ for (var params :
org.apache.axiom.ts.om.attribute.TestSetNamespace.PARAMS) {
+ addTest(new
org.apache.axiom.ts.om.attribute.TestSetNamespace(metaFactory, params));
}
for (StreamType streamType : Multiton.getInstances(StreamType.class)) {
addTest(
@@ -761,77 +680,8 @@ public class OMTestSuiteBuilder extends
MatrixTestSuiteBuilder {
addTest(
new
org.apache.axiom.ts.om.element.TestSerializeAndConsumeWithIncompleteDescendant(
metaFactory));
- for (int i = 0; i < 3; i++) {
- Boolean declare = i == 0 ? null : Boolean.valueOf(i == 2);
- boolean implicitDeclare = declare == null ||
declare.booleanValue();
- // Valid
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", "p", declare, null, false,
"p", implicitDeclare)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test",
- null,
- declare,
- null,
- false,
- null,
- implicitDeclare)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", "p", declare, "p", false, "p",
false)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", "p", declare, "q", false, "p",
implicitDeclare)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", null, declare, "p", false,
"p", false)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", null, declare, "", false, "",
false)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", "", declare, null, false, "",
implicitDeclare)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "urn:test", "", declare, "", false, "",
false)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "", "", declare, null, false, "", false)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "", null, declare, null, false, "",
false)));
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- null, null, declare, null, false, "",
false)));
- // Invalid
- addTest(
- new org.apache.axiom.ts.om.element.TestSetNamespace(
- metaFactory,
- new
org.apache.axiom.ts.om.element.TestSetNamespace.Params(
- "", "p", declare, null, true, null,
false)));
+ for (var params :
org.apache.axiom.ts.om.element.TestSetNamespace.PARAMS) {
+ addTest(new
org.apache.axiom.ts.om.element.TestSetNamespace(metaFactory, params));
}
addTest(new org.apache.axiom.ts.om.element.TestSetText(metaFactory));
addTest(new
org.apache.axiom.ts.om.element.TestSetTextEmptyString(metaFactory));
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetNamespace.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetNamespace.java
index d1fef9b39..6c2abe5ee 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetNamespace.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestSetNamespace.java
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.attribute;
+import com.google.common.collect.ImmutableList;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -48,6 +50,36 @@ public class TestSetNamespace extends SetNamespaceTestCase {
boolean expectNSDecl)
implements SetNamespaceTestCase.Params {}
+ public static final ImmutableList<Params> PARAMS;
+
+ static {
+ ImmutableList.Builder<Params> builder = ImmutableList.builder();
+ for (int i = 0; i < 4; i++) {
+ boolean declare = (i & 1) != 0;
+ boolean owner = (i & 2) != 0;
+ // Valid
+ builder.add(
+ new Params(
+ "urn:test", "p", declare, owner, null, false, "p",
declare && owner));
+ builder.add(
+ new Params(
+ "urn:test", null, declare, owner, null, false,
null, declare && owner));
+ if (owner) {
+ builder.add(new Params("urn:test", "p", declare, true, "p",
false, "p", false));
+ builder.add(new Params("urn:test", "p", declare, true, "q",
false, "p", declare));
+ builder.add(new Params("urn:test", null, declare, true, "p",
false, "p", false));
+ builder.add(new Params("urn:test", null, declare, true, "",
false, null, declare));
+ }
+ builder.add(new Params("", "", declare, owner, null, false, "",
false));
+ builder.add(new Params("", null, declare, owner, null, false, "",
false));
+ builder.add(new Params(null, null, declare, owner, null, false,
"", false));
+ // Invalid
+ builder.add(new Params("urn:test", "", declare, owner, null, true,
null, false));
+ builder.add(new Params("", "p", declare, owner, null, true, null,
false));
+ }
+ PARAMS = builder.build();
+ }
+
private final Params params;
public TestSetNamespace(OMMetaFactory metaFactory, Params params) {
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetNamespace.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetNamespace.java
index e704c5513..3689b4526 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetNamespace.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSetNamespace.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;
@@ -44,6 +46,31 @@ public class TestSetNamespace extends SetNamespaceTestCase {
boolean expectNSDecl)
implements SetNamespaceTestCase.Params {}
+ public static final ImmutableList<Params> PARAMS;
+
+ static {
+ ImmutableList.Builder<Params> builder = ImmutableList.builder();
+ for (int i = 0; i < 3; i++) {
+ Boolean declare = i == 0 ? null : Boolean.valueOf(i == 2);
+ boolean implicitDeclare = declare == null ||
declare.booleanValue();
+ // Valid
+ builder.add(new Params("urn:test", "p", declare, null, false, "p",
implicitDeclare));
+ builder.add(new Params("urn:test", null, declare, null, false,
null, implicitDeclare));
+ builder.add(new Params("urn:test", "p", declare, "p", false, "p",
false));
+ builder.add(new Params("urn:test", "p", declare, "q", false, "p",
implicitDeclare));
+ builder.add(new Params("urn:test", null, declare, "p", false, "p",
false));
+ builder.add(new Params("urn:test", null, declare, "", false, "",
false));
+ builder.add(new Params("urn:test", "", declare, null, false, "",
implicitDeclare));
+ builder.add(new Params("urn:test", "", declare, "", false, "",
false));
+ builder.add(new Params("", "", declare, null, false, "", false));
+ builder.add(new Params("", null, declare, null, false, "", false));
+ builder.add(new Params(null, null, declare, null, false, "",
false));
+ // Invalid
+ builder.add(new Params("", "p", declare, null, true, null, false));
+ }
+ PARAMS = builder.build();
+ }
+
private final Params params;
public TestSetNamespace(OMMetaFactory metaFactory, Params params) {
