Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS05.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -40,31 +41,20 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateattributeNS05 { @Test - public void testRun() throws Throwable { - Document doc; + void testRun() throws Throwable { Document newDoc; DocumentType docType = null; - DOMImplementation domImpl; Attr attribute; String namespaceURI = null; String qualifiedName = "abc:def"; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:doc", docType); - { - boolean success = false; - try { - attribute = newDoc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("documentcreateattributeNS05,null value for \n" + - " namespaceURI, and a valid qualifiedName", success); - } - + DOMException ex = assertThrows(DOMException.class, () -> newDoc.createAttributeNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "documentcreateattributeNS05,null value for namespaceURI, and a valid qualifiedName"); } /**
Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS06.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,14 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.*; +import org.junit.jupiter.api.Test; +import org.w3c.dom.DOMException; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -41,29 +45,17 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateattributeNS06 { @Test - public void testRun() throws Throwable { - Document doc; - Document newDoc; + void testRun() throws Throwable { DocumentType docType = null; - DOMImplementation domImpl; - Attr attribute; String namespaceURI = "http://www.w3.org/XML/1998 /namespace"; String qualifiedName = "xml:root"; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:doc", docType); - - { - boolean success = false; - try { - attribute = newDoc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("documentcreateattributeNS06,xml:root and namespaceURI as http://www.w3.org/XML/1998 /namespace.", success); - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:doc", docType); + DOMException ex = assertThrows(DOMException.class, () -> newDoc.createAttributeNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "documentcreateattributeNS06,xml:root and namespaceURI as http://www.w3.org/XML/1998 /namespace."); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS07.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.Attr; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -44,23 +44,13 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateattributeNS07 { @Test - public void testRun() throws Throwable { - Document doc; - Attr attribute; + void testRun() throws Throwable { String namespaceURI = "http://www.W3.org/2000/xmlns";; String qualifiedName = "xmlns"; - doc = load("staffNS", false); - - { - boolean success = false; - try { - attribute = doc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("documentcreateattributeNS07, qualifiedName as xmlns and namespaceURI as http://www.W3.org/2000/xmlns";, success); - } + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "documentcreateattributeNS07, qualifiedName as xmlns and namespaceURI as http://www.W3.org/2000/xmlns";); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS01.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -41,28 +41,21 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateelementNS01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; + void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/DOM/Test/level2";; String qualifiedName = "XML:XML"; - String nodeName; - String nsURI; - String localName; - String prefix; - String tagName; - doc = load("staffNS", false); - element = doc.createElementNS(namespaceURI, qualifiedName); - nodeName = element.getNodeName(); - nsURI = element.getNamespaceURI(); - localName = element.getLocalName(); - prefix = element.getPrefix(); - tagName = element.getTagName(); - assertEquals("documentcreateelementNS01_nodeName", "XML:XML", nodeName); - assertEquals("documentcreateelementNS01_namespaceURI", "http://www.w3.org/DOM/Test/level2";, nsURI); - assertEquals("documentcreateelementNS01_localName", "XML", localName); - assertEquals("documentcreateelementNS01_prefix", "XML", prefix); - assertEquals("documentcreateelementNS01_tagName", "XML:XML", tagName); + Document doc = load("staffNS", false); + Element element = doc.createElementNS(namespaceURI, qualifiedName); + String nodeName = element.getNodeName(); + String nsURI = element.getNamespaceURI(); + String localName = element.getLocalName(); + String prefix = element.getPrefix(); + String tagName = element.getTagName(); + assertEquals("XML:XML", nodeName, "documentcreateelementNS01_nodeName"); + assertEquals("http://www.w3.org/DOM/Test/level2";, nsURI, "documentcreateelementNS01_namespaceURI"); + assertEquals("XML", localName, "documentcreateelementNS01_localName"); + assertEquals("XML", prefix, "documentcreateelementNS01_prefix"); + assertEquals("XML:XML", tagName, "documentcreateelementNS01_tagName"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS02.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -42,24 +42,13 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateelementNS02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; + void testRun() throws Throwable { String namespaceURI = null; String qualifiedName = "^^"; - doc = load("staffNS", false); - - { - boolean success = false; - try { - element = doc.createElementNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("documentcreateelementNS02", success); - } - + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createElementNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "documentcreateelementNS02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS05.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -44,25 +44,14 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateelementNS05 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; + void testRun() throws Throwable { String namespaceURI = null; String qualifiedName = "null:xml"; - doc = load("staffNS", false); - - { - boolean success = false; - try { - element = doc.createElementNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("documentcreateelementNS05, null value for" + - " namespaceURI, and a valid qualifiedName", success); - } + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createElementNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "documentcreateelementNS05, null value for namespaceURI, and a valid qualifiedName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS06.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,14 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.*; +import org.junit.jupiter.api.Test; +import org.w3c.dom.DOMException; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -42,29 +46,17 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateelementNS06 { @Test - public void testRun() throws Throwable { - Document doc; - Document newDoc; + void testRun() throws Throwable { DocumentType docType = null; - DOMImplementation domImpl; - Element element; String namespaceURI = "http://www.w3.org/xml/1998/namespace "; String qualifiedName = "xml:root"; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:doc", docType); - - { - boolean success = false; - try { - element = newDoc.createElementNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("documentcreateelementNS06,xml:root and namespaceURI as http://www.w3.org/xml/1998/namespace ", success); - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:doc", docType); + DOMException ex = assertThrows(DOMException.class, () -> newDoc.createElementNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "documentcreateelementNS06,xml:root and namespaceURI as http://www.w3.org/xml/1998/namespace";); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementbyid01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementbyid01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementbyid01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementbyid01.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -42,14 +42,11 @@ import static org.w3c.domts.DOMTest.load */ public class documentgetelementbyid01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; + void testRun() throws Throwable { String elementId = "---"; - doc = load("staffNS", false); - element = doc.getElementById(elementId); - assertNull("documentgetelementbyid01", element); - + Document doc = load("staffNS", false); + Element element = doc.getElementById(elementId); + assertNull(element, "documentgetelementbyid01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS01.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -45,20 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentgetelementsbytagnameNS01 { @Test - public void testRun() throws Throwable { - Document doc; - Document newDoc; + void testRun() throws Throwable { DocumentType docType = null; - - DOMImplementation domImpl; - NodeList childList; String nullNS = null; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument(nullNS, "root", docType); - childList = newDoc.getElementsByTagNameNS("*", "*"); - assertEquals("documentgetelementsbytagnameNS01", 1, childList.getLength()); + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument(nullNS, "root", docType); + NodeList childList = newDoc.getElementsByTagNameNS("*", "*"); + assertEquals(1, childList.getLength(), "documentgetelementsbytagnameNS01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS02.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,18 +45,13 @@ import static org.w3c.domts.DOMTest.load */ public class documentgetelementsbytagnameNS02 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - Element element; - NodeList childList; - Node appendedChild; - doc = load("staffNS", true); - docElem = doc.getDocumentElement(); - element = doc.createElementNS("test", "employeeId"); - appendedChild = docElem.appendChild(element); - childList = doc.getElementsByTagNameNS("*", "employeeId"); - assertEquals("documentgetelementsbytagnameNS02", 6, childList.getLength()); + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Element docElem = doc.getDocumentElement(); + Element element = doc.createElementNS("test", "employeeId"); + docElem.appendChild(element); + NodeList childList = doc.getElementsByTagNameNS("*", "employeeId"); + assertEquals(6, childList.getLength(), "documentgetelementsbytagnameNS02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS03.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -42,12 +42,10 @@ import static org.w3c.domts.DOMTest.load */ public class documentgetelementsbytagnameNS03 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList childList; - doc = load("staffNS", false); - childList = doc.getElementsByTagNameNS("**", "*"); - assertEquals("documentgetelementsbytagnameNS03", 0, childList.getLength()); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList childList = doc.getElementsByTagNameNS("**", "*"); + assertEquals(0, childList.getLength(), "documentgetelementsbytagnameNS03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS04.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,14 +43,12 @@ import static org.w3c.domts.DOMTest.load */ public class documentgetelementsbytagnameNS04 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList childList; + void testRun() throws Throwable { String nullNS = null; - doc = load("staffNS", false); - childList = doc.getElementsByTagNameNS(nullNS, "0"); - assertEquals("documentgetelementsbytagnameNS04", 0, childList.getLength()); + Document doc = load("staffNS", false); + NodeList childList = doc.getElementsByTagNameNS(nullNS, "0"); + assertEquals(0, childList.getLength(), "documentgetelementsbytagnameNS04"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS05.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,12 +43,10 @@ import static org.w3c.domts.DOMTest.load */ public class documentgetelementsbytagnameNS05 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList childList; - doc = load("staffNS", false); - childList = doc.getElementsByTagNameNS("null", "elementId"); - assertEquals("documentgetelementsbytagnameNS05", 0, childList.getLength()); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList childList = doc.getElementsByTagNameNS("null", "elementId"); + assertEquals(0, childList.getLength(), "documentgetelementsbytagnameNS05"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode01.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,10 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,30 +44,21 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attr; - NodeList childList; - Node importedAttr; - String nodeName; - int nodeType; - String nodeValue; - - String sExpected = "Y";//TODO: "Yes" if Entities - - doc = load("staffNS", true); - childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); - element = (Element) childList.item(1); - attr = element.getAttributeNode("street"); - importedAttr = doc.importNode(attr, false); - nodeName = importedAttr.getNodeName(); - nodeValue = importedAttr.getNodeValue(); - nodeType = importedAttr.getNodeType(); - assertEquals("documentimportnode01_nodeName", "street", nodeName); - assertEquals("documentimportnode01_nodeType", 2, nodeType); - assertEquals("documentimportnode01_nodeValue", sExpected, nodeValue); - + void testRun() throws Throwable { + // TODO: "Yes" if Entities + String sExpected = "Y"; + + Document doc = load("staffNS", true); + NodeList childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); + Element element = (Element) childList.item(1); + Attr attr = element.getAttributeNode("street"); + Node importedAttr = doc.importNode(attr, false); + String nodeName = importedAttr.getNodeName(); + String nodeValue = importedAttr.getNodeValue(); + int nodeType = importedAttr.getNodeType(); + assertEquals("street", nodeName, "documentimportnode01_nodeName"); + assertEquals(2, nodeType, "documentimportnode01_nodeType"); + assertEquals(sExpected, nodeValue, "documentimportnode01_nodeValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode02.java Sun Feb 6 01:51:55 2022 @@ -22,14 +22,14 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -48,28 +48,19 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Document docImported; - Element element; - Attr attr; - Node importedAttr; - String nodeName; - int nodeType; - String nodeValue; - doc = load("staffNS", true); - docImported = load("staff", true); - element = doc.getElementById("CANADA"); - attr = element.getAttributeNodeNS("http://www.nist.gov";, "zone"); - importedAttr = docImported.importNode(attr, false); - nodeName = importedAttr.getNodeName(); - nodeType = importedAttr.getNodeType(); - nodeValue = importedAttr.getNodeValue(); - assertEquals("documentimportnode02_nodeName", "emp:zone", nodeName); - assertEquals("documentimportnode02_nodeType", 2, nodeType); - assertEquals("documentimportnode02_nodeValue", "CANADA", nodeValue); - + Document doc = load("staffNS", true); + Document docImported = load("staff", true); + Element element = doc.getElementById("CANADA"); + Attr attr = element.getAttributeNodeNS("http://www.nist.gov";, "zone"); + Node importedAttr = docImported.importNode(attr, false); + String nodeName = importedAttr.getNodeName(); + int nodeType = importedAttr.getNodeType(); + String nodeValue = importedAttr.getNodeValue(); + assertEquals("emp:zone", nodeName, "documentimportnode02_nodeName"); + assertEquals(2, nodeType, "documentimportnode02_nodeType"); + assertEquals("CANADA", nodeValue, "documentimportnode02_nodeValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode03.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,28 +46,19 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - Attr attr; - NodeList childList; - Node importedAttr; - String nodeName; - int nodeType; - String nodeValue; - doc = load("staffNS", true); - childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); - element = (Element) childList.item(1); - attr = element.getAttributeNode("defaultAttr"); - importedAttr = doc.importNode(attr, false); - nodeName = importedAttr.getNodeName(); - nodeValue = importedAttr.getNodeValue(); - nodeType = importedAttr.getNodeType(); - assertEquals("documentimportnode03_nodeName", "defaultAttr", nodeName); - assertEquals("documentimportnode03_nodeType", 2, nodeType); - assertEquals("documentimportnode03_nodeValue", "defaultVal", nodeValue); - + Document doc = load("staffNS", true); + NodeList childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); + Element element = (Element) childList.item(1); + Attr attr = element.getAttributeNode("defaultAttr"); + Node importedAttr = doc.importNode(attr, false); + String nodeName = importedAttr.getNodeName(); + String nodeValue = importedAttr.getNodeValue(); + int nodeType = importedAttr.getNodeType(); + assertEquals("defaultAttr", nodeName, "documentimportnode03_nodeName"); + assertEquals(2, nodeType, "documentimportnode03_nodeType"); + assertEquals("defaultVal", nodeValue, "documentimportnode03_nodeValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode04.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,34 +46,23 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Document newDoc; DocumentType docType = null; - DOMImplementation domImpl; - Element element; - Attr attr; - NodeList childList; - Node importedAttr; - String nodeName; - int nodeType; - String nodeValue; - doc = load("staffNS", true); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "l2:root", docType); - childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); - element = (Element) childList.item(1); - attr = element.getAttributeNode("defaultAttr"); - importedAttr = newDoc.importNode(attr, true); - nodeName = importedAttr.getNodeName(); - nodeValue = importedAttr.getNodeValue(); - nodeType = importedAttr.getNodeType(); - assertEquals("documentimportnode04_nodeName", "defaultAttr", nodeName); - assertEquals("documentimportnode04_nodeType", 2, nodeType); - assertEquals("documentimportnode04_nodeValue", "defaultVal", nodeValue); - + Document doc = load("staffNS", true); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "l2:root", docType); + NodeList childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); + Element element = (Element) childList.item(1); + Attr attr = element.getAttributeNode("defaultAttr"); + Node importedAttr = newDoc.importNode(attr, true); + String nodeName = importedAttr.getNodeName(); + String nodeValue = importedAttr.getNodeValue(); + int nodeType = importedAttr.getNodeType(); + assertEquals("defaultAttr", nodeName, "documentimportnode04_nodeName"); + assertEquals(2, nodeType, "documentimportnode04_nodeType"); + assertEquals("defaultVal", nodeValue, "documentimportnode04_nodeValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode05.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,28 +46,19 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode05 { @Test - public void testRun() throws Throwable { - Document doc; - Document docImported; - Attr attr; - Node importedAttr; - String nodeName; - int nodeType; - String nodeValue; - String namespaceURI; - doc = load("staffNS", true); - docImported = load("staff", true); - attr = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "a_:b0"); - importedAttr = docImported.importNode(attr, false); - nodeName = importedAttr.getNodeName(); - nodeValue = importedAttr.getNodeValue(); - nodeType = importedAttr.getNodeType(); - namespaceURI = importedAttr.getNamespaceURI(); - assertEquals("documentimportnode05_nodeName", "a_:b0", nodeName); - assertEquals("documentimportnode05_nodeType", 2, nodeType); - assertEquals("documentimportnode05_nodeValue", "", nodeValue); - assertEquals("documentimportnode05_namespaceURI", "http://www.w3.org/DOM/Test";, namespaceURI); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Document docImported = load("staff", true); + Attr attr = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "a_:b0"); + Node importedAttr = docImported.importNode(attr, false); + String nodeName = importedAttr.getNodeName(); + String nodeValue = importedAttr.getNodeValue(); + int nodeType = importedAttr.getNodeType(); + String namespaceURI = importedAttr.getNamespaceURI(); + assertEquals("a_:b0", nodeName, "documentimportnode05_nodeName"); + assertEquals(2, nodeType, "documentimportnode05_nodeType"); + assertEquals("", nodeValue, "documentimportnode05_nodeValue"); + assertEquals("http://www.w3.org/DOM/Test";, namespaceURI, "documentimportnode05_namespaceURI"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode06.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -42,21 +43,11 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode06 { @Test - public void testRun() throws Throwable { - Document doc; - Document docImported; - doc = load("staffNS", true); - - { - boolean success = false; - try { - docImported = (Document) doc.importNode(doc, false); - } catch (DOMException ex) { - success = (ex.code == DOMException.NOT_SUPPORTED_ERR); - } - assertTrue("documentimportnode06", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + DOMException ex = assertThrows(DOMException.class, () -> doc.importNode(doc, false)); + assertEquals(DOMException.NOT_SUPPORTED_ERR, ex.code, "documentimportnode06"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode07.java Sun Feb 6 01:51:55 2022 @@ -22,14 +22,15 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Node; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -51,24 +52,14 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode07 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; Node imported; - DocumentType docType; - doc = load("staffNS", true); - docType = doc.getDoctype(); - - { - boolean success = false; - try { - imported = doc.importNode(docType, true); - } catch (DOMException ex) { - success = (ex.code == DOMException.NOT_SUPPORTED_ERR); - } - assertTrue("documentimportnode07", success); - } + Document doc = load("staffNS", true); + DocumentType docType = doc.getDoctype(); + DOMException ex = assertThrows(DOMException.class, () -> doc.importNode(docType, true)); + assertEquals(DOMException.NOT_SUPPORTED_ERR, ex.code, "documentimportnode07"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode08.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode08.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode08.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode08.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,16 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.*; +import org.junit.jupiter.api.Test; +import org.w3c.dom.DOMException; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; import javax.xml.parsers.DocumentBuilderFactory; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -44,27 +48,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode08 { @Test - public void testRun() throws Throwable { - Document doc; - Node imported; - DocumentType docType; - DOMImplementation domImpl; + void testRun() throws Throwable { String nullNS = null; - doc = load("staffNS", true); - domImpl = DocumentBuilderFactory.newInstance().newDocumentBuilder().getDOMImplementation(); - docType = domImpl.createDocumentType("test:root", nullNS, nullNS); - - { - boolean success = false; - try { - imported = doc.importNode(docType, true); - } catch (DOMException ex) { - success = (ex.code == DOMException.NOT_SUPPORTED_ERR); - } - assertTrue("documentimportnode08, Since DocumentType nodes cannot be imported, a NOT_SUPPORTED_ERR should be raised.", success); - } + Document doc = load("staffNS", true); + DOMImplementation domImpl = DocumentBuilderFactory.newInstance().newDocumentBuilder().getDOMImplementation(); + DocumentType docType = domImpl.createDocumentType("test:root", nullNS, nullNS); + DOMException ex = assertThrows(DOMException.class, () -> doc.importNode(docType, true)); + assertEquals(DOMException.NOT_SUPPORTED_ERR, ex.code, "documentimportnode08, Since DocumentType nodes cannot be imported, a NOT_SUPPORTED_ERR should be raised."); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode09.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode09.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode09.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode09.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -46,23 +46,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode09 { @Test - public void testRun() throws Throwable { - Document doc; - DocumentFragment docFragment; - NodeList childList; - boolean success; - Node addressNode; - Node appendedChild; - Node importedDocFrag; - doc = load("staffNS", true); - docFragment = doc.createDocumentFragment(); - childList = doc.getElementsByTagNameNS("*", "address"); - addressNode = childList.item(0); - appendedChild = docFragment.appendChild(addressNode); - importedDocFrag = doc.importNode(docFragment, false); - success = importedDocFrag.hasChildNodes(); - assertFalse("documentimportnode09", success); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + DocumentFragment docFragment = doc.createDocumentFragment(); + NodeList childList = doc.getElementsByTagNameNS("*", "address"); + Node addressNode = childList.item(0); + docFragment.appendChild(addressNode); + Node importedDocFrag = doc.importNode(docFragment, false); + boolean success = importedDocFrag.hasChildNodes(); + assertFalse(success, "documentimportnode09"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode10.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode10.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode10.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode10.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -44,34 +44,18 @@ import static org.w3c.domts.DOMTest.load * @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#Core-Document-importNode";>http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a> */ - -/** - * seems to run infinite loop--TODO--put back in with newstore2 - * - * @ignore true - */ public class documentimportnode10 { @Test - public void testRun() throws Throwable { - Document doc; - DocumentFragment docFragment; - NodeList childList; - boolean success; - Node addressNode; - Node appendedChild; - Node importedDocFrag; - doc = load("staffNS", true); - docFragment = doc.createDocumentFragment(); - childList = doc.getElementsByTagNameNS("*", "address"); - addressNode = childList.item(0); - - appendedChild = docFragment.appendChild(addressNode); - System.out.println(" PAss 0"); - importedDocFrag = doc.importNode(docFragment, true); - System.out.println(" PAss 1"); - success = importedDocFrag.hasChildNodes(); - assertTrue("documentimportnode10", success); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + DocumentFragment docFragment = doc.createDocumentFragment(); + NodeList childList = doc.getElementsByTagNameNS("*", "address"); + Node addressNode = childList.item(0); + + docFragment.appendChild(addressNode); + Node importedDocFrag = doc.importNode(docFragment, true); + boolean success = importedDocFrag.hasChildNodes(); + assertTrue(success, "documentimportnode10"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode11.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode11.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode11.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode11.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -46,22 +46,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode11 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElement; - Node imported; - boolean success; - String nodeNameOrig; - String nodeNameImported; - doc = load("staffNS", true); - docElement = doc.getDocumentElement(); - imported = doc.importNode(docElement, false); - success = imported.hasChildNodes(); - assertFalse("documentimportnode11", success); - nodeNameImported = imported.getNodeName(); - nodeNameOrig = docElement.getNodeName(); - assertEquals("documentimportnode11_NodeName", nodeNameImported, nodeNameOrig); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Element docElement = doc.getDocumentElement(); + Node imported = doc.importNode(docElement, false); + boolean success = imported.hasChildNodes(); + assertFalse(success, "documentimportnode11"); + String nodeNameImported = imported.getNodeName(); + String nodeNameOrig = docElement.getNodeName(); + assertEquals(nodeNameImported, nodeNameOrig, "documentimportnode11_NodeName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode12.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode12.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode12.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode12.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -45,25 +45,16 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode12 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList childList; - Node imported; - Node addressElem; - NodeList addressElemChildren; - NodeList importedChildren; - int addressElemLen; - int importedLen; - doc = load("staffNS", true); - childList = doc.getElementsByTagNameNS("*", "address"); - addressElem = childList.item(0); - imported = doc.importNode(addressElem, true); - addressElemChildren = addressElem.getChildNodes(); - importedChildren = imported.getChildNodes(); - addressElemLen = addressElemChildren.getLength(); - importedLen = importedChildren.getLength(); - assertEquals("documentimportnode12", importedLen, addressElemLen); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList childList = doc.getElementsByTagNameNS("*", "address"); + Node addressElem = childList.item(0); + Node imported = doc.importNode(addressElem, true); + NodeList addressElemChildren = addressElem.getChildNodes(); + NodeList importedChildren = imported.getChildNodes(); + int addressElemLen = addressElemChildren.getLength(); + int importedLen = importedChildren.getLength(); + assertEquals(importedLen, addressElemLen, "documentimportnode12"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode13.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode13.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode13.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode13.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -45,21 +45,14 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode13 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList childList; - Node imported; - NodeList importedList; - Node employeeElem; - int importedLen; - doc = load("staffNS", true); - childList = doc.getElementsByTagNameNS("*", "employee"); - employeeElem = childList.item(0); - imported = doc.importNode(employeeElem, false); - importedList = imported.getChildNodes(); - importedLen = importedList.getLength(); - assertEquals("documentimportnode13", 0, importedLen); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList childList = doc.getElementsByTagNameNS("*", "employee"); + Node employeeElem = childList.item(0); + Node imported = doc.importNode(employeeElem, false); + NodeList importedList = imported.getChildNodes(); + int importedLen = importedList.getLength(); + assertEquals(0, importedLen, "documentimportnode13"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode14.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode14.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode14.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode14.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -43,30 +43,20 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode14 { @Test - public void testRun() throws Throwable { - Document doc; - Document newDoc; - DOMImplementation domImpl; + void testRun() throws Throwable { DocumentType nullDocType = null; - - NodeList childList; - Node imported; - Node employeeElem; - Attr attrNode; - String attrValue; String nullNS = null; - doc = load("staffNS", true); - childList = doc.getElementsByTagNameNS("*", "employee"); - employeeElem = childList.item(3); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument(nullNS, "staff", nullDocType); - imported = newDoc.importNode(employeeElem, true); - attrNode = ((Element) /*Node */imported).getAttributeNodeNS(nullNS, "defaultAttr"); - assertNull("defaultAttrNotImported", attrNode); - attrValue = ((Element) /*Node */imported).getAttributeNS("http://www.w3.org/2000/xmlns/";, "emp"); - assertEquals("explicitAttrImported", "http://www.nist.gov";, attrValue); - + Document doc = load("staffNS", true); + NodeList childList = doc.getElementsByTagNameNS("*", "employee"); + Node employeeElem = childList.item(3); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument(nullNS, "staff", nullDocType); + Node imported = newDoc.importNode(employeeElem, true); + Attr attrNode = ((Element) /*Node */imported).getAttributeNodeNS(nullNS, "defaultAttr"); + assertNull(attrNode, "defaultAttrNotImported"); + String attrValue = ((Element) /*Node */imported).getAttributeNS("http://www.w3.org/2000/xmlns/";, "emp"); + assertEquals("http://www.nist.gov";, attrValue, "explicitAttrImported"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode15.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode15.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode15.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode15.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -42,22 +42,15 @@ import static org.w3c.domts.DOMTest.load * @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#Core-Document-importNode";>http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a> */ -//TODO: BUG public class documentimportnode15 { @Test - public void testRun() throws Throwable { - Document doc; - Document docImp; - Node textImport; - Node textToImport; - String nodeValue; - doc = load("staffNS", true); - docImp = load("staffNS", true); - textToImport = doc.createTextNode("Document.importNode test for a TEXT_NODE"); - textImport = doc.importNode(textToImport, true); - nodeValue = textImport.getNodeValue(); - assertEquals("documentimportnode15", "Document.importNode test for a TEXT_NODE", nodeValue); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + load("staffNS", true); + Node textToImport = doc.createTextNode("Document.importNode test for a TEXT_NODE"); + Node textImport = doc.importNode(textToImport, true); + String nodeValue = textImport.getNodeValue(); + assertEquals("Document.importNode test for a TEXT_NODE", nodeValue, "documentimportnode15"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode17.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode17.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode17.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode17.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,19 +44,13 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode17 { @Test - public void testRun() throws Throwable { - Document doc; - Document docImp; - Node commentImport; - Node commentToImport; - String nodeValue; - doc = load("staffNS", true); - docImp = load("staffNS", true); - commentToImport = doc.createComment("Document.importNode test for a COMMENT_NODE"); - commentImport = doc.importNode(commentToImport, true); - nodeValue = commentImport.getNodeValue(); - assertEquals("documentimportnode17", "Document.importNode test for a COMMENT_NODE", nodeValue); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + load("staffNS", true); + Node commentToImport = doc.createComment("Document.importNode test for a COMMENT_NODE"); + Node commentImport = doc.importNode(commentToImport, true); + String nodeValue = commentImport.getNodeValue(); + assertEquals("Document.importNode test for a COMMENT_NODE", nodeValue, "documentimportnode17"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode18.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode18.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode18.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode18.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.ProcessingInstruction; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,22 +44,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode18 { @Test - public void testRun() throws Throwable { - Document doc; - Document docImp; - ProcessingInstruction piImport; - ProcessingInstruction piToImport; - String PIData; - String PITarget; - doc = load("staffNS", true); - docImp = load("staffNS", true); - piToImport = doc.createProcessingInstruction("Target", "Data"); - piImport = (ProcessingInstruction) doc.importNode(piToImport, false); - PITarget = piImport.getTarget(); - PIData = piImport.getData(); - assertEquals("documentimportnode18_Target", "Target", PITarget); - assertEquals("documentimportnode18_Data", "Data", PIData); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + load("staffNS", true); + ProcessingInstruction piToImport = doc.createProcessingInstruction("Target", "Data"); + ProcessingInstruction piImport = (ProcessingInstruction) doc.importNode(piToImport, false); + String PITarget = piImport.getTarget(); + String PIData = piImport.getData(); + assertEquals("Target", PITarget, "documentimportnode18_Target"); + assertEquals("Data", PIData, "documentimportnode18_Data"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode19.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode19.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode19.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode19.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,53 +44,37 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode19 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; DocumentType docTypeNull = null; - Document docImp; - DOMImplementation domImpl; - DocumentType docType; - NamedNodeMap nodeMap; - Entity entity2; - Entity entity6; - Entity entityImp2; - Entity entityImp6; - String nodeName; - String systemId; - String notationName; - String nodeNameImp; - String systemIdImp; - String notationNameImp; - doc = load("staffNS", true); - domImpl = doc.getImplementation(); - docType = doc.getDoctype(); - docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); - nodeMap = docType.getEntities(); - entity2 = (Entity) nodeMap.getNamedItem("ent2"); - entity6 = (Entity) nodeMap.getNamedItem("ent6"); - entityImp2 = (Entity) docImp.importNode(entity2, false); - entityImp6 = (Entity) docImp.importNode(entity6, true); - nodeName = entity2.getNodeName(); - nodeNameImp = entityImp2.getNodeName(); - assertEquals("documentimportnode19_Ent2NodeName", nodeName, nodeNameImp); + Document doc = load("staffNS", true); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = doc.getDoctype(); + Document docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); + NamedNodeMap nodeMap = docType.getEntities(); + Entity entity2 = (Entity) nodeMap.getNamedItem("ent2"); + Entity entity6 = (Entity) nodeMap.getNamedItem("ent6"); + Entity entityImp2 = (Entity) docImp.importNode(entity2, false); + Entity entityImp6 = (Entity) docImp.importNode(entity6, true); + String nodeName = entity2.getNodeName(); + String nodeNameImp = entityImp2.getNodeName(); + assertEquals(nodeName, nodeNameImp, "documentimportnode19_Ent2NodeName"); nodeName = entity6.getNodeName(); nodeNameImp = entityImp6.getNodeName(); - assertEquals("documentimportnode19_Ent6NodeName", nodeName, nodeNameImp); - systemId = entity2.getSystemId(); - systemIdImp = entityImp2.getSystemId(); - assertEquals("documentimportnode19_Ent2SystemId", systemId, systemIdImp); + assertEquals(nodeName, nodeNameImp, "documentimportnode19_Ent6NodeName"); + String systemId = entity2.getSystemId(); + String systemIdImp = entityImp2.getSystemId(); + assertEquals(systemId, systemIdImp, "documentimportnode19_Ent2SystemId"); systemId = entity6.getSystemId(); systemIdImp = entityImp6.getSystemId(); - assertEquals("documentimportnode19_Ent6SystemId", systemId, systemIdImp); - notationName = entity2.getNotationName(); - notationNameImp = entityImp2.getNotationName(); - assertEquals("documentimportnode19_Ent2NotationName", notationName, notationNameImp); + assertEquals(systemId, systemIdImp, "documentimportnode19_Ent6SystemId"); + String notationName = entity2.getNotationName(); + String notationNameImp = entityImp2.getNotationName(); + assertEquals(notationName, notationNameImp, "documentimportnode19_Ent2NotationName"); notationName = entity6.getNotationName(); notationNameImp = entityImp6.getNotationName(); - assertEquals("documentimportnode19_Ent6NotationName", notationName, notationNameImp); - + assertEquals(notationName, notationNameImp, "documentimportnode19_Ent6NotationName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode20.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode20.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode20.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode20.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.CharacterData; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -47,48 +47,30 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode20 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Document docImp; - DOMImplementation domImpl; - DocumentType docType; DocumentType docTypeNull = null; - NamedNodeMap nodeMap; - Entity entity4; - Entity entityImp4; - Element element; - CharacterData cdata; - ProcessingInstruction pi; - NodeList childList; - NodeList elemchildList; - String ent4Name; - String ent4ImpName; - String cdataVal; - String piTargetVal; - String piDataVal; - doc = load("staffNS", true); - domImpl = doc.getImplementation(); - docType = doc.getDoctype(); - docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); - nodeMap = docType.getEntities(); - entity4 = (Entity) nodeMap.getNamedItem("ent4"); - entityImp4 = (Entity) docImp.importNode(entity4, true); - childList = entityImp4.getChildNodes(); - element = (Element) childList.item(0); - elemchildList = element.getChildNodes(); - cdata = (CharacterData) elemchildList.item(0); - pi = (ProcessingInstruction) childList.item(1); - ent4Name = entity4.getNodeName(); - ent4ImpName = entityImp4.getNodeName(); - cdataVal = cdata.getData(); - piTargetVal = pi.getTarget(); - piDataVal = pi.getData(); + Document doc = load("staffNS", true); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = doc.getDoctype(); + Document docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); + NamedNodeMap nodeMap = docType.getEntities(); + Entity entity4 = (Entity) nodeMap.getNamedItem("ent4"); + Entity entityImp4 = (Entity) docImp.importNode(entity4, true); + NodeList childList = entityImp4.getChildNodes(); + Element element = (Element) childList.item(0); + NodeList elemchildList = element.getChildNodes(); + CharacterData cdata = (CharacterData) elemchildList.item(0); + ProcessingInstruction pi = (ProcessingInstruction) childList.item(1); + String ent4Name = entity4.getNodeName(); + String ent4ImpName = entityImp4.getNodeName(); + String cdataVal = cdata.getData(); + String piTargetVal = pi.getTarget(); + String piDataVal = pi.getData(); assertEquals("documentimportnode20_Ent4NodeName", ent4Name, ent4ImpName); assertEquals("documentimportnode20_Cdata", "Element data", cdataVal); assertEquals("documentimportnode20_PITarget", "PItarget", piTargetVal); assertEquals("documentimportnode20_PIData", "PIdata", piDataVal); - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode21.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode21.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode21.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode21.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -50,60 +50,38 @@ import static org.w3c.domts.DOMTest.load */ public class documentimportnode21 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; DocumentType docTypeNull = null; - Document docImp; - DOMImplementation domImpl; - NodeList addressList; - NodeList addressChildList; - Element element; - EntityReference entRef2; - EntityReference entRefImp2; - EntityReference entRef3; - EntityReference entRefImp3; - String nodeName2; - String nodeName3; - String nodeNameImp2; - String nodeNameImp3; - NodeList nodes; - Node nodeImp3; - Node nodeImp2; - String nodeValueImp2; - String nodeValueImp3; - doc = load("staffNS", true); - domImpl = doc.getImplementation(); - docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); - addressList = doc.getElementsByTagName("address"); - element = (Element) addressList.item(1); - addressChildList = element.getChildNodes(); - assertTrue(addressChildList.item(0).getClass().getName() - , addressChildList.item(0) instanceof EntityReference); - assertTrue(addressChildList.item(2).getClass().getName() - , addressChildList.item(2) instanceof EntityReference); - entRef2 = (EntityReference) addressChildList.item(0); - entRef3 = (EntityReference) addressChildList.item(2); - entRefImp2 = (EntityReference) docImp.importNode(entRef2, true); - entRefImp3 = (EntityReference) docImp.importNode(entRef3, false); - nodeName2 = entRef2.getNodeName(); - nodeName3 = entRef3.getNodeName(); - nodeNameImp2 = entRefImp2.getNodeName(); - nodeNameImp3 = entRefImp3.getNodeName(); - assertEquals("documentimportnode21_Ent2NodeName", nodeName2, nodeNameImp2); - assertEquals("documentimportnode21_Ent3NodeName", nodeName3, nodeNameImp3); + Document doc = load("staffNS", true); + DOMImplementation domImpl = doc.getImplementation(); + Document docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); + NodeList addressList = doc.getElementsByTagName("address"); + Element element = (Element) addressList.item(1); + NodeList addressChildList = element.getChildNodes(); + assertTrue(addressChildList.item(0) instanceof EntityReference, addressChildList.item(0).getClass().getName()); + assertTrue(addressChildList.item(2) instanceof EntityReference, addressChildList.item(2).getClass().getName()); + EntityReference entRef2 = (EntityReference) addressChildList.item(0); + EntityReference entRef3 = (EntityReference) addressChildList.item(2); + EntityReference entRefImp2 = (EntityReference) docImp.importNode(entRef2, true); + EntityReference entRefImp3 = (EntityReference) docImp.importNode(entRef3, false); + String nodeName2 = entRef2.getNodeName(); + String nodeName3 = entRef3.getNodeName(); + String nodeNameImp2 = entRefImp2.getNodeName(); + String nodeNameImp3 = entRefImp3.getNodeName(); + assertEquals(nodeName2, nodeNameImp2, "documentimportnode21_Ent2NodeName"); + assertEquals(nodeName3, nodeNameImp3, "documentimportnode21_Ent3NodeName"); entRefImp2 = (EntityReference) doc.importNode(entRef2, true); entRefImp3 = (EntityReference) doc.importNode(entRef3, false); - nodes = entRefImp2.getChildNodes(); - nodeImp2 = nodes.item(0); - nodeValueImp2 = nodeImp2.getNodeValue(); + NodeList nodes = entRefImp2.getChildNodes(); + Node nodeImp2 = nodes.item(0); + String nodeValueImp2 = nodeImp2.getNodeValue(); nodes = entRefImp3.getChildNodes(); - nodeImp3 = nodes.item(0); - nodeValueImp3 = nodeImp3.getNodeValue(); - assertEquals("documentimportnode21_Ent2NodeValue", "1900 Dallas Road", nodeValueImp2); - assertEquals("documentimportnode21_Ent3Nodevalue", "Texas", nodeValueImp3); - + Node nodeImp3 = nodes.item(0); + String nodeValueImp3 = nodeImp3.getNodeValue(); + assertEquals("1900 Dallas Road", nodeValueImp2, "documentimportnode21_Ent2NodeValue"); + assertEquals("Texas", nodeValueImp3, "documentimportnode21_Ent3Nodevalue"); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
