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 e7fb77d14 Change ParameterBinding.addTestParameters to take injector,
value, and params in that order
e7fb77d14 is described below
commit e7fb77d140df730d359190f201d53b5502da2b5f
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun Mar 22 10:06:55 2026 +0000
Change ParameterBinding.addTestParameters to take injector, value, and
params in that order
---
.../org/apache/axiom/util/sax/XMLReaderTestSuite.java | 2 +-
.../apache/axiom/util/stax/dialect/DialectTestSuite.java | 16 ++++++++--------
.../axiom/om/impl/jaxp/StreamSourceToOMResultTest.java | 6 ++++--
.../apache/axiom/blob/suite/WritableBlobTestSuite.java | 2 +-
.../stream/serializer/SerializerConformanceTest.java | 3 ++-
.../stax/pull/output/StAXPivotTransformerTest.java | 5 +++--
.../org/apache/axiom/ts/om/cross/CrossOMTestSuite.java | 5 +++--
.../java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java | 5 +++--
.../org/apache/axiom/ts/soapdom/SOAPDOMTestSuite.java | 3 ++-
.../main/java/org/apache/axiom/ts/dom/DOMTestSuite.java | 14 ++++++++------
.../org/apache/axiom/testutils/suite/FanOutNode.java | 5 +++--
.../apache/axiom/testutils/suite/ParameterBinding.java | 7 +++++--
.../java/org/apache/axiom/ts/saaj/SAAJTestSuite.java | 3 ++-
.../org/apache/axiom/ts/springws/SpringWSTestSuite.java | 2 +-
.../java/org/apache/axiom/truth/xml/CompareTest.java | 10 ++++++----
15 files changed, 52 insertions(+), 36 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 23070c142..4347d13bb 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
@@ -39,7 +39,7 @@ public class XMLReaderTestSuite {
binder.bind(String.class)
.annotatedWith(Names.named("feature"))
.toInstance(value),
- (params, value) -> params.addTestParameter("feature",
value),
+ (injector, value, params) ->
params.addTestParameter("feature", value),
new MatrixTest(TestGetSetFeature.class)));
}
}
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
index 318c40271..251df3388 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
@@ -50,14 +50,14 @@ public class DialectTestSuite {
binder.bind(StAXImplementationAdapter.class)
.toInstance(
value.getAdapter(StAXImplementationAdapter.class)),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter("implementation",
value.getName()),
new ParentNode(
new FanOutNode<>(
Multiton.getInstances(StreamType.class),
(binder, value) ->
binder.bind(StreamType.class).toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"type",
value.getType().getSimpleName()),
new MatrixTest(TestClose.class)),
@@ -105,7 +105,7 @@ public class DialectTestSuite {
.annotatedWith(Names.named("xmlEncodings"))
.toInstance(value.getRight());
},
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"javaEncoding",
value.getLeft()),
new
MatrixTest(TestGetEncodingFromDetection.class)),
@@ -134,7 +134,7 @@ public class DialectTestSuite {
.annotatedWith(Names.named("expectException"))
.toInstance(value.getRight());
},
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"event",
XMLEventUtils.getEventTypeString(
@@ -164,7 +164,7 @@ public class DialectTestSuite {
.annotatedWith(Names.named("expectException"))
.toInstance(value.getRight());
},
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"event",
XMLEventUtils.getEventTypeString(
@@ -207,7 +207,7 @@ public class DialectTestSuite {
.annotatedWith(Names.named("expected"))
.toInstance(value.getRight());
},
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"event",
XMLEventUtils.getEventTypeString(
@@ -242,7 +242,7 @@ public class DialectTestSuite {
.annotatedWith(Names.named("expected"))
.toInstance(value.getRight());
},
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"event",
XMLEventUtils.getEventTypeString(
@@ -272,7 +272,7 @@ public class DialectTestSuite {
.annotatedWith(Names.named("expected"))
.toInstance(value.getRight());
},
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"event",
XMLEventUtils.getEventTypeString(
diff --git
a/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
b/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
index 25999114a..171beb797 100644
---
a/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
+++
b/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
@@ -43,11 +43,13 @@ public class StreamSourceToOMResultTest {
binder.bind(String.class)
.annotatedWith(Names.named("axiomImplementation"))
.toInstance(value),
- (params, value) ->
params.addTestParameter("axiomImplementation", value),
+ (injector, value, params) ->
+ params.addTestParameter("axiomImplementation",
value),
new FanOutNode<>(
Multiton.getInstances(XMLSample.class),
(binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
- (params, value) ->
params.addTestParameter("file", value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("file",
value.getName()),
new
MatrixTest(StreamSourceToOMResultTestCase.class)))
.toDynamicNodes(excludes);
}
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 f2352d2ee..a6b99fc2f 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
@@ -72,7 +72,7 @@ public class WritableBlobTestSuite {
binder.bindConstant()
.annotatedWith(Names.named("size"))
.to(v),
- (params, v) -> params.addTestParameter("size",
v),
+ (injector, v, params) ->
params.addTestParameter("size", v),
new ParentNode(
new MatrixTest(TestMarkReset.class),
new MatrixTest(TestReadFrom.class),
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
index 5500b6ca2..860a030bf 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
@@ -33,7 +33,8 @@ public class SerializerConformanceTest {
return new FanOutNode<>(
Multiton.getInstances(XMLSample.class),
(binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
- (params, value) -> params.addTestParameter("sample",
value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("sample",
value.getName()),
new MatrixTest(SerializerConformanceTestCase.class))
.toDynamicNodes();
}
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
index b8eee1758..98fc965f2 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
@@ -38,13 +38,14 @@ public class StAXPivotTransformerTest {
.filter(XSLTImplementation::supportsStAXSource)
.collect(ImmutableList.toImmutableList()),
(binder, value) ->
binder.bind(XSLTImplementation.class).toInstance(value),
- (params, value) -> params.addTestParameter("xslt",
value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("xslt",
value.getName()),
new FanOutNode<>(
Multiton.getInstances(XMLSample.class).stream()
.filter(s -> !s.hasDTD())
.collect(ImmutableList.toImmutableList()),
(binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter("sample",
value.getName()),
new
MatrixTest(StAXPivotTransformerTestCase.class)))
.toDynamicNodes();
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 85ef288ea..e4e0da5f6 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
@@ -45,7 +45,8 @@ public class CrossOMTestSuite {
new FanOutNode<>(
Multiton.getInstances(XMLSample.class),
(binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
- (params, value) ->
params.addTestParameter("file", value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("file",
value.getName()),
new
MatrixTest(TestImportInformationItem.class)),
new FanOutNode<>(
ImmutableList.of(false, true),
@@ -53,7 +54,7 @@ public class CrossOMTestSuite {
binder.bind(Boolean.class)
.annotatedWith(Names.named("before"))
.toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter("before",
String.valueOf(value)),
new MatrixTest(TestInsertSibling.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 0412dc479..03622da2a 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
@@ -50,7 +50,7 @@ public class OMDOMTestSuite {
binder.bind(Boolean.class)
.annotatedWith(Names.named("build"))
.toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter("build",
String.valueOf(value)),
new ParentNode(
new MatrixTest(
@@ -67,7 +67,8 @@ public class OMDOMTestSuite {
new FanOutNode<>(
Multiton.getInstances(XMLSample.class),
(binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
- (params, value) ->
params.addTestParameter("file", value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("file",
value.getName()),
new MatrixTest(
org.apache.axiom.ts.omdom.document.TestImportNode.class)),
new MatrixTest(
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 21085dd00..1fc6e7c3b 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
@@ -34,7 +34,8 @@ public class SOAPDOMTestSuite {
new FanOutNode<>(
Multiton.getInstances(SOAPSpec.class),
(binder, value) ->
binder.bind(SOAPSpec.class).toInstance(value),
- (params, value) -> params.addTestParameter("spec",
value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("spec",
value.getName()),
new ParentNode(
new MatrixTest(
org.apache.axiom.ts.soapdom.header
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 2225f53cf..81f450040 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
@@ -55,7 +55,7 @@ public class DOMTestSuite {
new QName("", XMLConstants.XMLNS_ATTRIBUTE, ""));
private static final ParameterBinding<QName> QNAME_PARAMS =
- (params, qname) -> {
+ (injector, qname, params) -> {
params.addTestParameter("ns", qname.getNamespaceURI());
params.addTestParameter("name",
DOMUtils.getQualifiedName(qname));
};
@@ -308,7 +308,7 @@ public class DOMTestSuite {
binder.bind(Boolean.class)
.annotatedWith(Names.named("deep"))
.toInstance(value),
- (params, value) ->
params.addTestParameter("deep", value),
+ (injector, value, params) ->
params.addTestParameter("deep", value),
new ParentNode(
new MatrixTest(
org.apache.axiom.ts.dom.attr.TestCloneNode.class),
@@ -321,7 +321,7 @@ public class DOMTestSuite {
binder.bind(Boolean.class)
.annotatedWith(Names.named("newChildHasSiblings"))
.toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter("newChildHasSiblings", value),
new ParentNode(
new MatrixTest(
@@ -361,7 +361,8 @@ public class DOMTestSuite {
new FanOutNode<>(
Multiton.getInstances(XMLSample.class),
(binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
- (params, value) ->
params.addTestParameter("file", value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("file",
value.getName()),
new ParentNode(
new MatrixTest(
org.apache.axiom.ts.dom.document.TestCloneNode
@@ -371,7 +372,7 @@ public class DOMTestSuite {
(binder, value) ->
binder.bind(DOMImplementation.class)
.toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"from",
value.getName()),
new MatrixTest(
@@ -381,7 +382,8 @@ public class DOMTestSuite {
Multiton.getInstances(XSLTImplementation.class),
(binder, value) ->
binder.bind(XSLTImplementation.class).toInstance(value),
- (params, value) ->
params.addTestParameter("xslt", value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("xslt",
value.getName()),
new ParentNode(
new MatrixTest(
org.apache.axiom.ts.dom.document
diff --git
a/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/FanOutNode.java
b/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/FanOutNode.java
index 9b0aa37b4..4f072c219 100644
---
a/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/FanOutNode.java
+++
b/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/FanOutNode.java
@@ -77,6 +77,8 @@ public final class FanOutNode<T> extends MatrixTestNode {
binder ->
binding.configure(binder, value));
Map<String, String> parameters = new
HashMap<>(inheritedParameters);
parameterBinding.addTestParameters(
+ parentInjector,
+ value,
new TestParameterTarget() {
@Override
public void addTestParameter(String
name, String value) {
@@ -92,8 +94,7 @@ public final class FanOutNode<T> extends MatrixTestNode {
public void addTestParameter(String
name, int value) {
addTestParameter(name,
String.valueOf(value));
}
- },
- value);
+ });
String displayName =
parameters.entrySet().stream()
.map(e -> e.getKey() + "=" +
e.getValue())
diff --git
a/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/ParameterBinding.java
b/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/ParameterBinding.java
index e33d01dbd..a87154130 100644
---
a/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/ParameterBinding.java
+++
b/testing/matrix-testsuite/src/main/java/org/apache/axiom/testutils/suite/ParameterBinding.java
@@ -18,8 +18,11 @@
*/
package org.apache.axiom.testutils.suite;
+import com.google.inject.Injector;
+
public interface ParameterBinding<T> {
- ParameterBinding<Dimension> DIMENSION = (params, value) ->
value.addTestParameters(params);
+ ParameterBinding<Dimension> DIMENSION =
+ (injector, value, params) -> value.addTestParameters(params);
- void addTestParameters(TestParameterTarget params, T value);
+ void addTestParameters(Injector injector, T value, TestParameterTarget
params);
}
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 3864e7623..fc799aec3 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
@@ -42,7 +42,8 @@ public class SAAJTestSuite {
new FanOutNode<>(
Multiton.getInstances(SOAPSpec.class),
(binder, value) ->
binder.bind(SOAPSpec.class).toInstance(value),
- (params, value) -> params.addTestParameter("spec",
value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("spec",
value.getName()),
new ParentNode(
new
MatrixTest(TestAddChildElementReification.class),
new
MatrixTest(TestExamineMustUnderstandHeaderElements.class),
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
index 141d31af4..ff2a18bc9 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
@@ -56,7 +56,7 @@ public class SpringWSTestSuite {
return new FanOutNode<>(
Multiton.getInstances(SOAPSpec.class),
(binder, value) ->
binder.bind(SOAPSpec.class).toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"soapVersion",
value.getAdapter(SOAPSpecAdapter.class).getSoapVersion()),
diff --git
a/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/CompareTest.java
b/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/CompareTest.java
index a330fe5c8..04709529b 100644
---
a/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/CompareTest.java
+++
b/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/CompareTest.java
@@ -39,21 +39,23 @@ public class CompareTest {
binder.bind(XMLSample.class)
.annotatedWith(Names.named("sample"))
.toInstance(value),
- (params, value) -> params.addTestParameter("sample",
value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("sample",
value.getName()),
new FanOutNode<>(
Multiton.getInstances(XMLObjectFactory.class),
(binder, value) ->
binder.bind(XMLObjectFactory.class)
.annotatedWith(Names.named("left"))
.toInstance(value),
- (params, value) ->
params.addTestParameter("left", value.getName()),
+ (injector, value, params) ->
+ params.addTestParameter("left",
value.getName()),
new FanOutNode<>(
Multiton.getInstances(XMLObjectFactory.class),
(binder, value) ->
binder.bind(XMLObjectFactory.class)
.annotatedWith(Names.named("right"))
.toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter("right", value.getName()),
new FanOutNode<>(
ImmutableList.of(true, false),
@@ -63,7 +65,7 @@ public class CompareTest {
Names.named(
"expandEntityReferences"))
.toInstance(value),
- (params, value) ->
+ (injector, value, params) ->
params.addTestParameter(
"expandEntityReferences",
String.valueOf(value)),
