Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN</a>
  */
-public class nodegetlocalname03 extends DOMTestCase {
+public class nodegetlocalname03 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEqu
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSname";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSname</a>
  * @see <a 
href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259";>http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
  */
-public class nodegetnamespaceuri03 extends DOMTestCase {
+public class nodegetnamespaceuri03 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.junit.Test;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertNul
 /**
  * restore when doctype
  */
-public class nodegetownerdocument01 extends DOMTestCase {
+public class nodegetownerdocument01 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java
 Thu Dec 30 20:16:06 2021
@@ -27,10 +27,10 @@ import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNul
  * @see <a 
href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259";>http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
  */
 //TODO: fix when Doctypes
-public class nodegetownerdocument02 extends DOMTestCase {
+public class nodegetownerdocument02 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodegetprefix03 extends DOMTestCase {
+public class nodegetprefix03 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java
 Thu Dec 30 20:16:06 2021
@@ -26,10 +26,10 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
  */
-public class nodehasattributes01 extends DOMTestCase {
+public class nodehasattributes01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertFalse;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertFal
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
  */
-public class nodehasattributes02 extends DOMTestCase {
+public class nodehasattributes02 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
  */
-public class nodehasattributes03 extends DOMTestCase {
+public class nodehasattributes03 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a>
  */
-public class nodehasattributes04 extends DOMTestCase {
+public class nodehasattributes04 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports";>http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
  */
-public class nodeissupported01 extends DOMTestCase {
+public class nodeissupported01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports";>http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
  */
-public class nodeissupported02 extends DOMTestCase {
+public class nodeissupported02 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertFalse;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFal
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports";>http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
  */
-public class nodeissupported03 extends DOMTestCase {
+public class nodeissupported03 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.EntityReference;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertFalse;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFal
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports";>http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
  */
-public class nodeissupported04 extends DOMTestCase {
+public class nodeissupported04 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.ProcessingInstruction;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertFalse;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertFal
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports";>http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a>
  */
-public class nodeissupported05 extends DOMTestCase {
+public class nodeissupported05 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java
 Thu Dec 30 20:16:06 2021
@@ -25,7 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
+
+import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +41,7 @@ import org.w3c.domts.DOMTestCase;
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize</a>
  */
-public class nodenormalize01 extends DOMTestCase {
+public class nodenormalize01 {
     @Test
     @Ignore("entity reference")
     public void testRun() throws Throwable {
@@ -123,34 +125,34 @@ public class nodenormalize01 extends DOM
         appendedChild = element7.appendChild(text3);
         appendedChild = element1.appendChild(element7);
         elementList = element1.getChildNodes();
-        assertSize("nodeNormalize01_1Bef", 6, elementList);
+        assertEquals("nodeNormalize01_1Bef", 6, elementList.getLength());
         elementList = element2.getChildNodes();
-        assertSize("nodeNormalize01_2Bef", 3, elementList);
+        assertEquals("nodeNormalize01_2Bef", 3, elementList.getLength());
         elementList = element3.getChildNodes();
-        assertSize("nodeNormalize01_3Bef", 3, elementList);
+        assertEquals("nodeNormalize01_3Bef", 3, elementList.getLength());
         elementList = element4.getChildNodes();
-        assertSize("nodeNormalize01_4Bef", 3, elementList);
+        assertEquals("nodeNormalize01_4Bef", 3, elementList.getLength());
         elementList = element5.getChildNodes();
-        assertSize("nodeNormalize01_5Bef", 3, elementList);
+        assertEquals("nodeNormalize01_5Bef", 3, elementList.getLength());
         elementList = element6.getChildNodes();
-        assertSize("nodeNormalize01_6Bef", 3, elementList);
+        assertEquals("nodeNormalize01_6Bef", 3, elementList.getLength());
         elementList = element7.getChildNodes();
-        assertSize("nodeNormalize01_7Bef", 4, elementList);
+        assertEquals("nodeNormalize01_7Bef", 4, elementList.getLength());
         newDoc.normalize();
         elementList = element1.getChildNodes();
-        assertSize("nodeNormalize01_1Aft", 6, elementList);
+        assertEquals("nodeNormalize01_1Aft", 6, elementList.getLength());
         elementList = element2.getChildNodes();
-        assertSize("nodeNormalize01_2Aft", 1, elementList);
+        assertEquals("nodeNormalize01_2Aft", 1, elementList.getLength());
         elementList = element3.getChildNodes();
-        assertSize("nodeNormalize01_3Aft", 2, elementList);
+        assertEquals("nodeNormalize01_3Aft", 2, elementList.getLength());
         elementList = element4.getChildNodes();
-        assertSize("nodeNormalize01_4Aft", 2, elementList);
+        assertEquals("nodeNormalize01_4Aft", 2, elementList.getLength());
         elementList = element5.getChildNodes();
-        assertSize("nodeNormalize01_5Aft", 2, elementList);
+        assertEquals("nodeNormalize01_5Aft", 2, elementList.getLength());
         elementList = element6.getChildNodes();
-        assertSize("nodeNormalize01_6Aft", 2, elementList);
+        assertEquals("nodeNormalize01_6Aft", 2, elementList.getLength());
         elementList = element7.getChildNodes();
-        assertSize("nodeNormalize01_7Aft", 2, elementList);
+        assertEquals("nodeNormalize01_7Aft", 2, elementList.getLength());
 
     }
 

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix01 extends DOMTestCase {
+public class nodesetprefix01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix02 extends DOMTestCase {
+public class nodesetprefix02 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix03 extends DOMTestCase {
+public class nodesetprefix03 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259";>http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a>
  */
-public class nodesetprefix04 extends DOMTestCase {
+public class nodesetprefix04 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix05 extends DOMTestCase {
+public class nodesetprefix05 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix06 extends DOMTestCase {
+public class nodesetprefix06 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix07 extends DOMTestCase {
+public class nodesetprefix07 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix08 extends DOMTestCase {
+public class nodesetprefix08 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTru
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class nodesetprefix09 extends DOMTestCase {
+public class nodesetprefix09 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/normalize01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/normalize01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/normalize01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/normalize01.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Test;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertEqu
  */
 
 
-public class normalize01 extends DOMTestCase {
+public class normalize01 {
 
 
     @Test

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertNul
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc";>http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc</a>
  */
-public class ownerDocument01 extends DOMTestCase {
+public class ownerDocument01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement01.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a>
  */
-public class ownerElement01 extends DOMTestCase {
+public class ownerElement01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement02.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNul
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#Attr-ownerElement";>http://www.w3.org/TR/DOM-Level-2-Core/core#Attr-ownerElement</a>
  */
-public class ownerElement02 extends DOMTestCase {
+public class ownerElement02 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix01.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNul
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class prefix01 extends DOMTestCase {
+public class prefix01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix02.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class prefix02 extends DOMTestCase {
+public class prefix02 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix03.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class prefix03 extends DOMTestCase {
+public class prefix03 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix04.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNul
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  */
-public class prefix04 extends DOMTestCase {
+public class prefix04 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix05.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix05.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix05.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix05.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class prefix05 extends DOMTestCase {
+public class prefix05 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix06.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix06.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix06.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix06.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])</a>
  */
-public class prefix06 extends DOMTestCase {
+public class prefix06 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix07.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix07.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix07.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix07.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class prefix07 extends DOMTestCase {
+public class prefix07 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix08.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix08.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix08.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix08.java
 Thu Dec 30 20:16:06 2021
@@ -28,10 +28,11 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.isExpandEntityReferences;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -48,7 +49,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
  */
-public class prefix08 extends DOMTestCase {
+public class prefix08 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix09.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix09.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix09.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix09.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class prefix09 extends DOMTestCase {
+public class prefix09 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix10.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix10.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix10.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix10.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-NodeNSPrefix')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class prefix10 extends DOMTestCase {
+public class prefix10 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix11.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix11.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix11.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix11.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#";>http://www.w3.org/TR/DOM-Level-2-Core/core#</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('')/setraises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class prefix11 extends DOMTestCase {
+public class prefix11 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/publicId01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/publicId01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/publicId01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/publicId01.java
 Thu Dec 30 20:16:06 2021
@@ -26,9 +26,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId</a>
  */
-public class publicId01 extends DOMTestCase {
+public class publicId01 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java
 Thu Dec 30 20:16:06 2021
@@ -25,10 +25,11 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.isExpandEntityReferences;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -46,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElRemAtNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElRemAtNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
  */
-public class removeAttributeNS01 extends DOMTestCase {
+public class removeAttributeNS01 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java
 Thu Dec 30 20:16:06 2021
@@ -25,9 +25,9 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertEqu
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS</a>
  * @see <a 
href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=238";>http://www.w3.org/Bugs/Public/show_bug.cgi?id=238</a>
  */
-public class removeAttributeNS02 extends DOMTestCase {
+public class removeAttributeNS02 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java
 Thu Dec 30 20:16:06 2021
@@ -24,10 +24,10 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNul
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1074577549";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1074577549</a>
  */
-public class removeNamedItemNS01 extends DOMTestCase {
+public class removeNamedItemNS01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-removeNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NOT_FOUND_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-removeNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NOT_FOUND_ERR'])</a>
  */
-public class removeNamedItemNS02 extends DOMTestCase {
+public class removeNamedItemNS02 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.usa.com";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java
 Thu Dec 30 20:16:06 2021
@@ -25,10 +25,11 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.isExpandEntityReferences;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -46,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-removeNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-removeNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
  */
-public class removeNamedItemNS03 extends DOMTestCase {
+public class removeNamedItemNS03 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])</a>
  */
-public class setAttributeNS01 extends DOMTestCase {
+public class setAttributeNS01 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.nist.gov";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class setAttributeNS02 extends DOMTestCase {
+public class setAttributeNS02 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.nist.gov";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java
 Thu Dec 30 20:16:06 2021
@@ -25,10 +25,11 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.isExpandEntityReferences;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -46,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
  */
-public class setAttributeNS03 extends DOMTestCase {
+public class setAttributeNS03 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#";>http://www.w3.org/TR/DOM-Level-2-Core/core#</a>
  */
-public class setAttributeNS04 extends DOMTestCase {
+public class setAttributeNS04 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAttrNS</a>
  */
-public class setAttributeNS05 extends DOMTestCase {
+public class setAttributeNS05 {
     @Test
     public void testRun() throws Throwable {
         String localName = "newAttr";

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class setAttributeNS06 extends DOMTestCase {
+public class setAttributeNS06 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.nist.gov";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a>
  */
-public class setAttributeNS07 extends DOMTestCase {
+public class setAttributeNS07 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.nist.gov";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a>
  */
-public class setAttributeNS09 extends DOMTestCase {
+public class setAttributeNS09 {
     @Test
     public void testRun() throws Throwable {
         String localName = "newAttr";

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])</a>
  */
-public class setAttributeNodeNS01 extends DOMTestCase {
+public class setAttributeNodeNS01 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.newattr.com";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java
 Thu Dec 30 20:16:06 2021
@@ -25,10 +25,11 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.isExpandEntityReferences;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -46,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
  */
-public class setAttributeNodeNS02 extends DOMTestCase {
+public class setAttributeNodeNS02 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNull;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNul
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a>
  */
-public class setAttributeNodeNS03 extends DOMTestCase {
+public class setAttributeNodeNS03 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.newattr.com";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a>
  */
-public class setAttributeNodeNS04 extends DOMTestCase {
+public class setAttributeNodeNS04 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -47,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='WRONG_DOCUMENT_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='WRONG_DOCUMENT_ERR'])</a>
  */
-public class setAttributeNodeNS05 extends DOMTestCase {
+public class setAttributeNodeNS05 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.newattr.com";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])</a>
  */
-public class setNamedItemNS01 extends DOMTestCase {
+public class setNamedItemNS01 {
     @Test
     public void testRun() throws Throwable {
         Document doc;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java
 Thu Dec 30 20:16:06 2021
@@ -24,9 +24,9 @@ package org.w3c.domts.level2.core;
 
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='WRONG_DOCUMENT_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='WRONG_DOCUMENT_ERR'])</a>
  */
-public class setNamedItemNS02 extends DOMTestCase {
+public class setNamedItemNS02 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.usa.com";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D080";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D080</a>
  */
-public class setNamedItemNS03 extends DOMTestCase {
+public class setNamedItemNS03 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.nist.gov";;

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java
 Thu Dec 30 20:16:06 2021
@@ -25,10 +25,11 @@ package org.w3c.domts.level2.core;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.*;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.w3c.domts.DOMTest.isExpandEntityReferences;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -46,7 +47,7 @@ import static org.junit.Assert.assertTru
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a>
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a>
  */
-public class setNamedItemNS04 extends DOMTestCase {
+public class setNamedItemNS04 {
     @Test
     @Ignore
     public void testRun() throws Throwable {

Modified: 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java?rev=1896538&r1=1896537&r2=1896538&view=diff
==============================================================================
--- 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java
 (original)
+++ 
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java
 Thu Dec 30 20:16:06 2021
@@ -27,9 +27,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.domts.DOMTestCase;
 
 import static org.junit.Assert.assertEquals;
+import static org.w3c.domts.DOMTest.load;
 
 
 /**
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertEqu
  *
  * @see <a 
href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a>
  */
-public class setNamedItemNS05 extends DOMTestCase {
+public class setNamedItemNS05 {
     @Test
     public void testRun() throws Throwable {
         String namespaceURI = "http://www.usa.com";;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org

Reply via email to