Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens05.java Sun Feb 6 01:51:55 2022 @@ -22,13 +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.Attr; 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,27 +45,14 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributenodens05 { @Test - public void testRun() throws Throwable { - Document doc; - Document docAlt; - Element element; - Attr attribute; - Attr newAttribute; - doc = load("staffNS", true); - docAlt = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem1"); - attribute = docAlt.createAttributeNS("http://www.w3.org/DOM/Test";, "attr"); - - { - boolean success = false; - try { - newAttribute = element.setAttributeNodeNS(attribute); - } catch (DOMException ex) { - success = (ex.code == DOMException.WRONG_DOCUMENT_ERR); - } - assertTrue("elementsetattributenodens05", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Document docAlt = load("staffNS", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem1"); + Attr attribute = docAlt.createAttributeNS("http://www.w3.org/DOM/Test";, "attr"); + DOMException ex = assertThrows(DOMException.class, () -> element.setAttributeNodeNS(attribute)); + assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code, "elementsetattributenodens05"); } /**
Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens06.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; @@ -41,36 +42,20 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributenodens06 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - Attr attribute2; - EntityReference entRef; - NodeList elementList; - Node newAttribute; - Node newChild; - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem1"); - attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "attr"); - entRef = doc.createEntityReference("ent4"); - newChild = attribute.appendChild(entRef); - newAttribute = element.setAttributeNodeNS(attribute); - elementList = entRef.getChildNodes(); - element = (Element) elementList.item(0); - attribute2 = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "attr2"); - - { - boolean success = false; - try { - newAttribute = element.setAttributeNodeNS(attribute2); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("elementsetattributenodens06", success); - } + Document doc = load("staffNS", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem1"); + Attr attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "attr"); + EntityReference entRef = doc.createEntityReference("ent4"); + Node newChild = attribute.appendChild(entRef); + Node newAttribute = element.setAttributeNodeNS(attribute); + NodeList elementList = entRef.getChildNodes(); + Element element2 = (Element) elementList.item(0); + Attr attribute2 = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "attr2"); + DOMException ex = assertThrows(DOMException.class, () -> element2.setAttributeNodeNS(attribute2)); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "elementsetattributenodens06"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens01.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,21 +41,15 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributens01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - String attrName; - String attrValue; - doc = load("staff", true); - element = doc.createElementNS("http://www.w3.org/DOM";, "dom:elem"); + void testRun() throws Throwable { + Document doc = load("staff", true); + Element element = doc.createElementNS("http://www.w3.org/DOM";, "dom:elem"); element.setAttributeNS("http://www.w3.org/DOM/Test/setAttributeNS";, "attr", "value"); - attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/setAttributeNS";, "attr"); - attrName = attribute.getNodeName(); - attrValue = attribute.getNodeValue(); - assertEquals("elementsetattributens01_attrName", "attr", attrName); - assertEquals("elementsetattributens01_attrValue", "value", attrValue); - + Attr attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/setAttributeNS";, "attr"); + String attrName = attribute.getNodeName(); + String attrValue = attribute.getNodeValue(); + assertEquals("attr", attrName, "elementsetattributens01_attrName"); + assertEquals("value", attrValue, "elementsetattributens01_attrValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens02.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; @@ -42,23 +42,16 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributens02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - NodeList elementList; - String attrName; - String attrValue; - doc = load("staff", true); - elementList = doc.getElementsByTagNameNS("*", "address"); - element = (Element) elementList.item(0); + void testRun() throws Throwable { + Document doc = load("staff", true); + NodeList elementList = doc.getElementsByTagNameNS("*", "address"); + Element element = (Element) elementList.item(0); element.setAttributeNS("http://www.w3.org/DOM/Test/setAttributeNS";, "this:street", "Silver Street"); - attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/setAttributeNS";, "street"); - attrName = attribute.getNodeName(); - attrValue = attribute.getNodeValue(); - assertEquals("elementsetattributens02_attrName", "this:street", attrName); - assertEquals("elementsetattributens02_attrValue", "Silver Street", attrValue); - + Attr attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/setAttributeNS";, "street"); + String attrName = attribute.getNodeName(); + String attrValue = attribute.getNodeValue(); + assertEquals("this:street", attrName, "elementsetattributens02_attrName"); + assertEquals("Silver Street", attrValue, "elementsetattributens02_attrValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens03.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,24 +44,17 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributens03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - NodeList elementList; - String attrName; - String attrValue; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:employee"); - element = (Element) elementList.item(0); + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:employee"); + Element element = (Element) elementList.item(0); element.setAttributeNS("http://www.w3.org/DOM/Test/1";, "defaultAttr", "default1"); element.setAttributeNS("http://www.w3.org/DOM/Test/2";, "defaultAttr", "default2"); - attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/1";, "defaultAttr"); - attrName = attribute.getNodeName(); - attrValue = attribute.getNodeValue(); - assertEquals("elementsetattributens03_attrName", "defaultAttr", attrName); - assertEquals("elementsetattributens03_attrValue", "default1", attrValue); - + Attr attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/1";, "defaultAttr"); + String attrName = attribute.getNodeName(); + String attrValue = attribute.getNodeValue(); + assertEquals("defaultAttr", attrName, "elementsetattributens03_attrName"); + assertEquals("default1", attrValue, "elementsetattributens03_attrValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens04.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,35 +43,14 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributens04 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - String qualifiedName; - java.util.List qualifiedNames = new java.util.ArrayList(); - qualifiedNames.add("/"); - qualifiedNames.add("//"); - qualifiedNames.add("\\"); - qualifiedNames.add(";"); - qualifiedNames.add("&"); - qualifiedNames.add("*"); - qualifiedNames.add("]]"); - qualifiedNames.add(">"); - qualifiedNames.add("<"); - - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); - for (int indexd386e65 = 0; indexd386e65 < qualifiedNames.size(); indexd386e65++) { - qualifiedName = (String) qualifiedNames.get(indexd386e65); - - { - boolean success = false; - try { - element.setAttributeNS("http://www.w3.org/DOM/Test/L2";, qualifiedName, "test"); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("elementsetattributens04", success); - } + void testRun() throws Throwable { + String[] qualifiedNames = { "/", "//", "\\", ";", "&", "*", "]]", ">", "<" }; + + Document doc = load("staffNS", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); + for (String qualifiedName : qualifiedNames) { + DOMException ex = assertThrows(DOMException.class, () -> element.setAttributeNS("http://www.w3.org/DOM/Test/L2";, qualifiedName, "test")); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "elementsetattributens04"); } } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens05.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,24 +43,14 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributens05 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; + void testRun() throws Throwable { String nullNS = null; - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test/L2";, "dom:elem"); - - { - boolean success = false; - try { - element.setAttributeNS(nullNS, "dom:root", "test"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("elementsetattributens05", 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.setAttributeNS(nullNS, "dom:root", "test")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "elementsetattributens05"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens08.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens08.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens08.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributens08.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; @@ -44,32 +45,16 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributens08 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - doc = load("staffNS", true); - element = doc.createElementNS("http://www.w3.org/DOMTest/level2";, "dom:elem"); - - { - boolean success = false; - try { - element.setAttributeNS("http://www.w3.org/DOMTest/level2";, "xmlns", "test"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("elementsetattributens08_Err1", success); - } - - { - boolean success = false; - try { - element.setAttributeNS("http://www.w3.org/DOMTest/level2";, "xmlns:root", "test"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("elementsetattributens08_Err2", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + String nsURI = "http://www.w3.org/DOMTest/level2";; + Element element = doc.createElementNS(nsURI, "dom:elem"); + DOMException ex1 = assertThrows(DOMException.class, () -> element.setAttributeNS(nsURI, "xmlns", "test")); + assertEquals(DOMException.NAMESPACE_ERR, ex1.code, "elementsetattributens08_Err1"); + + DOMException ex2 = assertThrows(DOMException.class, () -> element.setAttributeNS(nsURI, "xmlns:root", "test")); + assertEquals(DOMException.NAMESPACE_ERR, ex2.code, "elementsetattributens08_Err2"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributensurinull.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributensurinull.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributensurinull.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributensurinull.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; @@ -43,27 +44,16 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributensurinull { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = null; - String qualifiedName = "emp:qualifiedName"; - Document doc; - NodeList elementList; - Node testAddr; - doc = load("staff", true); - elementList = doc.getElementsByTagName("employee"); - testAddr = elementList.item(0); - - { - boolean success = false; - try { - ((Element) /*Node */testAddr).setAttributeNS(namespaceURI, qualifiedName, "newValue"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + Document doc = load("staff", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testAddr = elementList.item(0); + + DOMException ex = assertThrows(DOMException.class, () -> ((Element)testAddr).setAttributeNS(namespaceURI, qualifiedName, "newValue")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS01.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.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,21 +44,16 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNS01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String localName = "district"; String qualifiedName = "emp:district"; - Document doc; - NodeList elementList; - Element testAddr; - String attrValue; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - attrValue = testAddr.getAttributeNS(namespaceURI, localName); - assertEquals("attrValue", "DISTRICT", attrValue); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + String attrValue = testAddr.getAttributeNS(namespaceURI, localName); + assertEquals("DISTRICT", attrValue, "attrValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS02.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; @@ -46,26 +46,19 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String localName = "district"; String qualifiedName = "emp:district"; - Document doc; - Attr newAttribute; - NodeList elementList; - Element testAddr; - Attr districtAttr; - String attrValue; - doc = load("staffNS", true); - newAttribute = doc.createAttributeNS(namespaceURI, qualifiedName); + Document doc = load("staffNS", true); + Attr newAttribute = doc.createAttributeNS(namespaceURI, qualifiedName); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + Attr districtAttr = testAddr.setAttributeNodeNS(newAttribute); elementList = doc.getElementsByTagName("emp:address"); testAddr = (Element) elementList.item(0); - districtAttr = testAddr.setAttributeNodeNS(newAttribute); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - attrValue = testAddr.getAttributeNS(namespaceURI, localName); - assertEquals("throw_Equals", "", attrValue); - + String attrValue = testAddr.getAttributeNS(namespaceURI, localName); + assertEquals("", attrValue, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS03.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,20 +43,15 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNS03 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String localName = "domestic"; - Document doc; - NodeList elementList; - Element testAddr; - String attrValue; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); testAddr.removeAttributeNS(namespaceURI, localName); - attrValue = testAddr.getAttributeNS(namespaceURI, localName); - assertEquals("throw_Equals", "", attrValue); - + String attrValue = testAddr.getAttributeNS(namespaceURI, localName); + assertEquals("", attrValue, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS04.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; @@ -46,24 +46,17 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNS04 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String localName = "blank"; String qualifiedName = "emp:blank"; - Document doc; - Attr newAttribute; - NodeList elementList; - Element testAddr; - Attr districtAttr; - String attrValue; - doc = load("staffNS", true); - newAttribute = doc.createAttributeNS(namespaceURI, qualifiedName); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); + Document doc = load("staffNS", true); + Attr newAttribute = doc.createAttributeNS(namespaceURI, qualifiedName); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); testAddr.setAttributeNS(namespaceURI, qualifiedName, "NewValue"); - attrValue = testAddr.getAttributeNS(namespaceURI, localName); - assertEquals("throw_Equals", "NewValue", attrValue); - + String attrValue = testAddr.getAttributeNS(namespaceURI, localName); + assertEquals("NewValue", attrValue, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNS05.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,17 +44,12 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNS05 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testAddr; - String attrValue; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - attrValue = testAddr.getAttributeNS("http://www.nist.gov";, "domestic"); - assertEquals("attrValue", "Yes", attrValue); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + String attrValue = testAddr.getAttributeNS("http://www.nist.gov";, "domestic"); + assertEquals("Yes", attrValue, "attrValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS01.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; @@ -46,19 +46,14 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNodeNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String localName = "invalidlocalname"; - Document doc; - NodeList elementList; - Element testAddr; - Attr attribute; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - attribute = testAddr.getAttributeNodeNS(namespaceURI, localName); - assertNull("throw_Null", attribute); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + Attr attribute = testAddr.getAttributeNodeNS(namespaceURI, localName); + assertNull(attribute, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS02.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; @@ -45,19 +45,13 @@ import static org.w3c.domts.DOMTest.load */ public class getAttributeNodeNS02 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testAddr; - Attr attribute; - String attrName; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = (Element) elementList.item(0); - attribute = testAddr.getAttributeNodeNS("http://www.nist.gov";, "domestic"); - attrName = attribute.getNodeName(); - assertEquals("attrName", "emp:domestic", attrName); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element testAddr = (Element) elementList.item(0); + Attr attribute = testAddr.getAttributeNodeNS("http://www.nist.gov";, "domestic"); + String attrName = attribute.getNodeName(); + assertEquals("emp:domestic", attrName, "attrName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById01.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.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,16 +43,12 @@ import static org.w3c.domts.DOMTest.load */ public class getElementById01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - String tagname; - doc = load("staffNS", false); - element = doc.getElementById("CANADA"); - tagname = element.getTagName(); - assertEquals("throw_Equals", "emp:address", tagname); - + Document doc = load("staffNS", false); + Element element = doc.getElementById("CANADA"); + String tagname = element.getTagName(); + assertEquals("emp:address", tagname, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementById02.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,13 +42,10 @@ import static org.w3c.domts.DOMTest.load */ public class getElementById02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - doc = load("staffNS", false); - element = doc.getElementById("Cancun"); - assertNull("throw_Null", element); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element element = doc.getElementById("Cancun"); + assertNull(element, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS01.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; @@ -48,17 +48,14 @@ import static org.w3c.domts.DOMTest.load public class getElementsByTagNameNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "*"; String localName = "*"; - Document doc; - NodeList newList; - doc = load("staffNS", false); - newList = doc.getElementsByTagNameNS(namespaceURI, localName); + Document doc = load("staffNS", false); + NodeList newList = doc.getElementsByTagNameNS(namespaceURI, localName); //Yana: claim is 37, I counted 36 - assertEquals("throw_Size", 36, newList.getLength()); - + assertEquals(36, newList.getLength(), "throw_Size"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS02.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,21 +46,15 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS02 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList newList; - Element newElement; - String prefix; - String lname; - doc = load("staffNS", false); - newList = doc.getElementsByTagNameNS("*", "employee"); - assertEquals("employeeCount", 5, newList.getLength()); - newElement = (Element) newList.item(3); - prefix = newElement.getPrefix(); - assertEquals("prefix", "emp", prefix); - lname = newElement.getLocalName(); - assertEquals("lname", "employee", lname); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList newList = doc.getElementsByTagNameNS("*", "employee"); + assertEquals(5, newList.getLength(), "employeeCount"); + Element newElement = (Element) newList.item(3); + String prefix = newElement.getPrefix(); + assertEquals("emp", prefix, "prefix"); + String lname = newElement.getLocalName(); + assertEquals("employee", lname, "lname"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.w3c.domts.DOMTest.load; @@ -45,38 +47,18 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS03 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node child; - String childName; - java.util.List result = new java.util.ArrayList(); - - java.util.List expectedResult = new java.util.ArrayList(); - expectedResult.add("employee"); - expectedResult.add("employeeId"); - expectedResult.add("name"); - expectedResult.add("position"); - expectedResult.add("salary"); - expectedResult.add("gender"); - expectedResult.add("address"); - expectedResult.add("emp:employee"); - expectedResult.add("emp:employeeId"); - expectedResult.add("emp:position"); - expectedResult.add("emp:salary"); - expectedResult.add("emp:gender"); - expectedResult.add("emp:address"); - expectedResult.add("address"); - - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "*"); - for (int indexd401e88 = 0; indexd401e88 < elementList.getLength(); indexd401e88++) { - child = elementList.item(indexd401e88); - childName = child.getNodeName(); - result.add(childName); - } - assertEquals("nodeNames", expectedResult, result); + void testRun() throws Throwable { + String[] expectedResult = { + "employee", "employeeId", "name", "position", "salary", "gender", "address", "emp:employee", + "emp:employeeId", "emp:position", "emp:salary", "emp:gender", "emp:address", "address" + }; + + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "*"); + String[] result = IntStream.range(0, elementList.getLength()) + .mapToObj(elementList::item).map(Node::getNodeName).toArray(String[]::new); + assertArrayEquals(expectedResult, result, "nodeNames"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS04.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.w3c.domts.DOMTest.load; @@ -45,29 +47,16 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS04 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node child; - String childName; - java.util.List result = new java.util.ArrayList(); - - java.util.List expectedResult = new java.util.ArrayList(); - expectedResult.add("address"); - expectedResult.add("address"); - expectedResult.add("address"); - expectedResult.add("emp:address"); - expectedResult.add("address"); - - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS("*", "address"); - for (int indexd402e59 = 0; indexd402e59 < elementList.getLength(); indexd402e59++) { - child = elementList.item(indexd402e59); - childName = child.getNodeName(); - result.add(childName); - } - assertEquals("nodeNames", expectedResult, result); + void testRun() throws Throwable { + String[] expectedResult = { "address", "address", "address", "emp:address", "address" }; + + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS("*", "address"); + + String[] result = IntStream.range(0, elementList.getLength()) + .mapToObj(elementList::item).map(Node::getNodeName).toArray(String[]::new); + assertArrayEquals(expectedResult, result, "nodeNames"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS05.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; @@ -45,15 +45,12 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String localName = "nomatch"; - Document doc; - NodeList elementList; - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS(namespaceURI, localName); - assertEquals("throw_Size", 0, elementList.getLength()); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS(namespaceURI, localName); + assertEquals(0, elementList.getLength(), "throw_Size"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS06.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; @@ -45,13 +45,10 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS06 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS("http://www.nomatch.com";, "address"); - assertEquals("matchSize", 0, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nomatch.com";, "address"); + assertEquals(0, elementList.getLength(), "matchSize"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS07.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; @@ -45,13 +45,10 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS07 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); - assertEquals("addresses", 3, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); + assertEquals(3, elementList.getLength(), "addresses"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS08.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS08.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS08.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS08.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -41,25 +41,15 @@ import static org.w3c.domts.DOMTest.load * * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1938918D";>http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1938918D</a> */ - - -/** - * - */ public class getElementsByTagNameNS08 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - NodeList newList; - doc = load("staffNS", false); - System.out.println(doc.getImplementation()); - docElem = doc.getDocumentElement(); - newList = docElem.getElementsByTagNameNS("*", "*"); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList newList = docElem.getElementsByTagNameNS("*", "*"); // 35, without the document element which we used to get the elements - System.out.println(docElem.getOwnerDocument().getImplementation()); - assertEquals("listSize" + docElem.getOwnerDocument().getImplementation(), 35, newList.getLength()); + assertEquals(35, newList.getLength()); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS09.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS09.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS09.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS09.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -47,23 +47,16 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS09 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList newList; - Element newElement; - String prefix; - String lname; - Element docElem; - doc = load("staffNS", false); - docElem = doc.getDocumentElement(); - newList = docElem.getElementsByTagNameNS("*", "employee"); - assertEquals("employeeCount", 5, newList.getLength()); - newElement = (Element) newList.item(3); - prefix = newElement.getPrefix(); - assertEquals("prefix", "emp", prefix); - lname = newElement.getLocalName(); - assertEquals("lname", "employee", lname); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList newList = docElem.getElementsByTagNameNS("*", "employee"); + assertEquals(5, newList.getLength(), "employeeCount"); + Element newElement = (Element) newList.item(3); + String prefix = newElement.getPrefix(); + assertEquals("emp", prefix, "prefix"); + String lname = newElement.getLocalName(); + assertEquals("employee", lname, "lname"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS10.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS10.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS10.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS10.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,15 @@ 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 java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.w3c.domts.DOMTest.load; @@ -47,40 +49,20 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS10 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - NodeList elementList; - Node child; - String childName; - java.util.List result = new java.util.ArrayList(); - - java.util.List expectedResult = new java.util.ArrayList(); - expectedResult.add("employee"); - expectedResult.add("employeeId"); - expectedResult.add("name"); - expectedResult.add("position"); - expectedResult.add("salary"); - expectedResult.add("gender"); - expectedResult.add("address"); - expectedResult.add("emp:employee"); - expectedResult.add("emp:employeeId"); - expectedResult.add("emp:position"); - expectedResult.add("emp:salary"); - expectedResult.add("emp:gender"); - expectedResult.add("emp:address"); - expectedResult.add("address"); - - doc = load("staffNS", false); - docElem = doc.getDocumentElement(); - elementList = docElem.getElementsByTagNameNS("http://www.nist.gov";, "*"); - for (int indexd408e92 = 0; indexd408e92 < elementList.getLength(); indexd408e92++) { - child = elementList.item(indexd408e92); - childName = child.getNodeName(); - result.add(childName); - } - assertEquals("nodeNames", expectedResult, result); + void testRun() throws Throwable { + String[] expectedResult = { + "employee", "employeeId", "name", "position", "salary", "gender", "address", "emp:employee", + "emp:employeeId", "emp:position", "emp:salary", "emp:gender", "emp:address", "address" + }; + + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList elementList = docElem.getElementsByTagNameNS("http://www.nist.gov";, "*"); + + String[] result = IntStream.range(0, elementList.getLength()) + .mapToObj(elementList::item).map(Node::getNodeName).toArray(String[]::new); + assertArrayEquals(expectedResult, result, "nodeNames"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS11.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS11.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS11.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS11.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,15 @@ 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 java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.w3c.domts.DOMTest.load; @@ -46,31 +48,17 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS11 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - NodeList elementList; - Node child; - String childName; - java.util.List result = new java.util.ArrayList(); - - java.util.List expectedResult = new java.util.ArrayList(); - expectedResult.add("address"); - expectedResult.add("address"); - expectedResult.add("address"); - expectedResult.add("emp:address"); - expectedResult.add("address"); - - doc = load("staffNS", false); - docElem = doc.getDocumentElement(); - elementList = docElem.getElementsByTagNameNS("*", "address"); - for (int indexd409e60 = 0; indexd409e60 < elementList.getLength(); indexd409e60++) { - child = elementList.item(indexd409e60); - childName = child.getNodeName(); - result.add(childName); - } - assertEquals("nodeNames", expectedResult, result); + void testRun() throws Throwable { + String[] expectedResult = {"address", "address", "address", "emp:address", "address"}; + + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList elementList = docElem.getElementsByTagNameNS("*", "address"); + + String[] result = IntStream.range(0, elementList.getLength()) + .mapToObj(elementList::item).map(Node::getNodeName).toArray(String[]::new); + assertArrayEquals(expectedResult, result, "nodeNames"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS12.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS12.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS12.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS12.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,15 +44,11 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS12 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - NodeList elementList; - doc = load("staffNS", false); - docElem = doc.getDocumentElement(); - elementList = docElem.getElementsByTagNameNS("http://www.nist.gov";, "nomatch"); - assertEquals("size", 0, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList elementList = docElem.getElementsByTagNameNS("http://www.nist.gov";, "nomatch"); + assertEquals(0, elementList.getLength(), "size"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS13.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS13.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS13.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS13.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -44,15 +44,11 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS13 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - NodeList elementList; - doc = load("staffNS", false); - docElem = doc.getDocumentElement(); - elementList = docElem.getElementsByTagNameNS("http://www.nomatch.com";, "address"); - assertEquals("matchSize", 0, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList elementList = docElem.getElementsByTagNameNS("http://www.nomatch.com";, "address"); + assertEquals(0, elementList.getLength(), "matchSize"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS14.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS14.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS14.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS14.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -45,15 +45,11 @@ import static org.w3c.domts.DOMTest.load */ public class getElementsByTagNameNS14 { @Test - public void testRun() throws Throwable { - Document doc; - Element docElem; - NodeList elementList; - doc = load("staffNS", false); - docElem = doc.getDocumentElement(); - elementList = docElem.getElementsByTagNameNS("http://www.nist.gov";, "address"); - assertEquals("addresses", 3, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element docElem = doc.getDocumentElement(); + NodeList elementList = docElem.getElementsByTagNameNS("http://www.nist.gov";, "address"); + assertEquals(3, elementList.getLength(), "addresses"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS01.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; @@ -43,21 +43,14 @@ import static org.w3c.domts.DOMTest.load */ public class getNamedItemNS01 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testEmployee; - NamedNodeMap attributes; - Attr domesticAttr; - String attrName; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("address"); - testEmployee = elementList.item(1); - attributes = testEmployee.getAttributes(); - domesticAttr = (Attr) attributes.getNamedItemNS("http://www.usa.com";, "domestic"); - attrName = domesticAttr.getNodeName(); - assertEquals("attrName", "dmstc:domestic", attrName); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("address"); + Node testEmployee = elementList.item(1); + NamedNodeMap attributes = testEmployee.getAttributes(); + Attr domesticAttr = (Attr) attributes.getNamedItemNS("http://www.usa.com";, "domestic"); + String attrName = domesticAttr.getNodeName(); + assertEquals("dmstc:domestic", attrName, "attrName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS02.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.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -45,21 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class getNamedItemNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.usa.com";; String localName = "domest"; - Document doc; - NodeList elementList; - Node testEmployee; - NamedNodeMap attributes; - Attr newAttr; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("address"); - testEmployee = elementList.item(1); - attributes = testEmployee.getAttributes(); - newAttr = (Attr) attributes.getNamedItemNS(namespaceURI, localName); - assertNull("throw_Null", newAttr); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("address"); + Node testEmployee = elementList.item(1); + NamedNodeMap attributes = testEmployee.getAttributes(); + Attr newAttr = (Attr) attributes.getNamedItemNS(namespaceURI, localName); + assertNull(newAttr, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS03.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.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Entity; import org.w3c.dom.NamedNodeMap; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -42,20 +42,15 @@ import static org.w3c.domts.DOMTest.load */ public class getNamedItemNS03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - NamedNodeMap entities; - Entity entity; String nullNS = null; - doc = load("staffNS", false); - docType = doc.getDoctype(); - entities = docType.getEntities(); - entity = (Entity) entities.getNamedItemNS(nullNS, "ent1"); - assertNull("entityNull", entity); - + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + NamedNodeMap entities = docType.getEntities(); + Entity entity = (Entity) entities.getNamedItemNS(nullNS, "ent1"); + assertNull(entity, "entityNull"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/getNamedItemNS04.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.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Notation; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -42,20 +42,15 @@ import static org.w3c.domts.DOMTest.load */ public class getNamedItemNS04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - NamedNodeMap notations; - Notation notation; String nullNS = null; - doc = load("staffNS", false); - docType = doc.getDoctype(); - notations = docType.getNotations(); - notation = (Notation) notations.getNamedItemNS(nullNS, "notation1"); - assertNull("notationNull", notation); - + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + NamedNodeMap notations = docType.getNotations(); + Notation notation = (Notation) notations.getNamedItemNS(nullNS, "notation1"); + assertNull(notation, "notationNull"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute01.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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -42,17 +42,12 @@ import static org.w3c.domts.DOMTest.load */ public class hasAttribute01 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testNode; - boolean state; - doc = load("staff", false); - elementList = doc.getElementsByTagName("address"); - testNode = (Element) elementList.item(4); - state = testNode.hasAttribute("domestic"); - assertFalse("throw_False", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + NodeList elementList = doc.getElementsByTagName("address"); + Element testNode = (Element) elementList.item(4); + boolean state = testNode.hasAttribute("domestic"); + assertFalse(state, "throw_False"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute02.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.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; @@ -43,18 +43,13 @@ import static org.w3c.domts.DOMTest.load */ public class hasAttribute02 { @Test - @Ignore("default attribute not supported") + @Disabled("default attribute not supported") public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testNode; - boolean state; - doc = load("staff", false); - elementList = doc.getElementsByTagName("address"); - testNode = (Element) elementList.item(0); - state = testNode.hasAttribute("street"); - assertTrue("throw_True", state); - + Document doc = load("staff", false); + NodeList elementList = doc.getElementsByTagName("address"); + Element testNode = (Element) elementList.item(0); + boolean state = testNode.hasAttribute("street"); + assertTrue(state, "throw_True"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute03.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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -42,17 +42,12 @@ import static org.w3c.domts.DOMTest.load */ public class hasAttribute03 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testNode; - boolean state; - doc = load("staff", false); - elementList = doc.getElementsByTagName("address"); - testNode = (Element) elementList.item(0); - state = testNode.hasAttribute("nomatch"); - assertFalse("throw_False", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + NodeList elementList = doc.getElementsByTagName("address"); + Element testNode = (Element) elementList.item(0); + boolean state = testNode.hasAttribute("nomatch"); + assertFalse(state, "throw_False"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttribute04.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; @@ -42,17 +42,12 @@ import static org.w3c.domts.DOMTest.load */ public class hasAttribute04 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element testNode; - boolean state; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("address"); - testNode = (Element) elementList.item(0); - state = testNode.hasAttribute("dmstc:domestic"); - assertTrue("hasDomesticAttr", state); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("address"); + Element testNode = (Element) elementList.item(0); + boolean state = testNode.hasAttribute("dmstc:domestic"); + assertTrue(state, "hasDomesticAttr"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttributeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttributeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttributeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/hasAttributeNS01.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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -44,19 +44,14 @@ import static org.w3c.domts.DOMTest.load */ public class hasAttributeNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String localName = "nomatch"; String namespaceURI = "http://www.usa.com";; - Document doc; - NodeList elementList; - Element testNode; - boolean state; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("address"); - testNode = (Element) elementList.item(0); - state = testNode.hasAttributeNS(namespaceURI, localName); - assertFalse("throw_False", state); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("address"); + Element testNode = (Element) elementList.item(0); + boolean state = testNode.hasAttributeNS(namespaceURI, localName); + assertFalse(state, "throw_False"); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
