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 3a03e36a6 Migrate the W3C DOM tests to the new matrix test framework
3a03e36a6 is described below
commit 3a03e36a69037737265c3dc594eb9ca7a9c55e35
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun Mar 29 08:49:41 2026 +0100
Migrate the W3C DOM tests to the new matrix test framework
---
.../impl/dom/W3CDOMLevel1ImplementationTest.java | 92 +--
.../impl/dom/W3CDOMLevel2ImplementationTest.java | 138 +++--
.../impl/dom/W3CDOMLevel3ImplementationTest.java | 664 +++++++++++----------
testing/dom-testsuite/pom.xml | 1 -
.../{W3CTestCase.java => DOMTestSuiteFactory.java} | 18 +-
...MTestSuiteBuilder.java => W3CDOMTestSuite.java} | 34 +-
.../org/apache/axiom/ts/dom/w3c/W3CTestNode.java | 52 ++
...uiteBuilder.java => W3CDOMLevel1TestSuite.java} | 17 +-
...uiteBuilder.java => W3CDOMLevel2TestSuite.java} | 17 +-
...uiteBuilder.java => W3CDOMLevel3TestSuite.java} | 17 +-
.../apache/axiom/ts/dom/w3c/level1/XercesTest.java | 27 +-
.../apache/axiom/ts/dom/w3c/level2/XercesTest.java | 48 +-
.../apache/axiom/ts/dom/w3c/level3/XercesTest.java | 157 ++---
13 files changed, 691 insertions(+), 591 deletions(-)
diff --git
a/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel1ImplementationTest.java
b/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel1ImplementationTest.java
index 95a1e80ec..9bf58f9b6 100644
---
a/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel1ImplementationTest.java
+++
b/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel1ImplementationTest.java
@@ -18,51 +18,55 @@
*/
package org.apache.axiom.om.impl.dom;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import java.util.stream.Stream;
-import org.apache.axiom.ts.dom.w3c.level1.W3CDOMLevel1TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestFilters;
+import org.apache.axiom.ts.dom.w3c.level1.W3CDOMLevel1TestSuite;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
-public class W3CDOMLevel1ImplementationTest extends TestCase {
- public static TestSuite suite() {
- W3CDOMLevel1TestSuiteBuilder builder =
- new W3CDOMLevel1TestSuiteBuilder(DOMTests.FACTORY,
DOMTests.UNSUPPORTED_FEATURES);
-
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/attrspecifiedvalueremove)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentcreateelementdefaultattr)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentgetelementsbytagnametotallength)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreateentref)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreateentref1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreatepi)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreatepi1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/elementremoveattribute)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/elementremoveattributerestoredefaultvalue)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/elementsetattributenomodificationallowederr)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/namednodemapremovenameditem)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/namednodemapremovenameditemgetvalue)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/processinginstructionsetdatanomodificationallowederr)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementnormalize)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementnormalize2)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrinsertbefore7)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrnormalize)");
-
- return builder.build();
+public class W3CDOMLevel1ImplementationTest {
+ @TestFactory
+ Stream<DynamicNode> tests() {
+ return W3CDOMLevel1TestSuite.create(DOMTests.FACTORY,
DOMTests.UNSUPPORTED_FEATURES)
+ .toDynamicNodes(
+ MatrixTestFilters.builder()
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/attrspecifiedvalueremove)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentcreateelementdefaultattr)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentgetelementsbytagnametotallength)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreateentref)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreateentref1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreatepi)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/documentinvalidcharacterexceptioncreatepi1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/elementremoveattribute)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/elementremoveattributerestoredefaultvalue)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/elementsetattributenomodificationallowederr)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/namednodemapremovenameditem)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/namednodemapremovenameditemgetvalue)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/processinginstructionsetdatanomodificationallowederr)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementnormalize)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_elementnormalize2)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrinsertbefore7)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrnormalize)")
+ .build());
}
}
diff --git
a/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel2ImplementationTest.java
b/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel2ImplementationTest.java
index f54eadd95..5a5b66318 100644
---
a/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel2ImplementationTest.java
+++
b/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel2ImplementationTest.java
@@ -18,69 +18,83 @@
*/
package org.apache.axiom.om.impl.dom;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import java.util.stream.Stream;
-import org.apache.axiom.ts.dom.w3c.level2.W3CDOMLevel2TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestFilters;
+import org.apache.axiom.ts.dom.w3c.level2.W3CDOMLevel2TestSuite;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
-public class W3CDOMLevel2ImplementationTest extends TestCase {
- public static TestSuite suite() {
- W3CDOMLevel2TestSuiteBuilder builder =
- new W3CDOMLevel2TestSuiteBuilder(DOMTests.FACTORY,
DOMTests.UNSUPPORTED_FEATURES);
-
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentimportnode14)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentimportnode21)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypeinternalSubset01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypepublicid01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypesystemid01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementsByTagNameNS01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementsByTagNameNS08)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/hc_nodedocumentfragmentnormalize1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/hc_nodedocumentfragmentnormalize2)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/importNode07)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/importNode10)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/importNode16)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapremovenameditemns02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetownerdocument01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetownerdocument02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodenormalize01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodesetprefix06)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodesetprefix07)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodesetprefix09)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix05)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix06)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix07)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/removeAttributeNS02)");
-
- return builder.build();
+public class W3CDOMLevel2ImplementationTest {
+ @TestFactory
+ Stream<DynamicNode> tests() {
+ return W3CDOMLevel2TestSuite.create(DOMTests.FACTORY,
DOMTests.UNSUPPORTED_FEATURES)
+ .toDynamicNodes(
+ MatrixTestFilters.builder()
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentimportnode14)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentimportnode21)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypeinternalSubset01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypepublicid01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypesystemid01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementsByTagNameNS01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementsByTagNameNS08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/hc_nodedocumentfragmentnormalize1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/hc_nodedocumentfragmentnormalize2)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/importNode07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/importNode10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/importNode16)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapremovenameditemns02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetownerdocument01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetownerdocument02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodenormalize01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodesetprefix06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodesetprefix07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodesetprefix09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/removeAttributeNS02)")
+ .build());
}
}
diff --git
a/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel3ImplementationTest.java
b/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel3ImplementationTest.java
index d603ec9f1..8c548bf19 100644
---
a/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel3ImplementationTest.java
+++
b/implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/W3CDOMLevel3ImplementationTest.java
@@ -4,7 +4,7 @@
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "License") you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -18,317 +18,359 @@
*/
package org.apache.axiom.om.impl.dom;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import java.util.stream.Stream;
-import org.apache.axiom.ts.dom.w3c.level3.W3CDOMLevel3TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestFilters;
+import org.apache.axiom.ts.dom.w3c.level3.W3CDOMLevel3TestSuite;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
-public class W3CDOMLevel3ImplementationTest extends TestCase {
- public static TestSuite suite() {
- W3CDOMLevel3TestSuiteBuilder builder =
- new W3CDOMLevel3TestSuiteBuilder(DOMTests.FACTORY,
DOMTests.UNSUPPORTED_FEATURES);
-
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/canonicalform06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/checkcharacternormalization01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode07)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode08)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode09)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode10)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode11)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode12)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode14)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdoctype01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdocumenturi01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetxmlstandalone05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetxmlversion03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument08)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument09)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument12)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument13)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetstricterrorchecking01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetstricterrorchecking02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcanonicalform1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcdatasections1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcheckcharacternormalization1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcomments1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigdatatypenormalization1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigelementcontentwhitespace1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigentities1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigerrorhandler1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigerrorhandler2)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfiginfoset1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfignamespacedeclarations1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfignamespaces1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfignormalizecharacters1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigparameternames01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigschemalocation1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigschematype1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigsplitcdatasections1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationgetparameter01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationgetparameter02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigvalidate1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigvalidateifschema1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigwellformed1)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistcontains01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistcontains02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistgetlength01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistitem01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistitem02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementcontentwhitespace01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode08)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode09)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens09)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens10)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens11)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens13)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens14)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/handleerror01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/handleerror02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/hasFeature03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/hasFeature04)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset04)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset05)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset06)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset08)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset09)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/namespacedeclarations01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/namespacedeclarations02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeappendchild01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition07)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition08)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition09)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition10)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition11)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition12)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition13)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition14)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition15)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition16)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition17)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition18)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition19)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition20)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition21)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition25)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition30)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition31)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition32)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition33)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition34)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition35)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition36)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition37)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition38)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition39)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition40)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature04)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature05)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature06)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature07)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature08)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature09)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature10)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature11)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent15)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent16)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent19)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore14)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore25)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode05)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode10)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode11)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild19)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild13)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild28)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild31)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild40)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesettextcontent12)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters01)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textreplacewholetext06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textreplacewholetext08)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler04)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed04)");
-
- return builder.build();
+public class W3CDOMLevel3ImplementationTest {
+ @TestFactory
+ Stream<DynamicNode> tests() {
+ return W3CDOMLevel3TestSuite.create(DOMTests.FACTORY,
DOMTests.UNSUPPORTED_FEATURES)
+ .toDynamicNodes(
+ MatrixTestFilters.builder()
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/canonicalform06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/checkcharacternormalization01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode12)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentadoptnode14)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdoctype01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetdocumenturi01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetxmlstandalone05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetxmlversion03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument12)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument13)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetstricterrorchecking01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetstricterrorchecking02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcanonicalform1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcdatasections1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcheckcharacternormalization1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigcomments1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigdatatypenormalization1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigelementcontentwhitespace1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigentities1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigerrorhandler1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigerrorhandler2)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfiginfoset1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfignamespacedeclarations1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfignamespaces1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfignormalizecharacters1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigparameternames01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigschemalocation1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigschematype1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigsplitcdatasections1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationgetparameter01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationgetparameter02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigvalidate1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigvalidateifschema1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigwellformed1)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domimplementationgetfeature06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistcontains01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistcontains02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistgetlength01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistitem01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domstringlistitem02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementcontentwhitespace01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributenode09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens13)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementsetidattributens14)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/handleerror01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/handleerror02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/hasFeature03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/hasFeature04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/namespacedeclarations01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/namespacedeclarations02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeappendchild01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition12)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition13)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition14)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition15)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition16)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition17)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition18)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition19)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition20)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition21)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition25)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition30)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition31)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition32)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition33)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition34)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition35)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition36)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition37)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition38)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition39)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodecomparedocumentposition40)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature09)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetfeature11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent15)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent16)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent19)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore14)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeinsertbefore25)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild19)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild13)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild28)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild31)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild40)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesettextcontent12)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textreplacewholetext06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textreplacewholetext08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/userdatahandler04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed04)")
+ .build());
}
}
diff --git a/testing/dom-testsuite/pom.xml b/testing/dom-testsuite/pom.xml
index f55c06254..cf412e3cb 100644
--- a/testing/dom-testsuite/pom.xml
+++ b/testing/dom-testsuite/pom.xml
@@ -71,7 +71,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/DOMTestSuiteFactory.java
similarity index 67%
rename from
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java
rename to
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/DOMTestSuiteFactory.java
index 8fdf965d6..ef5baf2be 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/DOMTestSuiteFactory.java
@@ -18,19 +18,9 @@
*/
package org.apache.axiom.ts.dom.w3c;
-import org.apache.axiom.testutils.suite.MatrixTestCase;
-import org.w3c.domts.DOMTestCase;
+import org.w3c.domts.DOMTestDocumentBuilderFactory;
+import org.w3c.domts.DOMTestSuite;
-public final class W3CTestCase extends MatrixTestCase {
- private DOMTestCase test;
-
- public W3CTestCase(DOMTestCase test) {
- this.test = test;
- addTestParameter("id", test.getTargetURI());
- }
-
- @Override
- protected void runTest() throws Throwable {
- test.runTest();
- }
+public interface DOMTestSuiteFactory {
+ DOMTestSuite create(DOMTestDocumentBuilderFactory factory) throws
Exception;
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuite.java
similarity index 82%
rename from
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java
rename to
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuite.java
index b9208d444..a6b133e6c 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuite.java
@@ -24,7 +24,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
+import org.apache.axiom.testutils.suite.ParentNode;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.objectweb.asm.ClassReader;
import org.w3c.domts.DOMTestCase;
@@ -34,18 +35,16 @@ import org.w3c.domts.DOMTestSink;
import org.w3c.domts.DOMTestSuite;
import org.w3c.domts.DocumentBuilderSetting;
-public abstract class W3CDOMTestSuiteBuilder extends MatrixTestSuiteBuilder {
- private final DocumentBuilderFactoryFactory dbff;
- private final Set<DOMFeature> unsupportedFeatures;
+import com.google.common.collect.ImmutableList;
- public W3CDOMTestSuiteBuilder(
- DocumentBuilderFactoryFactory dbff, DOMFeature...
unsupportedFeatures) {
- this.dbff = dbff;
- this.unsupportedFeatures = new
HashSet<DOMFeature>(Arrays.asList(unsupportedFeatures));
- }
+public final class W3CDOMTestSuite {
+ public static MatrixTestNode create(
+ DOMTestSuiteFactory domTestSuiteFactory,
+ DocumentBuilderFactoryFactory dbff,
+ DOMFeature... unsupportedFeatures) {
+ Set<DOMFeature> unsupportedFeaturesSet =
+ new HashSet<DOMFeature>(Arrays.asList(unsupportedFeatures));
- @Override
- protected final void addTests() {
final DOMTestDocumentBuilderFactory factory;
try {
factory =
@@ -65,18 +64,19 @@ public abstract class W3CDOMTestSuiteBuilder extends
MatrixTestSuiteBuilder {
DOMTestSuite suite;
try {
- suite = createDOMTestSuite(factory);
+ suite = domTestSuiteFactory.create(factory);
} catch (Exception ex) {
// TODO
throw new Error(ex);
}
+ ImmutableList.Builder<W3CTestNode> testNodes = ImmutableList.builder();
suite.build(
new DOMTestSink() {
@Override
public void addTest(Class<? extends DOMTestCase>
testClass) {
try {
- if (!unsupportedFeatures.isEmpty()) {
+ if (!unsupportedFeaturesSet.isEmpty()) {
Set<DOMFeature> usedFeatures = new
HashSet<DOMFeature>();
DOMFeature.matchFeatures(testClass,
usedFeatures);
ClassReader classReader =
@@ -86,7 +86,7 @@ public abstract class W3CDOMTestSuiteBuilder extends
MatrixTestSuiteBuilder {
DOMTSClassVisitor cv = new
DOMTSClassVisitor(usedFeatures);
classReader.accept(
cv, ClassReader.SKIP_DEBUG |
ClassReader.SKIP_FRAMES);
- usedFeatures.retainAll(unsupportedFeatures);
+ usedFeatures.retainAll(unsupportedFeaturesSet);
if (!usedFeatures.isEmpty()) {
return;
}
@@ -100,15 +100,13 @@ public abstract class W3CDOMTestSuiteBuilder extends
MatrixTestSuiteBuilder {
throw ex.getTargetException();
}
test.setFramework(JUnitTestFramework.INSTANCE);
- W3CDOMTestSuiteBuilder.this.addTest(new
W3CTestCase(test));
+ testNodes.add(new W3CTestNode(test));
} catch (Throwable ex) {
// TODO
throw new Error(ex);
}
}
});
+ return new ParentNode(testNodes.build());
}
-
- protected abstract DOMTestSuite
createDOMTestSuite(DOMTestDocumentBuilderFactory factory)
- throws Exception;
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestNode.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestNode.java
new file mode 100644
index 000000000..718a9d2fb
--- /dev/null
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestNode.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.dom.w3c;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiPredicate;
+import java.util.stream.Stream;
+
+import org.apache.axiom.testutils.suite.MatrixTestNode;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.DynamicTest;
+import org.w3c.domts.DOMTestCase;
+
+import com.google.inject.Injector;
+
+public final class W3CTestNode extends MatrixTestNode {
+ private final DOMTestCase test;
+
+ public W3CTestNode(DOMTestCase test) {
+ this.test = test;
+ }
+
+ @Override
+ protected final Stream<DynamicNode> toDynamicNodes(
+ Injector parentInjector,
+ Map<String, String> inheritedParameters,
+ BiPredicate<Class<?>, Map<String, String>> excludes) {
+ Map<String, String> parameters = new HashMap<>(inheritedParameters);
+ parameters.put("id", test.getTargetURI());
+ if (excludes.test(test.getClass(), parameters)) {
+ return Stream.empty();
+ }
+ return
Stream.of(DynamicTest.dynamicTest(test.getClass().getSimpleName(),
test::runTest));
+ }
+}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuite.java
similarity index 69%
rename from
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java
rename to
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuite.java
index 738cb263a..1469dfab3 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuite.java
@@ -18,22 +18,15 @@
*/
package org.apache.axiom.ts.dom.w3c.level1;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.apache.axiom.ts.dom.w3c.DOMFeature;
-import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuiteBuilder;
-import org.w3c.domts.DOMTestDocumentBuilderFactory;
-import org.w3c.domts.DOMTestSuite;
+import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuite;
import org.w3c.domts.level1.core.alltests;
-public final class W3CDOMLevel1TestSuiteBuilder extends W3CDOMTestSuiteBuilder
{
- public W3CDOMLevel1TestSuiteBuilder(
+public final class W3CDOMLevel1TestSuite {
+ public static MatrixTestNode create(
DocumentBuilderFactoryFactory dbff, DOMFeature...
unsupportedFeatures) {
- super(dbff, unsupportedFeatures);
- }
-
- @Override
- protected DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory
factory)
- throws Exception {
- return new alltests(factory);
+ return W3CDOMTestSuite.create(alltests::new, dbff,
unsupportedFeatures);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuite.java
similarity index 69%
rename from
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java
rename to
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuite.java
index 5b80fdc98..85c937e90 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuite.java
@@ -18,22 +18,15 @@
*/
package org.apache.axiom.ts.dom.w3c.level2;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.apache.axiom.ts.dom.w3c.DOMFeature;
-import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuiteBuilder;
-import org.w3c.domts.DOMTestDocumentBuilderFactory;
-import org.w3c.domts.DOMTestSuite;
+import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuite;
import org.w3c.domts.level2.core.alltests;
-public final class W3CDOMLevel2TestSuiteBuilder extends W3CDOMTestSuiteBuilder
{
- public W3CDOMLevel2TestSuiteBuilder(
+public final class W3CDOMLevel2TestSuite {
+ public static MatrixTestNode create(
DocumentBuilderFactoryFactory dbff, DOMFeature...
unsupportedFeatures) {
- super(dbff, unsupportedFeatures);
- }
-
- @Override
- protected DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory
factory)
- throws Exception {
- return new alltests(factory);
+ return W3CDOMTestSuite.create(alltests::new, dbff,
unsupportedFeatures);
}
}
diff --git
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuite.java
similarity index 69%
rename from
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java
rename to
testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuite.java
index db36981fb..4077806c6 100644
---
a/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java
+++
b/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuite.java
@@ -18,22 +18,15 @@
*/
package org.apache.axiom.ts.dom.w3c.level3;
+import org.apache.axiom.testutils.suite.MatrixTestNode;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.apache.axiom.ts.dom.w3c.DOMFeature;
-import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuiteBuilder;
-import org.w3c.domts.DOMTestDocumentBuilderFactory;
-import org.w3c.domts.DOMTestSuite;
+import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuite;
import org.w3c.domts.level3.core.alltests;
-public final class W3CDOMLevel3TestSuiteBuilder extends W3CDOMTestSuiteBuilder
{
- public W3CDOMLevel3TestSuiteBuilder(
+public final class W3CDOMLevel3TestSuite {
+ public static MatrixTestNode create(
DocumentBuilderFactoryFactory dbff, DOMFeature...
unsupportedFeatures) {
- super(dbff, unsupportedFeatures);
- }
-
- @Override
- protected DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory
factory)
- throws Exception {
- return new alltests(factory);
+ return W3CDOMTestSuite.create(alltests::new, dbff,
unsupportedFeatures);
}
}
diff --git
a/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java
b/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java
index 18310709f..e193d7562 100644
---
a/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java
+++
b/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java
@@ -18,27 +18,30 @@
*/
package org.apache.axiom.ts.dom.w3c.level1;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.stream.Stream;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.axiom.testutils.suite.MatrixTestFilters;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
-public class XercesTest extends TestCase {
- public static TestSuite suite() {
- W3CDOMLevel1TestSuiteBuilder builder =
- new W3CDOMLevel1TestSuiteBuilder(
+public class XercesTest {
+ @TestFactory
+ Stream<DynamicNode> tests() {
+ return W3CDOMLevel1TestSuite.create(
new DocumentBuilderFactoryFactory() {
@Override
public DocumentBuilderFactory newInstance() {
return new DocumentBuilderFactoryImpl();
}
- });
-
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
-
- return builder.build();
+ })
+ .toDynamicNodes(
+ MatrixTestFilters.builder()
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)")
+ .build());
}
}
diff --git
a/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java
b/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java
index 0d7951154..dff3a638c 100644
---
a/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java
+++
b/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java
@@ -18,36 +18,42 @@
*/
package org.apache.axiom.ts.dom.w3c.level2;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.stream.Stream;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.axiom.testutils.suite.MatrixTestFilters;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
-public class XercesTest extends TestCase {
- public static TestSuite suite() {
- W3CDOMLevel2TestSuiteBuilder builder =
- new W3CDOMLevel2TestSuiteBuilder(
+public class XercesTest {
+ @TestFactory
+ Stream<DynamicNode> tests() {
+ return W3CDOMLevel2TestSuite.create(
new DocumentBuilderFactoryFactory() {
@Override
public DocumentBuilderFactory newInstance() {
return new DocumentBuilderFactoryImpl();
}
- });
-
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)");
-
- return builder.build();
+ })
+ .toDynamicNodes(
+ MatrixTestFilters.builder()
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)")
+ .build());
}
}
diff --git
a/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java
b/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java
index 546783201..575f594a3 100644
---
a/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java
+++
b/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java
@@ -18,87 +18,100 @@
*/
package org.apache.axiom.ts.dom.w3c.level3;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.stream.Stream;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.axiom.testutils.suite.MatrixTestFilters;
import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.TestFactory;
-public class XercesTest extends TestCase {
- public static TestSuite suite() {
- W3CDOMLevel3TestSuiteBuilder builder =
- new W3CDOMLevel3TestSuiteBuilder(
+public class XercesTest {
+ @TestFactory
+ Stream<DynamicNode> tests() {
+ return W3CDOMLevel3TestSuite.create(
new DocumentBuilderFactoryFactory() {
@Override
public DocumentBuilderFactory newInstance() {
return new DocumentBuilderFactoryImpl();
}
- });
-
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetinputencoding03)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo02)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo07)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset01)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri16)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent18)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode03)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild13)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild24)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild38)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textiselementcontentwhitespace05)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfogettypename04)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom15)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom16)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom17)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom18)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom19)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom21)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom40)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom41)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom58)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom59)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom66)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom67)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom68)");
- builder.exclude(
-
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom73)");
-
builder.exclude("(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)");
-
- return builder.build();
+ })
+ .toDynamicNodes(
+ MatrixTestFilters.builder()
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetinputencoding03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset01)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri16)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent18)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode03)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild13)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild24)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild38)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textiselementcontentwhitespace05)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfogettypename04)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom15)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom16)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom17)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom18)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom19)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom21)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom40)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom41)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom58)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom59)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom66)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom67)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom68)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom73)")
+ .add(
+
"(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)")
+ .build());
}
}
