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 380f8f647 Migrate StAXPivotTransformerTest to MatrixTestNode (JUnit 5)
380f8f647 is described below
commit 380f8f64723e69e9702f6875bf8eace417f8236e
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun Mar 8 12:10:31 2026 +0000
Migrate StAXPivotTransformerTest to MatrixTestNode (JUnit 5)
---
.../stax/pull/output/StAXPivotTransformerTest.java | 89 +++++++---------------
...Test.java => StAXPivotTransformerTestCase.java} | 42 +++-------
2 files changed, 39 insertions(+), 92 deletions(-)
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 a4af3db25..381a6b382 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
@@ -18,69 +18,36 @@
*/
package org.apache.axiom.core.stream.stax.pull.output;
-import static com.google.common.truth.Truth.assertAbout;
-import static org.apache.axiom.testing.multiton.Multiton.getInstances;
-import static org.apache.axiom.truth.xml.XMLTruth.xml;
+import java.util.stream.Stream;
-import java.io.StringWriter;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.stax.StAXSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.axiom.core.stream.dom.input.DOMInput;
-import org.apache.axiom.testutils.suite.MatrixTestCase;
-import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
+import org.apache.axiom.testing.multiton.Multiton;
+import org.apache.axiom.testutils.suite.MatrixTest;
+import org.apache.axiom.testutils.suite.ParameterFanOutNode;
import org.apache.axiom.ts.jaxp.xslt.XSLTImplementation;
import org.apache.axiom.ts.xml.XMLSample;
-import org.w3c.dom.Document;
-
-import junit.framework.TestSuite;
-
-public class StAXPivotTransformerTest extends MatrixTestCase {
- private final XSLTImplementation xsltImplementation;
- private final XMLSample sample;
-
- public StAXPivotTransformerTest(XSLTImplementation xsltImplementation,
XMLSample sample) {
- this.xsltImplementation = xsltImplementation;
- this.sample = sample;
- addTestParameter("xslt", xsltImplementation.getName());
- addTestParameter("sample", sample.getName());
- }
-
- @Override
- protected void runTest() throws Throwable {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setExpandEntityReferences(false);
- factory.setCoalescing(true);
- factory.setIgnoringComments(true);
- Document document =
factory.newDocumentBuilder().parse(sample.getUrl().toString());
- StAXPivot pivot = new StAXPivot(null);
- pivot.setReader(new DOMInput(document, false).createReader(pivot));
- StringWriter sw = new StringWriter();
- xsltImplementation
- .newTransformerFactory()
- .newTransformer()
- .transform(new StAXSource(pivot), new StreamResult(sw));
- assertAbout(xml()).that(sw.toString()).hasSameContentAs(document);
- }
-
- public static TestSuite suite() {
- return new MatrixTestSuiteBuilder() {
- @Override
- protected void addTests() {
- for (XSLTImplementation xsltImplementation :
- getInstances(XSLTImplementation.class)) {
- if (xsltImplementation.supportsStAXSource()) {
- for (XMLSample sample : getInstances(XMLSample.class))
{
- if (!sample.hasDTD()) {
- addTest(new
StAXPivotTransformerTest(xsltImplementation, sample));
- }
- }
- }
- }
- }
- }.build();
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
+
+import com.google.common.collect.ImmutableList;
+
+public class StAXPivotTransformerTest {
+ @TestFactory
+ public Stream<DynamicNode> tests() {
+ return new ParameterFanOutNode<>(
+ XSLTImplementation.class,
+
Multiton.getInstances(XSLTImplementation.class).stream()
+ .filter(XSLTImplementation::supportsStAXSource)
+ .collect(ImmutableList.toImmutableList()),
+ "xslt",
+ XSLTImplementation::getName,
+ new ParameterFanOutNode<>(
+ XMLSample.class,
+ Multiton.getInstances(XMLSample.class).stream()
+ .filter(s -> !s.hasDTD())
+
.collect(ImmutableList.toImmutableList()),
+ "sample",
+ XMLSample::getName,
+ new
MatrixTest(StAXPivotTransformerTestCase.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/StAXPivotTransformerTestCase.java
similarity index 60%
copy from
components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
copy to
components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTestCase.java
index a4af3db25..1e72f5c6c 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/StAXPivotTransformerTestCase.java
@@ -19,7 +19,6 @@
package org.apache.axiom.core.stream.stax.pull.output;
import static com.google.common.truth.Truth.assertAbout;
-import static org.apache.axiom.testing.multiton.Multiton.getInstances;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
import java.io.StringWriter;
@@ -29,24 +28,23 @@ import javax.xml.transform.stax.StAXSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.axiom.core.stream.dom.input.DOMInput;
-import org.apache.axiom.testutils.suite.MatrixTestCase;
-import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
import org.apache.axiom.ts.jaxp.xslt.XSLTImplementation;
import org.apache.axiom.ts.xml.XMLSample;
import org.w3c.dom.Document;
-import junit.framework.TestSuite;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
-public class StAXPivotTransformerTest extends MatrixTestCase {
- private final XSLTImplementation xsltImplementation;
- private final XMLSample sample;
+import junit.framework.TestCase;
- public StAXPivotTransformerTest(XSLTImplementation xsltImplementation,
XMLSample sample) {
- this.xsltImplementation = xsltImplementation;
- this.sample = sample;
- addTestParameter("xslt", xsltImplementation.getName());
- addTestParameter("sample", sample.getName());
- }
+public class StAXPivotTransformerTestCase extends TestCase {
+ @Inject
+ @Named("xslt")
+ private XSLTImplementation xsltImplementation;
+
+ @Inject
+ @Named("sample")
+ private XMLSample sample;
@Override
protected void runTest() throws Throwable {
@@ -65,22 +63,4 @@ public class StAXPivotTransformerTest extends MatrixTestCase
{
.transform(new StAXSource(pivot), new StreamResult(sw));
assertAbout(xml()).that(sw.toString()).hasSameContentAs(document);
}
-
- public static TestSuite suite() {
- return new MatrixTestSuiteBuilder() {
- @Override
- protected void addTests() {
- for (XSLTImplementation xsltImplementation :
- getInstances(XSLTImplementation.class)) {
- if (xsltImplementation.supportsStAXSource()) {
- for (XMLSample sample : getInstances(XMLSample.class))
{
- if (!sample.hasDTD()) {
- addTest(new
StAXPivotTransformerTest(xsltImplementation, sample));
- }
- }
- }
- }
- }
- }.build();
- }
}
