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 f589b1403 Change return type of suite factory methods to MatrixTestNode
f589b1403 is described below
commit f589b1403ab651b151faccc5163262750feab922
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 28 23:15:27 2026 +0000
Change return type of suite factory methods to MatrixTestNode
---
.../src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java | 3 ++-
.../java/org/apache/axiom/blob/suite/WritableBlobTestSuite.java | 3 ++-
.../src/main/java/org/apache/axiom/ts/om/OMTestSuite.java | 2 +-
.../main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java | 3 ++-
.../src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java | 3 ++-
.../src/main/java/org/apache/axiom/ts/soap/SOAPTestSuite.java | 2 +-
.../src/main/java/org/apache/axiom/ts/soapdom/SOAPDOMTestSuite.java | 3 ++-
.../src/main/java/org/apache/axiom/ts/dom/DOMTestSuite.java | 3 ++-
testing/matrix-testsuite/README.md | 6 +++---
testing/matrix-testsuite/migration.md | 6 +++---
.../src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java | 3 ++-
11 files changed, 22 insertions(+), 15 deletions(-)
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java
b/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java
index 2fd6dd5ec..1baa032f2 100644
--- a/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java
+++ b/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java
@@ -20,6 +20,7 @@ package org.apache.axiom.util.sax;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.FanOutNode;
import org.xml.sax.XMLReader;
@@ -29,7 +30,7 @@ import com.google.inject.Key;
import com.google.inject.name.Names;
public class XMLReaderTestSuite {
- public static InjectorNode create(XMLReader xmlReader) {
+ public static MatrixTestNode create(XMLReader xmlReader) {
return new InjectorNode(
binder -> binder.bind(XMLReader.class).toInstance(xmlReader),
new FanOutNode<>(
diff --git
a/components/blob/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuite.java
b/components/blob/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuite.java
index 34e037a18..4491de415 100644
---
a/components/blob/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuite.java
+++
b/components/blob/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuite.java
@@ -23,6 +23,7 @@ import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.ConditionalNode;
import org.apache.axiom.testutils.suite.FanOutNode;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.ParameterBinding;
import org.apache.axiom.testutils.suite.ParentNode;
@@ -33,7 +34,7 @@ import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
public class WritableBlobTestSuite {
- public static InjectorNode create(
+ public static MatrixTestNode create(
WritableBlobFactory<?> factory,
ImmutableList<Integer> sizes,
boolean outputStreamHasReadFromSupport,
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuite.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuite.java
index 7babd7a3d..d5c55f153 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuite.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuite.java
@@ -73,7 +73,7 @@ public class OMTestSuite {
params.addTestParameter("uri", qname.getNamespaceURI());
};
- public static InjectorNode create(OMMetaFactory metaFactory) {
+ public static MatrixTestNode create(OMMetaFactory metaFactory) {
return new InjectorNode(
binder ->
binder.bind(OMMetaFactory.class).toInstance(metaFactory),
new ParentNode(
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java
index de646cf05..f06e0647c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java
@@ -22,6 +22,7 @@ import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.ParentNode;
import org.apache.axiom.testutils.suite.FanOutNode;
@@ -32,7 +33,7 @@ import com.google.inject.Key;
import com.google.inject.name.Names;
public class CrossOMTestSuite {
- public static InjectorNode create(OMMetaFactory metaFactory, OMMetaFactory
altMetaFactory) {
+ public static MatrixTestNode create(OMMetaFactory metaFactory,
OMMetaFactory altMetaFactory) {
return new InjectorNode(
binder -> {
binder.bind(OMMetaFactory.class)
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java
index b4c7a0508..269d3e75e 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java
@@ -22,6 +22,7 @@ import org.apache.axiom.om.dom.DOMMetaFactory;
import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.ParentNode;
import org.apache.axiom.testutils.suite.FanOutNode;
@@ -37,7 +38,7 @@ import com.google.inject.name.Names;
* with a standard DOM implementation) should go to <code>dom-testsuite</code>.
*/
public class OMDOMTestSuite {
- public static InjectorNode create(DOMMetaFactory metaFactory) {
+ public static MatrixTestNode create(DOMMetaFactory metaFactory) {
return new InjectorNode(
binder ->
binder.bind(DOMMetaFactory.class).toInstance(metaFactory),
new ParentNode(
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuite.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuite.java
index a3cc31765..5b3310885 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuite.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuite.java
@@ -113,7 +113,7 @@ public class SOAPTestSuite {
params.addTestParameter("localName", qname.getLocalPart());
};
- public static InjectorNode create(OMMetaFactory metaFactory) {
+ public static MatrixTestNode create(OMMetaFactory metaFactory) {
return new InjectorNode(
binder ->
binder.bind(OMMetaFactory.class).toInstance(metaFactory),
new ParentNode(
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/SOAPDOMTestSuite.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/SOAPDOMTestSuite.java
index 01c9af7c0..5c7c2b47b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/SOAPDOMTestSuite.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/SOAPDOMTestSuite.java
@@ -24,6 +24,7 @@ import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.FanOutNode;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.ParentNode;
import org.apache.axiom.ts.soap.SOAPSpec;
@@ -31,7 +32,7 @@ import org.apache.axiom.ts.soap.SOAPSpec;
import com.google.inject.Key;
public class SOAPDOMTestSuite {
- public static InjectorNode create(DOMMetaFactory metaFactory) {
+ public static MatrixTestNode create(DOMMetaFactory metaFactory) {
return new InjectorNode(
binder ->
binder.bind(OMMetaFactory.class).toInstance(metaFactory),
new FanOutNode<>(
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuite.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuite.java
index 46a76988e..0a3c3c1cc 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuite.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuite.java
@@ -26,6 +26,7 @@ import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.FanOutNode;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.ParameterBinding;
import org.apache.axiom.testutils.suite.ParentNode;
@@ -62,7 +63,7 @@ public class DOMTestSuite {
params.addTestParameter("name",
DOMUtils.getQualifiedName(qname));
};
- public static InjectorNode create(DocumentBuilderFactoryFactory dbff) {
+ public static MatrixTestNode create(DocumentBuilderFactoryFactory dbff) {
DocumentBuilderFactory dbf = dbff.newInstance();
dbf.setNamespaceAware(true);
return new InjectorNode(
diff --git a/testing/matrix-testsuite/README.md
b/testing/matrix-testsuite/README.md
index 88c3e0a32..f12dfff21 100644
--- a/testing/matrix-testsuite/README.md
+++ b/testing/matrix-testsuite/README.md
@@ -178,7 +178,7 @@ leaf nodes:
```java
public class MyTestSuite {
- public static InjectorNode create(SomeFactory factory) {
+ public static MatrixTestNode create(SomeFactory factory) {
SomeImplementation impl = new SomeImplementation(factory);
FanOutNode<SomeDimension> dimensions = new FanOutNode<>(
@@ -189,7 +189,7 @@ public class MyTestSuite {
new MatrixTest(TestSomeBehavior.class),
new MatrixTest(TestOtherBehavior.class)));
- InjectorNode suite = new InjectorNode(
+ MatrixTestNode suite = new InjectorNode(
binder ->
binder.bind(SomeImplementation.class).toInstance(impl),
dimensions);
@@ -206,7 +206,7 @@ Consumers create a JUnit 5 test class with a `@TestFactory`
method:
class MyImplTest {
@TestFactory
Stream<DynamicNode> tests() {
- InjectorNode suite = MyTestSuite.create(new MyFactoryImpl());
+ MatrixTestNode suite = MyTestSuite.create(new MyFactoryImpl());
MatrixTestFilters excludes = MatrixTestFilters.builder()
.add(TestSomeBehavior.class, "(dimension=problematicValue)")
.build();
diff --git a/testing/matrix-testsuite/migration.md
b/testing/matrix-testsuite/migration.md
index 69727b70c..709adb107 100644
--- a/testing/matrix-testsuite/migration.md
+++ b/testing/matrix-testsuite/migration.md
@@ -148,8 +148,8 @@ public class TestAddChildElementReification extends
SAAJTestCase {
The old `*TestSuiteBuilder` class extends `MatrixTestSuiteBuilder` and
overrides
`addTests()` to register test instances for each dimension combination.
-**Replace it** with a class that has a static factory method returning an
-`InjectorNode`. The factory method:
+**Replace it** with a class that has a static factory method returning a
+`MatrixTestNode`. The factory method:
1. Creates an `InjectorNode` with a Guice module that binds
implementation-level objects. Pass a single `Module` directly (convenience
@@ -195,7 +195,7 @@ public class SAAJTestSuiteBuilder extends
MatrixTestSuiteBuilder {
```java
public class SAAJTestSuite {
- public static InjectorNode create(SAAJMetaFactory metaFactory) {
+ public static MatrixTestNode create(SAAJMetaFactory metaFactory) {
return new InjectorNode(
binder ->
binder.bind(SAAJImplementation.class)
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
index 04934bcc5..fe21427d7 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
@@ -24,6 +24,7 @@ import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.InjectorNode;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.testutils.suite.ParentNode;
import org.apache.axiom.testutils.suite.FanOutNode;
import org.apache.axiom.ts.saaj.body.TestAddChildElementReification;
@@ -37,7 +38,7 @@ import org.apache.axiom.ts.soap.SOAPSpec;
import com.google.inject.Key;
public class SAAJTestSuite {
- public static InjectorNode create(SAAJMetaFactory metaFactory) {
+ public static MatrixTestNode create(SAAJMetaFactory metaFactory) {
return new InjectorNode(
binder ->
binder.bind(SAAJImplementation.class)
