Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns09.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns09.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns09.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns09.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.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.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,40 +41,19 @@ import static org.w3c.domts.DOMTest.load */ public class namednodemapsetnameditemns09 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - NamedNodeMap entities; - NamedNodeMap notations; - Attr attr; - Node newNode; - doc = load("staffNS", true); - docType = doc.getDoctype(); - entities = docType.getEntities(); - notations = docType.getNotations(); - attr = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "test"); - - { - boolean success = false; - try { - newNode = entities.setNamedItemNS(attr); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("namednodemapsetnameditemns09_entities", success); - } - - { - boolean success = false; - try { - newNode = notations.setNamedItemNS(attr); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("namednodemapsetnameditemns09_notations", success); - } + Document doc = load("staffNS", true); + DocumentType docType = doc.getDoctype(); + NamedNodeMap entities = docType.getEntities(); + NamedNodeMap notations = docType.getNotations(); + Attr attr = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "test"); + DOMException ex1 = assertThrows(DOMException.class, () -> entities.setNamedItemNS(attr)); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex1.code, "namednodemapsetnameditemns09_entities"); + + DOMException ex2 = assertThrows(DOMException.class, () -> notations.setNamedItemNS(attr)); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex2.code, "namednodemapsetnameditemns09_notations"); } /**
Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns10.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns10.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns10.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns10.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.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -43,37 +44,20 @@ import static org.w3c.domts.DOMTest.load */ public class namednodemapsetnameditemns10 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - NamedNodeMap entities; - NamedNodeMap attributes; - Entity entity; - Notation notation; - Element element; - NodeList elementList; - Node newNode; - doc = load("staffNS", true); - - docType = doc.getDoctype(); - entities = docType.getEntities(); - entity = (Entity) entities.getNamedItem("ent1"); - - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); - element = (Element) elementList.item(0); - attributes = element.getAttributes(); - - { - boolean success = false; - try { - newNode = attributes.setNamedItemNS(entity); - } catch (DOMException ex) { - success = (ex.code == DOMException.HIERARCHY_REQUEST_ERR); - } - assertTrue("namednodemapsetnameditemns10_entity", success); - } + Document doc = load("staffNS", true); + DocumentType docType = doc.getDoctype(); + NamedNodeMap entities = docType.getEntities(); + Entity entity = (Entity) entities.getNamedItem("ent1"); + + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); + Element element = (Element) elementList.item(0); + NamedNodeMap attributes = element.getAttributes(); + + DOMException ex = assertThrows(DOMException.class, () -> attributes.setNamedItemNS(entity)); + assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code, "namednodemapsetnameditemns10_entity"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns11.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns11.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns11.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns11.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.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -43,36 +44,20 @@ import static org.w3c.domts.DOMTest.load */ public class namednodemapsetnameditemns11 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - NamedNodeMap notations; - NamedNodeMap attributes; - Notation notation; - Element element; - NodeList elementList; - Node newNode; String nullNS = null; - doc = load("staffNS", true); - docType = doc.getDoctype(); - notations = docType.getNotations(); - notation = (Notation) notations.getNamedItem("notation1"); - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); - element = (Element) elementList.item(0); - attributes = element.getAttributes(); - - { - boolean success = false; - try { - newNode = attributes.setNamedItemNS(notation); - } catch (DOMException ex) { - success = (ex.code == DOMException.HIERARCHY_REQUEST_ERR); - } - assertTrue("namednodemapsetnameditemns11_notation", success); - } + Document doc = load("staffNS", true); + DocumentType docType = doc.getDoctype(); + NamedNodeMap notations = docType.getNotations(); + Notation notation = (Notation) notations.getNamedItem("notation1"); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); + Element element = (Element) elementList.item(0); + NamedNodeMap attributes = element.getAttributes(); + DOMException ex = assertThrows(DOMException.class, () -> attributes.setNamedItemNS(notation)); + assertEquals(DOMException.HIERARCHY_REQUEST_ERR, ex.code, "namednodemapsetnameditemns11_notation"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI01.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.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -45,22 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class namespaceURI01 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testAddr; - Attr addrAttr; - String attrNamespaceURI; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - addrAttr = testAddr.getAttributeNodeNS("http://www.nist.gov";, "district"); - assertNull("Default Attrs not supported", addrAttr); -/* -TODO: - attrNamespaceURI = addrAttr.getNamespaceURI(); - assertEquals("namespaceURI", "http://www.nist.gov";, attrNamespaceURI); - */ + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + Attr addrAttr = testAddr.getAttributeNodeNS("http://www.nist.gov";, "district"); + assertNull(addrAttr, "Default Attrs not supported"); + // TODO: + // attrNamespaceURI = addrAttr.getNamespaceURI(); + // assertEquals("namespaceURI", "http://www.nist.gov";, attrNamespaceURI); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI02.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.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; 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; @@ -44,18 +44,13 @@ import static org.w3c.domts.DOMTest.load */ public class namespaceURI02 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testAddr; - Attr addrAttr; - String attrNamespaceURI; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - addrAttr = testAddr.getAttributeNodeNS("http://www.nist.gov";, "domestic"); - attrNamespaceURI = addrAttr.getNamespaceURI(); - assertEquals("namespaceURI", "http://www.nist.gov";, attrNamespaceURI); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + Attr addrAttr = testAddr.getAttributeNodeNS("http://www.nist.gov";, "domestic"); + String attrNamespaceURI = addrAttr.getNamespaceURI(); + assertEquals("http://www.nist.gov";, attrNamespaceURI, "namespaceURI"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI03.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; @@ -42,17 +42,12 @@ import static org.w3c.domts.DOMTest.load */ public class namespaceURI03 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testEmployee; - String employeeNamespace; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("employee"); - testEmployee = elementList.item(0); - employeeNamespace = testEmployee.getNamespaceURI(); - assertEquals("namespaceURI", "http://www.nist.gov";, employeeNamespace); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testEmployee = elementList.item(0); + String employeeNamespace = testEmployee.getNamespaceURI(); + assertEquals("http://www.nist.gov";, employeeNamespace, "namespaceURI"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/namespaceURI04.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; @@ -42,18 +42,13 @@ import static org.w3c.domts.DOMTest.load */ public class namespaceURI04 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testEmployee; - String employeeNamespace; + void testRun() throws Throwable { String sExpected = "";//TODO null; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("employee"); - testEmployee = elementList.item(1); - employeeNamespace = testEmployee.getNamespaceURI(); - assertEquals("throw_Null", sExpected, employeeNamespace); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testEmployee = elementList.item(1); + String employeeNamespace = testEmployee.getNamespaceURI(); + assertEquals(sExpected, employeeNamespace, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.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.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -41,30 +41,20 @@ import static org.w3c.domts.DOMTest.load */ public class nodegetlocalname03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Element qelement; - Attr attr; - Attr qattr; - String localElemName; - String localQElemName; - String localAttrName; - String localQAttrName; - doc = load("staff", false); - element = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "elem"); - qelement = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "qual:qelem"); - attr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "attr"); - qattr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "qual:qattr"); - localElemName = element.getLocalName(); - localQElemName = qelement.getLocalName(); - localAttrName = attr.getLocalName(); - localQAttrName = qattr.getLocalName(); - assertEquals("nodegetlocalname03_localElemName", "elem", localElemName); - assertEquals("nodegetlocalname03_localQElemName", "qelem", localQElemName); - assertEquals("nodegetlocalname03_localAttrName", "attr", localAttrName); - assertEquals("nodegetlocalname03_localQAttrName", "qattr", localQAttrName); - + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "elem"); + Element qelement = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "qual:qelem"); + Attr attr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "attr"); + Attr qattr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "qual:qattr"); + String localElemName = element.getLocalName(); + String localQElemName = qelement.getLocalName(); + String localAttrName = attr.getLocalName(); + String localQAttrName = qattr.getLocalName(); + assertEquals("elem", localElemName, "nodegetlocalname03_localElemName"); + assertEquals("qelem", localQElemName, "nodegetlocalname03_localQElemName"); + assertEquals("attr", localAttrName, "nodegetlocalname03_localAttrName"); + assertEquals("qattr", localQAttrName, "nodegetlocalname03_localQAttrName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.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.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,32 +43,22 @@ import static org.w3c.domts.DOMTest.load */ public class nodegetnamespaceuri03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Element elementNS; - Attr attr; - Attr attrNS; - String elemNSURI; - String elemNSURINull; - String attrNSURI; - String attrNSURINull; + void testRun() throws Throwable { String nullNS = null; - doc = load("staff", false); - element = doc.createElementNS(nullNS, "elem"); - elementNS = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "qual:qelem"); - attr = doc.createAttributeNS(nullNS, "attr"); - attrNS = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "qual:qattr"); - elemNSURI = elementNS.getNamespaceURI(); - elemNSURINull = element.getNamespaceURI(); - attrNSURI = attrNS.getNamespaceURI(); - attrNSURINull = attr.getNamespaceURI(); - assertEquals("nodegetnamespaceuri03_elemNSURI", "http://www.w3.org/DOM/Test/elem";, elemNSURI); - assertEquals("nodegetnamespaceuri03_1", "", elemNSURINull); - assertEquals("nodegetnamespaceuri03_attrNSURI", "http://www.w3.org/DOM/Test/attr";, attrNSURI); - assertEquals("nodegetnamespaceuri03_2", "", attrNSURINull); - + Document doc = load("staff", false); + Element element = doc.createElementNS(nullNS, "elem"); + Element elementNS = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "qual:qelem"); + Attr attr = doc.createAttributeNS(nullNS, "attr"); + Attr attrNS = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "qual:qattr"); + String elemNSURI = elementNS.getNamespaceURI(); + String elemNSURINull = element.getNamespaceURI(); + String attrNSURI = attrNS.getNamespaceURI(); + String attrNSURINull = attr.getNamespaceURI(); + assertEquals("http://www.w3.org/DOM/Test/elem";, elemNSURI, "nodegetnamespaceuri03_elemNSURI"); + assertEquals("", elemNSURINull, "nodegetnamespaceuri03_1"); + assertEquals("http://www.w3.org/DOM/Test/attr";, attrNSURI, "nodegetnamespaceuri03_attrNSURI"); + assertEquals("", attrNSURINull, "nodegetnamespaceuri03_2"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.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.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -47,20 +47,15 @@ import static org.w3c.domts.DOMTest.load */ public class nodegetownerdocument01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Document ownerDoc; - DOMImplementation domImpl; - DocumentType docType; String nullID = null; - doc = load("staff", false); - domImpl = doc.getImplementation(); - docType = domImpl.createDocumentType("mydoc", nullID, nullID); - ownerDoc = docType.getOwnerDocument(); - assertNull("nodegetownerdocument01", ownerDoc); - + Document doc = load("staff", false); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = domImpl.createDocumentType("mydoc", nullID, nullID); + Document ownerDoc = docType.getOwnerDocument(); + assertNull(ownerDoc, "nodegetownerdocument01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.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.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.Element; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -42,29 +42,21 @@ import static org.w3c.domts.DOMTest.load * @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> * @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 { @Test - public void testRun() throws Throwable { - Document doc; - Document newDoc; - Element newElem; - Document ownerDocDoc; - Document ownerDocElem; - DOMImplementation domImpl; - DocumentType docType; + void testRun() throws Throwable { String nullNS = null; - doc = load("staff", false); - domImpl = doc.getImplementation(); - docType = null;// domImpl.createDocumentType("mydoc", nullNS, nullNS); - newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "mydoc", docType); - ownerDocDoc = newDoc.getOwnerDocument(); - assertNull("nodegetownerdocument02_1", ownerDocDoc); - newElem = newDoc.createElementNS("http://www.w3.org/DOM/Test";, "myelem"); - ownerDocElem = newElem.getOwnerDocument(); - assertNotNull("nodegetownerdocument02_2", ownerDocElem); - + Document doc = load("staff", false); + DOMImplementation domImpl = doc.getImplementation(); + // TODO: fix when Doctypes are available + DocumentType docType = null;// domImpl.createDocumentType("mydoc", nullNS, nullNS); + Document newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "mydoc", docType); + Document ownerDocDoc = newDoc.getOwnerDocument(); + assertNull(ownerDocDoc, "nodegetownerdocument02_1"); + Element newElem = newDoc.createElementNS("http://www.w3.org/DOM/Test";, "myelem"); + Document ownerDocElem = newElem.getOwnerDocument(); + assertNotNull(ownerDocElem, "nodegetownerdocument02_2"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.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.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -41,30 +41,20 @@ import static org.w3c.domts.DOMTest.load */ public class nodegetprefix03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Element qelement; - Attr attr; - Attr qattr; - String elemNoPrefix; - String elemPrefix; - String attrNoPrefix; - String attrPrefix; - doc = load("staff", false); - element = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "elem"); - qelement = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "qual:qelem"); - attr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "attr"); - qattr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "qual:qattr"); - elemNoPrefix = element.getPrefix(); - elemPrefix = qelement.getPrefix(); - attrNoPrefix = attr.getPrefix(); - attrPrefix = qattr.getPrefix(); - assertEquals("nodegetprefix03_1", "", elemNoPrefix); - assertEquals("nodegetprefix03_2", "qual", elemPrefix); - assertEquals("nodegetprefix03_3", "", attrNoPrefix); - assertEquals("nodegetprefix03_4", "qual", attrPrefix); - + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "elem"); + Element qelement = doc.createElementNS("http://www.w3.org/DOM/Test/elem";, "qual:qelem"); + Attr attr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "attr"); + Attr qattr = doc.createAttributeNS("http://www.w3.org/DOM/Test/attr";, "qual:qattr"); + String elemNoPrefix = element.getPrefix(); + String elemPrefix = qelement.getPrefix(); + String attrNoPrefix = attr.getPrefix(); + String attrPrefix = qattr.getPrefix(); + assertEquals("", elemNoPrefix, "nodegetprefix03_1"); + assertEquals("qual", elemPrefix, "nodegetprefix03_2"); + assertEquals("", attrNoPrefix, "nodegetprefix03_3"); + assertEquals("qual", attrPrefix, "nodegetprefix03_4"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.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.NodeList; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -41,21 +41,16 @@ import static org.w3c.domts.DOMTest.load */ public class nodehasattributes01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - NodeList elementList; - boolean hasAttributes; - doc = load("staff", false); - elementList = doc.getElementsByTagName("employee"); - element = (Element) elementList.item(0); - hasAttributes = element.hasAttributes(); - assertFalse("nodehasattributes01_1", hasAttributes); + void testRun() throws Throwable { + Document doc = load("staff", false); + NodeList elementList = doc.getElementsByTagName("employee"); + Element element = (Element) elementList.item(0); + boolean hasAttributes = element.hasAttributes(); + assertFalse(hasAttributes, "nodehasattributes01_1"); elementList = doc.getElementsByTagName("address"); element = (Element) elementList.item(0); hasAttributes = element.hasAttributes(); - assertTrue("nodehasattributes01_2", hasAttributes); - + assertTrue(hasAttributes, "nodehasattributes01_2"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.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.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -41,16 +41,13 @@ import static org.w3c.domts.DOMTest.load */ public class nodehasattributes02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; boolean hasAttributes; - doc = load("staffNS", false); - docType = doc.getDoctype(); + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); hasAttributes = docType.hasAttributes(); - assertFalse("nodehasattributes02", hasAttributes); - + assertFalse(hasAttributes, "nodehasattributes02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.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.Element; 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; @@ -39,17 +39,12 @@ import static org.w3c.domts.DOMTest.load */ public class nodehasattributes03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - NodeList elementList; - boolean hasAttributes; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:employee"); - element = (Element) elementList.item(0); - hasAttributes = element.hasAttributes(); - assertTrue("nodehasattributes03", hasAttributes); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:employee"); + Element element = (Element) elementList.item(0); + boolean hasAttributes = element.hasAttributes(); + assertTrue(hasAttributes, "nodehasattributes03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -39,33 +39,21 @@ import static org.w3c.domts.DOMTest.load */ public class nodehasattributes04 { @Test - public void testRun() throws Throwable { - Document doc; - Document newDoc; + void testRun() throws Throwable { DocumentType docType = null; - DOMImplementation domImpl; - Element element; - Element elementTest; - Element elementDoc; - Attr attribute; - Node setNode; - Node appendedChild; - NodeList elementList; - boolean hasAttributes; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "test", docType); - element = newDoc.createElementNS("http://www.w3.org/DOM/Test";, "dom:elem"); - attribute = newDoc.createAttribute("attr"); - setNode = element.setAttributeNode(attribute); - elementDoc = newDoc.getDocumentElement(); - appendedChild = elementDoc.appendChild(element); - elementList = newDoc.getElementsByTagNameNS("http://www.w3.org/DOM/Test";, "elem"); - elementTest = (Element) elementList.item(0); - hasAttributes = elementTest.hasAttributes(); - assertTrue("nodehasattributes04", hasAttributes); - + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "test", docType); + Element element = newDoc.createElementNS("http://www.w3.org/DOM/Test";, "dom:elem"); + Attr attribute = newDoc.createAttribute("attr"); + Node setNode = element.setAttributeNode(attribute); + Element elementDoc = newDoc.getDocumentElement(); + Node appendedChild = elementDoc.appendChild(element); + NodeList elementList = newDoc.getElementsByTagNameNS("http://www.w3.org/DOM/Test";, "elem"); + Element elementTest = (Element) elementList.item(0); + boolean hasAttributes = elementTest.hasAttributes(); + assertTrue(hasAttributes, "nodehasattributes04"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported01.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -42,41 +42,24 @@ import static org.w3c.domts.DOMTest.load */ public class nodeissupported01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; + void testRun() throws Throwable { String version = ""; String version1 = "1.0"; String version2 = "2.0"; - String featureCore; - String featureXML; - boolean success; - java.util.List featuresXML = new java.util.ArrayList(); - featuresXML.add("XML"); - featuresXML.add("xmL"); - - java.util.List featuresCore = new java.util.ArrayList(); - featuresCore.add("Core"); - featuresCore.add("CORE"); - - doc = load("staffNS", false); - element = doc.getDocumentElement(); - for (int indexd513e63 = 0; indexd513e63 < featuresXML.size(); indexd513e63++) { - featureXML = (String) featuresXML.get(indexd513e63); - success = element.isSupported(featureXML, version); - assertTrue("nodeissupported01_XML1", success); - success = element.isSupported(featureXML, version1); - assertTrue("nodeissupported01_XML2", success); + String[] featuresXML = { "XML", "xmL" }; + String[] featuresCore = { "Core", "CORE" }; + + Document doc = load("staffNS", false); + Element element = doc.getDocumentElement(); + for (String featureXML : featuresXML) { + assertTrue(element.isSupported(featureXML, version), "nodeissupported01_XML1"); + assertTrue(element.isSupported(featureXML, version1), "nodeissupported01_XML2"); } - for (int indexd513e74 = 0; indexd513e74 < featuresCore.size(); indexd513e74++) { - featureCore = (String) featuresCore.get(indexd513e74); - success = element.isSupported(featureCore, version); - assertTrue("nodeissupported01_Core1", success); - success = element.isSupported(featureCore, version1); - success = element.isSupported(featureCore, version2); - assertTrue("nodeissupported01_Core3", success); + for (String featureCore : featuresCore) { + assertTrue(element.isSupported(featureCore, version), "nodeissupported01_Core1"); + assertTrue(element.isSupported(featureCore, version1), "nodeissupported01_Core2"); + assertTrue(element.isSupported(featureCore, version2), "nodeissupported01_Core3"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported02.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.Attr; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -42,41 +42,24 @@ import static org.w3c.domts.DOMTest.load */ public class nodeissupported02 { @Test - public void testRun() throws Throwable { - Document doc; - Attr attribute; + void testRun() throws Throwable { String version = ""; String version1 = "1.0"; String version2 = "2.0"; - String featureCore; - String featureXML; - boolean success; - java.util.List featuresXML = new java.util.ArrayList(); - featuresXML.add("XML"); - featuresXML.add("xmL"); - - java.util.List featuresCore = new java.util.ArrayList(); - featuresCore.add("Core"); - featuresCore.add("CORE"); - - doc = load("staffNS", false); - attribute = doc.createAttribute("TestAttr"); - for (int indexd514e63 = 0; indexd514e63 < featuresXML.size(); indexd514e63++) { - featureXML = (String) featuresXML.get(indexd514e63); - success = attribute.isSupported(featureXML, version); - assertTrue("nodeissupported02_XML1", success); - success = attribute.isSupported(featureXML, version1); - assertTrue("nodeissupported02_XML2", success); + String[] featuresXML = { "XML", "xmL" }; + String[] featuresCore = { "Core", "CORE" }; + + Document doc = load("staffNS", false); + Attr attribute = doc.createAttribute("TestAttr"); + for (String featureXML : featuresXML) { + assertTrue(attribute.isSupported(featureXML, version), "nodeissupported02_XML1"); + assertTrue(attribute.isSupported(featureXML, version1), "nodeissupported02_XML2"); } - for (int indexd514e74 = 0; indexd514e74 < featuresCore.size(); indexd514e74++) { - featureCore = (String) featuresCore.get(indexd514e74); - success = attribute.isSupported(featureCore, version); - assertTrue("nodeissupported02_Core1", success); - success = attribute.isSupported(featureCore, version1); - success = attribute.isSupported(featureCore, version2); - assertTrue("nodeissupported02_Core3", success); + for (String featureCore : featuresCore) { + assertTrue(attribute.isSupported(featureCore, version), "nodeissupported02_Core1"); + assertTrue(attribute.isSupported(featureCore, version1), "nodeissupported02_Core2"); + assertTrue(attribute.isSupported(featureCore, version2), "nodeissupported02_Core3"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported03.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.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -42,16 +42,12 @@ import static org.w3c.domts.DOMTest.load */ public class nodeissupported03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - boolean success; - doc = load("staffNS", false); - docType = doc.getDoctype(); - success = docType.isSupported("", ""); - assertFalse("nodeissupported03", success); - + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + boolean success = docType.isSupported("", ""); + assertFalse(success, "nodeissupported03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported04.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.Document; import org.w3c.dom.EntityReference; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -42,16 +42,12 @@ import static org.w3c.domts.DOMTest.load */ public class nodeissupported04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - EntityReference entRef; - boolean success; - doc = load("staffNS", false); - entRef = doc.createEntityReference("ent1"); - success = entRef.isSupported("XML CORE", ""); - assertFalse("nodeissupported04", success); - + Document doc = load("staffNS", false); + EntityReference entRef = doc.createEntityReference("ent1"); + boolean success = entRef.isSupported("XML CORE", ""); + assertFalse(success, "nodeissupported04"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodeissupported05.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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -41,15 +41,11 @@ import static org.w3c.domts.DOMTest.load */ public class nodeissupported05 { @Test - public void testRun() throws Throwable { - Document doc; - ProcessingInstruction pi; - boolean success; - doc = load("staffNS", false); - pi = doc.createProcessingInstruction("PITarget", "PIData"); - success = pi.isSupported("-", "+"); - assertFalse("nodeissupported05", success); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + ProcessingInstruction pi = doc.createProcessingInstruction("PITarget", "PIData"); + boolean success = pi.isSupported("-", "+"); + assertFalse(success, "nodeissupported05"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodenormalize01.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; @@ -43,117 +43,95 @@ import static org.w3c.domts.DOMTest.load */ public class nodenormalize01 { @Test - @Ignore("entity reference") + @Disabled("entity reference") public void testRun() throws Throwable { - Document doc; - Document newDoc; - DOMImplementation domImpl; - DocumentType docType; DocumentType docTypeNull = null; - Element documentElement; - Element element1; - Element element2; - Element element3; - Element element4; - Element element5; - Element element6; - Element element7; - Text text1; - Text text2; - Text text3; - ProcessingInstruction pi; - CDATASection cData; - Comment comment; - EntityReference entRef; - NodeList elementList; - Node appendedChild; - doc = load("staffNS", true); - domImpl = doc.getImplementation(); - newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:root", docTypeNull); - element1 = newDoc.createElement("element1"); - element2 = newDoc.createElement("element2"); - element3 = newDoc.createElement("element3"); - element4 = newDoc.createElement("element4"); - element5 = newDoc.createElement("element5"); - element6 = newDoc.createElement("element6"); - element7 = newDoc.createElement("element7"); - text1 = newDoc.createTextNode("text1"); - text2 = newDoc.createTextNode("text2"); - text3 = newDoc.createTextNode("text3"); - cData = newDoc.createCDATASection("Cdata"); - comment = newDoc.createComment("comment"); - pi = newDoc.createProcessingInstruction("PITarget", "PIData"); - entRef = newDoc.createEntityReference("EntRef"); - documentElement = newDoc.getDocumentElement(); - appendedChild = documentElement.appendChild(element1); - appendedChild = element2.appendChild(text1); - appendedChild = element2.appendChild(text2); - appendedChild = element2.appendChild(text3); - appendedChild = element1.appendChild(element2); + Document doc = load("staffNS", true); + DOMImplementation domImpl = doc.getImplementation(); + Document newDoc = domImpl.createDocument("http://www.w3.org/DOM/Test";, "dom:root", docTypeNull); + Element element1 = newDoc.createElement("element1"); + Element element2 = newDoc.createElement("element2"); + Element element3 = newDoc.createElement("element3"); + Element element4 = newDoc.createElement("element4"); + Element element5 = newDoc.createElement("element5"); + Element element6 = newDoc.createElement("element6"); + Element element7 = newDoc.createElement("element7"); + Text text1 = newDoc.createTextNode("text1"); + Text text2 = newDoc.createTextNode("text2"); + Text text3 = newDoc.createTextNode("text3"); + CDATASection cData = newDoc.createCDATASection("Cdata"); + Comment comment = newDoc.createComment("comment"); + ProcessingInstruction pi = newDoc.createProcessingInstruction("PITarget", "PIData"); + EntityReference entRef = newDoc.createEntityReference("EntRef"); + Element documentElement = newDoc.getDocumentElement(); + documentElement.appendChild(element1); + element2.appendChild(text1); + element2.appendChild(text2); + element2.appendChild(text3); + element1.appendChild(element2); text1 = (Text) text1.cloneNode(false); text2 = (Text) text2.cloneNode(false); - appendedChild = element3.appendChild(entRef); - appendedChild = element3.appendChild(text1); - appendedChild = element3.appendChild(text2); - appendedChild = element1.appendChild(element3); + element3.appendChild(entRef); + element3.appendChild(text1); + element3.appendChild(text2); + element1.appendChild(element3); text1 = (Text) text1.cloneNode(false); text2 = (Text) text2.cloneNode(false); - appendedChild = element4.appendChild(cData); - appendedChild = element4.appendChild(text1); - appendedChild = element4.appendChild(text2); - appendedChild = element1.appendChild(element4); + element4.appendChild(cData); + element4.appendChild(text1); + element4.appendChild(text2); + element1.appendChild(element4); text2 = (Text) text2.cloneNode(false); text3 = (Text) text3.cloneNode(false); - appendedChild = element5.appendChild(comment); - appendedChild = element5.appendChild(text2); - appendedChild = element5.appendChild(text3); - appendedChild = element1.appendChild(element5); + element5.appendChild(comment); + element5.appendChild(text2); + element5.appendChild(text3); + element1.appendChild(element5); text2 = (Text) text2.cloneNode(false); text3 = (Text) text3.cloneNode(false); - appendedChild = element6.appendChild(pi); - appendedChild = element6.appendChild(text2); - appendedChild = element6.appendChild(text3); - appendedChild = element1.appendChild(element6); + element6.appendChild(pi); + element6.appendChild(text2); + element6.appendChild(text3); + element1.appendChild(element6); entRef = (EntityReference) entRef.cloneNode(false); text1 = (Text) text1.cloneNode(false); text2 = (Text) text2.cloneNode(false); text3 = (Text) text3.cloneNode(false); - appendedChild = element7.appendChild(entRef); - appendedChild = element7.appendChild(text1); - appendedChild = element7.appendChild(text2); - appendedChild = element7.appendChild(text3); - appendedChild = element1.appendChild(element7); - elementList = element1.getChildNodes(); - assertEquals("nodeNormalize01_1Bef", 6, elementList.getLength()); + element7.appendChild(entRef); + element7.appendChild(text1); + element7.appendChild(text2); + element7.appendChild(text3); + element1.appendChild(element7); + NodeList elementList = element1.getChildNodes(); + assertEquals(6, elementList.getLength(), "nodeNormalize01_1Bef"); elementList = element2.getChildNodes(); - assertEquals("nodeNormalize01_2Bef", 3, elementList.getLength()); + assertEquals(3, elementList.getLength(), "nodeNormalize01_2Bef"); elementList = element3.getChildNodes(); - assertEquals("nodeNormalize01_3Bef", 3, elementList.getLength()); + assertEquals(3, elementList.getLength(), "nodeNormalize01_3Bef"); elementList = element4.getChildNodes(); - assertEquals("nodeNormalize01_4Bef", 3, elementList.getLength()); + assertEquals(3, elementList.getLength(), "nodeNormalize01_4Bef"); elementList = element5.getChildNodes(); - assertEquals("nodeNormalize01_5Bef", 3, elementList.getLength()); + assertEquals(3, elementList.getLength(), "nodeNormalize01_5Bef"); elementList = element6.getChildNodes(); - assertEquals("nodeNormalize01_6Bef", 3, elementList.getLength()); + assertEquals(3, elementList.getLength(), "nodeNormalize01_6Bef"); elementList = element7.getChildNodes(); - assertEquals("nodeNormalize01_7Bef", 4, elementList.getLength()); + assertEquals(4, elementList.getLength(), "nodeNormalize01_7Bef"); newDoc.normalize(); elementList = element1.getChildNodes(); - assertEquals("nodeNormalize01_1Aft", 6, elementList.getLength()); + assertEquals(6, elementList.getLength(), "nodeNormalize01_1Aft"); elementList = element2.getChildNodes(); - assertEquals("nodeNormalize01_2Aft", 1, elementList.getLength()); + assertEquals(1, elementList.getLength(), "nodeNormalize01_2Aft"); elementList = element3.getChildNodes(); - assertEquals("nodeNormalize01_3Aft", 2, elementList.getLength()); + assertEquals(2, elementList.getLength(), "nodeNormalize01_3Aft"); elementList = element4.getChildNodes(); - assertEquals("nodeNormalize01_4Aft", 2, elementList.getLength()); + assertEquals(2, elementList.getLength(), "nodeNormalize01_4Aft"); elementList = element5.getChildNodes(); - assertEquals("nodeNormalize01_5Aft", 2, elementList.getLength()); + assertEquals(2, elementList.getLength(), "nodeNormalize01_5Aft"); elementList = element6.getChildNodes(); - assertEquals("nodeNormalize01_6Aft", 2, elementList.getLength()); + assertEquals(2, elementList.getLength(), "nodeNormalize01_6Aft"); elementList = element7.getChildNodes(); - assertEquals("nodeNormalize01_7Aft", 2, elementList.getLength()); - + assertEquals(2, elementList.getLength(), "nodeNormalize01_7Aft"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.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.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; @@ -43,23 +43,16 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix01 { @Test - public void testRun() throws Throwable { - Document doc; - DocumentFragment docFragment; - Element element; - String elementTagName; - String elementNodeName; - Node appendedChild; - doc = load("staff", true); - docFragment = doc.createDocumentFragment(); - element = doc.createElementNS("http://www.w3.org/DOM/Test";, "emp:address"); - appendedChild = docFragment.appendChild(element); + void testRun() throws Throwable { + Document doc = load("staff", true); + DocumentFragment docFragment = doc.createDocumentFragment(); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test";, "emp:address"); + Node appendedChild = docFragment.appendChild(element); element.setPrefix("dmstc"); - elementTagName = element.getTagName(); - elementNodeName = element.getNodeName(); - assertEquals("nodesetprefix01_tagname", "dmstc:address", elementTagName); - assertEquals("nodesetprefix01_nodeName", "dmstc:address", elementNodeName); - + String elementTagName = element.getTagName(); + String elementNodeName = element.getNodeName(); + assertEquals("dmstc:address", elementTagName, "nodesetprefix01_tagname"); + assertEquals("dmstc:address", elementNodeName, "nodesetprefix01_nodeName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.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; @@ -42,27 +42,18 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - Attr newAttribute; - Node setNode; - NodeList elementList; - String attrName; - String newAttrName; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("address"); - element = (Element) elementList.item(1); - newAttribute = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "test:address"); - setNode = element.setAttributeNodeNS(newAttribute); + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("address"); + Element element = (Element) elementList.item(1); + Attr newAttribute = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "test:address"); + Node setNode = element.setAttributeNodeNS(newAttribute); newAttribute.setPrefix("dom"); - attribute = element.getAttributeNodeNS("http://www.usa.com";, "domestic"); - attrName = attribute.getNodeName(); - newAttrName = newAttribute.getNodeName(); - assertEquals("nodesetprefix02_attrName", "dmstc:domestic", attrName); - assertEquals("nodesetprefix02_newAttrName", "dom:address", newAttrName); - + Attr attribute = element.getAttributeNodeNS("http://www.usa.com";, "domestic"); + String attrName = attribute.getNodeName(); + String newAttrName = newAttribute.getNodeName(); + assertEquals("dmstc:domestic", attrName, "nodesetprefix02_attrName"); + assertEquals("dom:address", newAttrName, "nodesetprefix02_newAttrName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.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; @@ -40,22 +41,12 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - doc = load("staffNS", true); - element = doc.createElement("address"); - - { - boolean success = false; - try { - element.setPrefix("test"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("nodesetprefix03", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Element element = doc.createElement("address"); + DOMException ex = assertThrows(DOMException.class, () -> element.setPrefix("test")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "nodesetprefix03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.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.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.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,29 +41,17 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - NodeList elementList; String nullNS = null; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:employee"); - element = (Element) elementList.item(0); - attribute = element.getAttributeNodeNS(nullNS, "defaultAttr"); - - { - boolean success = false; - try { - attribute.setPrefix("test"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("nodesetprefix04", success); - } + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:employee"); + Element element = (Element) elementList.item(0); + Attr attribute = element.getAttributeNodeNS(nullNS, "defaultAttr"); + DOMException ex = assertThrows(DOMException.class, () -> attribute.setPrefix("test")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "nodesetprefix04"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.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; @@ -40,33 +41,16 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix05 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - String prefixValue; - java.util.List prefixValues = new java.util.ArrayList(); - prefixValues.add("_:"); - prefixValues.add(":0"); - prefixValues.add(":"); - prefixValues.add("_::"); - prefixValues.add("a:0:c"); - - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); - for (int indexd523e55 = 0; indexd523e55 < prefixValues.size(); indexd523e55++) { - prefixValue = (String) prefixValues.get(indexd523e55); - - { - boolean success = false; - try { - element.setPrefix(prefixValue); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("nodesetprefix05", success); - } + void testRun() throws Throwable { + ; + String[] prefixValues = { "_:", ":0", ":", "_::", "a:0:c" }; + + Document doc = load("staffNS", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); + for (String prefixValue : prefixValues) { + DOMException ex = assertThrows(DOMException.class, () -> element.setPrefix(prefixValue)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "nodesetprefix05"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.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,22 +43,12 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix06 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); - - { - boolean success = false; - try { - element.setPrefix("xml"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("elementsetattributens06", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); + DOMException ex = assertThrows(DOMException.class, () -> element.setPrefix("xml")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "elementsetattributens06"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.Attr; 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; @@ -43,22 +44,12 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix07 { @Test - public void testRun() throws Throwable { - Document doc; - Attr attribute; - doc = load("staffNS", true); - attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test/L2";, "abc:elem"); - - { - boolean success = false; - try { - attribute.setPrefix("xmlns"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("nodesetprefix07", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Attr attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test/L2";, "abc:elem"); + DOMException ex = assertThrows(DOMException.class, () -> attribute.setPrefix("xmlns")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "nodesetprefix07"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.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; @@ -39,26 +40,14 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix08 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - NodeList elementList; - Attr attribute; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("employee"); - element = (Element) elementList.item(0); - attribute = element.getAttributeNode("xmlns"); - - { - boolean success = false; - try { - attribute.setPrefix("xml"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("nodesetprefix08", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Element element = (Element) elementList.item(0); + Attr attribute = element.getAttributeNode("xmlns"); + DOMException ex = assertThrows(DOMException.class, () -> attribute.setPrefix("xml")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "nodesetprefix08"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.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; @@ -40,23 +41,13 @@ import static org.w3c.domts.DOMTest.load */ public class nodesetprefix09 { @Test - public void testRun() throws Throwable { - Document doc; + void testRun() throws Throwable { String value = "#$%&'()@"; - Element element; - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); - - { - boolean success = false; - try { - element.setPrefix(value); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("nodesetprefix09", success); - } + Document doc = load("staffNS", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); + DOMException ex = assertThrows(DOMException.class, () -> element.setPrefix(value)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "nodesetprefix09"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/normalize01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/normalize01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/normalize01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/normalize01.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.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; @@ -48,27 +48,17 @@ import static org.w3c.domts.DOMTest.load public class normalize01 { - - @Test - public void testRun() throws Throwable { - Document doc; - Element root; - NodeList elementList; - Node firstChild; - NodeList textList; - CharacterData textNode; - String data; - doc = load("staff", false); - root = doc.getDocumentElement(); + void testRun() throws Throwable { + Document doc = load("staff", false); + Element root = doc.getDocumentElement(); root.normalize(); - elementList = root.getElementsByTagName("name"); - firstChild = elementList.item(2); - textList = firstChild.getChildNodes(); - textNode = (CharacterData) textList.item(0); - data = textNode.getData(); - assertEquals("data", "Roger\n Jones", data); - + NodeList elementList = root.getElementsByTagName("name"); + Node firstChild = elementList.item(2); + NodeList textList = firstChild.getChildNodes(); + CharacterData textNode = (CharacterData) textList.item(0); + String data = textNode.getData(); + assertEquals("Roger\n Jones", data, "data"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerDocument01.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.DocumentType; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -41,13 +41,10 @@ import static org.w3c.domts.DOMTest.load */ public class ownerDocument01 { @Test - public void testRun() throws Throwable { - Document doc; - DocumentType ownerDocument; - doc = load("staff", false); - ownerDocument = (DocumentType) doc.getOwnerDocument(); - assertNull("throw_Null", ownerDocument); - + void testRun() throws Throwable { + Document doc = load("staff", false); + DocumentType ownerDocument = (DocumentType) doc.getOwnerDocument(); + assertNull(ownerDocument, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement01.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; @@ -40,23 +40,15 @@ import static org.w3c.domts.DOMTest.load */ public class ownerElement01 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList addressList; - Node testNode; - NamedNodeMap attributes; - Attr domesticAttr; - Element elementNode; - String name; - doc = load("staff", false); - addressList = doc.getElementsByTagName("address"); - testNode = addressList.item(0); - attributes = testNode.getAttributes(); - domesticAttr = (Attr) attributes.getNamedItem("domestic"); - elementNode = domesticAttr.getOwnerElement(); - name = elementNode.getNodeName(); - assertEquals("throw_Equals", "address", name); - + void testRun() throws Throwable { + Document doc = load("staff", false); + NodeList addressList = doc.getElementsByTagName("address"); + Node testNode = addressList.item(0); + NamedNodeMap attributes = testNode.getAttributes(); + Attr domesticAttr = (Attr) attributes.getNamedItem("domestic"); + Element elementNode = domesticAttr.getOwnerElement(); + String name = elementNode.getNodeName(); + assertEquals("address", name, "throw_Equals"); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
