Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/ownerElement02.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.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -43,15 +43,11 @@ import static org.w3c.domts.DOMTest.load */ public class ownerElement02 { @Test - public void testRun() throws Throwable { - Document doc; - Attr newAttr; - Element elementNode; - doc = load("staff", false); - newAttr = doc.createAttribute("newAttribute"); - elementNode = newAttr.getOwnerElement(); - assertNull("throw_Null", elementNode); - + void testRun() throws Throwable { + Document doc = load("staff", false); + Attr newAttr = doc.createAttribute("newAttribute"); + Element elementNode = newAttr.getOwnerElement(); + assertNull(elementNode, "throw_Null"); } /**
Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix01.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -44,15 +44,11 @@ import static org.w3c.domts.DOMTest.load */ public class prefix01 { @Test - public void testRun() throws Throwable { - Document doc; - Node createdNode; - String prefix; - doc = load("staffNS", false); - createdNode = doc.createElement("test:employee"); - prefix = createdNode.getPrefix(); - assertNull("throw_Null", prefix); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Node createdNode = doc.createElement("test:employee"); + String prefix = createdNode.getPrefix(); + assertNull(prefix, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix02.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -45,20 +45,14 @@ import static org.w3c.domts.DOMTest.load */ public class prefix02 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testEmployee; - Node textNode; - String prefix; + void testRun() throws Throwable { String sExpected = null; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:employeeId"); - testEmployee = elementList.item(0); - textNode = testEmployee.getFirstChild(); - prefix = textNode.getPrefix(); - assertEquals("textNodePrefix", sExpected, prefix); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:employeeId"); + Node testEmployee = elementList.item(0); + Node textNode = testEmployee.getFirstChild(); + String prefix = textNode.getPrefix(); + assertEquals(sExpected, prefix, "textNodePrefix"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix03.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 prefix03 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testEmployee; - String prefix; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:employee"); - testEmployee = elementList.item(0); - prefix = testEmployee.getPrefix(); - assertEquals("prefix", "emp", prefix); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:employee"); + Node testEmployee = elementList.item(0); + String prefix = testEmployee.getPrefix(); + assertEquals("emp", prefix, "prefix"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix04.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.Node; 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; @@ -43,18 +43,13 @@ import static org.w3c.domts.DOMTest.load */ public class prefix04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testEmployee; - String prefix; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("employee"); - testEmployee = elementList.item(0); - prefix = testEmployee.getPrefix(); - assertNull("throw_Null", prefix); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testEmployee = elementList.item(0); + String prefix = testEmployee.getPrefix(); + assertNull(prefix, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix05.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; @@ -46,26 +47,14 @@ import static org.w3c.domts.DOMTest.load */ public class prefix05 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element addrNode; - Attr addrAttr; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - addrNode = (Element) elementList.item(0); - addrAttr = addrNode.getAttributeNode("emp:domestic"); - - { - boolean success = false; - try { - addrAttr.setPrefix("xmlns"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Element addrNode = (Element) elementList.item(0); + Attr addrAttr = addrNode.getAttributeNode("emp:domestic"); + DOMException ex = assertThrows(DOMException.class, () -> addrAttr.setPrefix("xmlns")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix06.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.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -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; @@ -47,24 +48,13 @@ import static org.w3c.domts.DOMTest.load */ public class prefix06 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node employeeNode; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("employee"); - employeeNode = elementList.item(0); - - { - boolean success = false; - try { - employeeNode.setPrefix("pre^fix xmlns='http//www.nist.gov'"); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("throw_INVALID_CHARACTER_ERR", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node employeeNode = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> employeeNode.setPrefix("pre^fix xmlns='http//www.nist.gov'")); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "throw_INVALID_CHARACTER_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix07.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.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -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; @@ -46,25 +47,13 @@ import static org.w3c.domts.DOMTest.load */ public class prefix07 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node employeeNode; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("employee"); - employeeNode = elementList.item(0); - - { - boolean success = false; - try { - employeeNode.setPrefix("emp::"); - } catch (DOMException ex) { - - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR, specified prefix if malformed", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node employeeNode = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> employeeNode.setPrefix("emp::")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR, specified prefix if malformed"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix08.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix08.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix08.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix08.java Sun Feb 6 01:51:55 2022 @@ -22,15 +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.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.w3c.domts.DOMTest.isExpandEntityReferences; import static org.w3c.domts.DOMTest.load; @@ -51,39 +50,26 @@ import static org.w3c.domts.DOMTest.load */ public class prefix08 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - NodeList genderList; - Node genderNode; - Node entRef; - Node entElement; - Node createdNode; - doc = load("staff", true); + Document doc = load("staff", true); + Node entRef; if (!isExpandEntityReferences()) { - genderList = doc.getElementsByTagName("gender"); - genderNode = genderList.item(2); + NodeList genderList = doc.getElementsByTagName("gender"); + Node genderNode = genderList.item(2); entRef = genderNode.getFirstChild(); } else { entRef = doc.createEntityReference("ent4"); } - assertNotNull("entityRef", entRef); - entElement = entRef.getFirstChild(); - assertNotNull("entElement", entElement); - createdNode = doc.createElement("text3"); - - { - boolean success = false; - try { - entElement.setPrefix("newPrefix"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); - } + assertNotNull(entRef, "entityRef"); + Node entElement = entRef.getFirstChild(); + assertNotNull(entElement, "entElement"); + Node createdNode = doc.createElement("text3"); + DOMException ex = assertThrows(DOMException.class, () -> entElement.setPrefix("newPrefix")); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "throw_NO_MODIFICATION_ALLOWED_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix09.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix09.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix09.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix09.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; @@ -45,26 +46,14 @@ import static org.w3c.domts.DOMTest.load */ public class prefix09 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Element addrNode; - Attr addrAttr; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("address"); - addrNode = (Element) elementList.item(3); - addrAttr = addrNode.getAttributeNode("xmlns"); - - { - boolean success = false; - try { - addrAttr.setPrefix("xxx"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("address"); + Element addrNode = (Element) elementList.item(3); + Attr addrAttr = addrNode.getAttributeNode("xmlns"); + DOMException ex = assertThrows(DOMException.class, () -> addrAttr.setPrefix("xxx")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix10.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix10.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix10.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix10.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.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -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; @@ -48,24 +49,13 @@ import static org.w3c.domts.DOMTest.load */ public class prefix10 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node employeeNode; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("employee"); - employeeNode = elementList.item(1); - - { - boolean success = false; - try { - employeeNode.setPrefix("xml"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node employeeNode = elementList.item(1); + DOMException ex = assertThrows(DOMException.class, () -> employeeNode.setPrefix("xml")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix11.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix11.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix11.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/prefix11.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.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -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; @@ -47,26 +48,13 @@ import static org.w3c.domts.DOMTest.load */ public class prefix11 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node employeeNode; - String namespaceURI; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("employee"); - employeeNode = elementList.item(1); - namespaceURI = employeeNode.getNamespaceURI(); - - { - boolean success = false; - try { - employeeNode.setPrefix("employee1"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node employeeNode = elementList.item(1); + DOMException ex = assertThrows(DOMException.class, () -> employeeNode.setPrefix("employee1")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/publicId01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/publicId01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/publicId01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/publicId01.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.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 publicId01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - String publicId; - doc = load("staffNS", false); - docType = doc.getDoctype(); - publicId = docType.getPublicId(); - assertEquals("throw_Equals", "STAFF", publicId); - + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + String publicId = docType.getPublicId(); + assertEquals("STAFF", publicId, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.w3c.domts.DOMTest.isExpandEntityReferences; import static org.w3c.domts.DOMTest.load; @@ -49,40 +48,26 @@ import static org.w3c.domts.DOMTest.load */ public class removeAttributeNS01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - NodeList genderList; - Node gender; - NodeList genList; - Node gen; - NodeList gList; - Element genElement; - doc = load("staffNS", true); + Document doc = load("staffNS", true); + Node gen; if (!isExpandEntityReferences()) { - genderList = doc.getElementsByTagName("gender"); - gender = genderList.item(2); - genList = gender.getChildNodes(); + NodeList genderList = doc.getElementsByTagName("gender"); + Node gender = genderList.item(2); + NodeList genList = gender.getChildNodes(); gen = genList.item(0); } else { gen = doc.createEntityReference("ent4"); } - gList = gen.getChildNodes(); - genElement = (Element) gList.item(0); - assertNotNull("notnull", genElement); - - { - boolean success = false; - try { - genElement.removeAttributeNS("www.xyz.com", "local1"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); - } + NodeList gList = gen.getChildNodes(); + Element genElement = (Element) gList.item(0); + assertNotNull(genElement, "notnull"); + DOMException ex = assertThrows(DOMException.class, () -> genElement.removeAttributeNS("www.xyz.com", "local1")); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "throw_NO_MODIFICATION_ALLOWED_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.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; @@ -47,32 +47,23 @@ import static org.w3c.domts.DOMTest.load */ public class removeAttributeNS02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testAddr; - Attr addrAttr; - String attr; - String namespaceURI; - String localName; - String prefix; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); ((Element) /*Node */testAddr).removeAttributeNS("http://www.nist.gov";, "local1"); elementList = doc.getElementsByTagName("emp:address"); testAddr = elementList.item(0); - addrAttr = ((Element) /*Node */testAddr).getAttributeNodeNS("http://www.nist.gov";, "local1"); - attr = ((Element) /*Node */testAddr).getAttributeNS("http://www.nist.gov";, "local1"); - namespaceURI = addrAttr.getNamespaceURI(); - localName = addrAttr.getLocalName(); - prefix = testAddr.getPrefix(); - assertEquals("attr", "FALSE", attr); - assertEquals("uri", "http://www.nist.gov";, namespaceURI); - assertEquals("lname", "local1", localName); - assertEquals("prefix", "emp", prefix); - + Attr addrAttr = ((Element) /*Node */testAddr).getAttributeNodeNS("http://www.nist.gov";, "local1"); + String attr = ((Element) /*Node */testAddr).getAttributeNS("http://www.nist.gov";, "local1"); + String namespaceURI = addrAttr.getNamespaceURI(); + String localName = addrAttr.getLocalName(); + String prefix = testAddr.getPrefix(); + assertEquals("FALSE", attr, "attr"); + assertEquals("http://www.nist.gov";, namespaceURI, "uri"); + assertEquals("local1", localName, "lname"); + assertEquals("emp", prefix, "prefix"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.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; @@ -45,22 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class removeNamedItemNS01 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testAddress; - NamedNodeMap attributes; - Attr newAttr; - Node removedNode; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("address"); - testAddress = elementList.item(1); - attributes = testAddress.getAttributes(); - removedNode = attributes.removeNamedItemNS("http://www.usa.com";, "domestic"); - assertNotNull("retval", removedNode); - newAttr = (Attr) attributes.getNamedItem("dmstc:domestic"); - assertNull("nodeRemoved", newAttr); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("address"); + Node testAddress = elementList.item(1); + NamedNodeMap attributes = testAddress.getAttributes(); + Node removedNode = attributes.removeNamedItemNS("http://www.usa.com";, "domestic"); + assertNotNull(removedNode, "retval"); + Attr newAttr = (Attr) attributes.getNamedItem("dmstc:domestic"); + assertNull(newAttr, "nodeRemoved"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.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; @@ -47,29 +48,16 @@ import static org.w3c.domts.DOMTest.load */ public class removeNamedItemNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.usa.com";; String localName = "domest"; - Document doc; - NodeList elementList; - Node testAddress; - NamedNodeMap attributes; - Node removedNode; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("address"); - testAddress = elementList.item(1); - attributes = testAddress.getAttributes(); - - { - boolean success = false; - try { - removedNode = attributes.removeNamedItemNS(namespaceURI, localName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NOT_FOUND_ERR); - } - assertTrue("throw_NOT_FOUND_ERR", success); - } + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("address"); + Node testAddress = elementList.item(1); + NamedNodeMap attributes = testAddress.getAttributes(); + DOMException ex = assertThrows(DOMException.class, () -> attributes.removeNamedItemNS(namespaceURI, localName)); + assertEquals(DOMException.NOT_FOUND_ERR, ex.code, "throw_NOT_FOUND_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.w3c.domts.DOMTest.isExpandEntityReferences; import static org.w3c.domts.DOMTest.load; @@ -49,46 +48,32 @@ import static org.w3c.domts.DOMTest.load */ public class removeNamedItemNS03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/2000/xmlns/";; String localName = "local1"; - Document doc; - NodeList elementList; - Node testAddress; - NodeList nList; - Node child; - NodeList n2List; - Node child2; - NamedNodeMap attributes; - Node removedNode; - doc = load("staffNS", true); + Document doc = load("staffNS", true); + Node child; if (!isExpandEntityReferences()) { - elementList = doc.getElementsByTagName("gender"); - testAddress = elementList.item(1); //YK: was 2 but 2 is ER - nList = testAddress.getChildNodes(); + NodeList elementList = doc.getElementsByTagName("gender"); + //YK: was 2 but 2 is ER + Node testAddress = elementList.item(1); + NodeList nList = testAddress.getChildNodes(); child = nList.item(0); } else { child = doc.createEntityReference("ent4"); } + //child is now the text val of the gender - //n2List = child.getChildNodes(); - // child2 = n2List.item(0); - child2 = child; - assertNotNull("notnull", child2); - attributes = child2.getAttributes(); - - { - boolean success = false; - try { - removedNode = attributes.removeNamedItemNS(namespaceURI, localName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); - } + // NodeList n2List = child.getChildNodes(); + // child2 = n2List.item(0); + Node child2 = child; + assertNotNull(child2, "notnull"); + NamedNodeMap attributes = child2.getAttributes(); + DOMException ex = assertThrows(DOMException.class, () -> attributes.removeNamedItemNS(namespaceURI, localName)); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "throw_NO_MODIFICATION_ALLOWED_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.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; @@ -44,26 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String qualifiedName = "emp:qual?name"; - Document doc; - NodeList elementList; - Node testAddr; - doc = load("staffNS", 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.INVALID_CHARACTER_ERR); - } - assertTrue("throw_INVALID_CHARACTER_ERR", success); - } + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testAddr = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> ((Element) /*Node */testAddr).setAttributeNS(namespaceURI, qualifiedName, "newValue")); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "throw_INVALID_CHARACTER_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.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,28 +44,15 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String qualifiedName = "emp:"; - Document doc; - NodeList elementList; - Node testAddr; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp: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,NAMESPACE_ERR DOMException if the specified\n" + - "\n" + - " qualifiedName if malformed ", success); - } + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:employee"); + Node testAddr = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> ((Element) /*Node */testAddr).setAttributeNS(namespaceURI, qualifiedName, "newValue")); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR,NAMESPACE_ERR DOMException if the specified qualifiedName is malformed "); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.w3c.domts.DOMTest.isExpandEntityReferences; import static org.w3c.domts.DOMTest.load; @@ -49,21 +48,15 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "www.xyz.com"; String qualifiedName = "emp:local1"; - Document doc; - NodeList genderList; - Node gender; - NodeList genList; - Node gen; - NodeList gList; - Element genElement; - doc = load("staffNS", true); + Document doc = load("staffNS", true); + Node gen; if (!isExpandEntityReferences()) { - genderList = doc.getElementsByTagName("gender"); + NodeList genderList = doc.getElementsByTagName("gender"); //ykadiysk: item(2) is an empty gender element: it has no child nodes. // Changing it to 1 //gender = genderList.item(1); @@ -76,21 +69,13 @@ public class setAttributeNS03 { gen = doc.createEntityReference("ent4"); } - gList = gen.getChildNodes(); + NodeList gList = gen.getChildNodes(); - genElement = (Element) gList.item(0); - assertNotNull("notnull", genElement); - - { - boolean success = false; - try { - genElement.setAttributeNS(namespaceURI, qualifiedName, "newValue"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); - } + Element genElement = (Element) gList.item(0); + assertNotNull(genElement, "notnull"); + DOMException ex = assertThrows(DOMException.class, () -> genElement.setAttributeNS(namespaceURI, qualifiedName, "newValue")); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "throw_NO_MODIFICATION_ALLOWED_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.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; @@ -47,29 +47,20 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS04 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testAddr; - Attr addrAttr; - String resultAttr; - String resultNamespaceURI; - String resultLocalName; - String resultPrefix; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); ((Element) /*Node */testAddr).setAttributeNS("http://www.nist.gov";, "newprefix:zone", "newValue"); - addrAttr = ((Element) /*Node */testAddr).getAttributeNodeNS("http://www.nist.gov";, "zone"); - resultAttr = ((Element) /*Node */testAddr).getAttributeNS("http://www.nist.gov";, "zone"); - assertEquals("attrValue", "newValue", resultAttr); - resultNamespaceURI = addrAttr.getNamespaceURI(); - assertEquals("nsuri", "http://www.nist.gov";, resultNamespaceURI); - resultLocalName = addrAttr.getLocalName(); - assertEquals("lname", "zone", resultLocalName); - resultPrefix = addrAttr.getPrefix(); - assertEquals("prefix", "newprefix", resultPrefix); - + Attr addrAttr = ((Element) /*Node */testAddr).getAttributeNodeNS("http://www.nist.gov";, "zone"); + String resultAttr = ((Element) /*Node */testAddr).getAttributeNS("http://www.nist.gov";, "zone"); + assertEquals("newValue", resultAttr, "attrValue"); + String resultNamespaceURI = addrAttr.getNamespaceURI(); + assertEquals("http://www.nist.gov";, resultNamespaceURI, "nsuri"); + String resultLocalName = addrAttr.getLocalName(); + assertEquals("zone", resultLocalName, "lname"); + String resultPrefix = addrAttr.getPrefix(); + assertEquals("newprefix", resultPrefix, "prefix"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.*; +import org.junit.jupiter.api.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,22 +49,16 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String localName = "newAttr"; String namespaceURI = "http://www.newattr.com";; String qualifiedName = "emp:newAttr"; - Document doc; - NodeList elementList; - Node testAddr; - Attr addrAttr; - String resultAttr; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); ((Element) /*Node */testAddr).setAttributeNS(namespaceURI, qualifiedName, "<newValue>"); - resultAttr = ((Element) /*Node */testAddr).getAttributeNS(namespaceURI, localName); - assertEquals("throw_Equals", "<newValue>", resultAttr); - + String resultAttr = ((Element) /*Node */testAddr).getAttributeNS(namespaceURI, localName); + assertEquals("<newValue>", resultAttr, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.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; @@ -45,26 +46,15 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS06 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String qualifiedName = "xml:qualifiedName"; - Document doc; - NodeList elementList; - Node testAddr; - doc = load("staffNS", 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("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testAddr = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> ((Element) /*Node */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/setAttributeNS07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.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; @@ -46,26 +47,15 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS07 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String qualifiedName = "xmlns"; - Document doc; - NodeList elementList; - Node testAddr; - doc = load("staffNS", 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("staffNS", true); + NodeList elementList = doc.getElementsByTagName("employee"); + Node testAddr = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> ((Element) /*Node */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/setAttributeNS09.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.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; @@ -45,32 +45,23 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNS09 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String localName = "newAttr"; String namespaceURI = "http://www.newattr.com";; String qualifiedName = "emp:newAttr"; - Document doc; - NodeList elementList; - Node testAddr; - Attr addrAttr; - String resultAttr; - String resultNamespaceURI; - String resultLocalName; - String resultPrefix; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); ((Element) /*Node */testAddr).setAttributeNS(namespaceURI, qualifiedName, "newValue"); - addrAttr = ((Element) /*Node */testAddr).getAttributeNodeNS(namespaceURI, localName); - resultAttr = ((Element) /*Node */testAddr).getAttributeNS(namespaceURI, localName); - assertEquals("attrValue", "newValue", resultAttr); - resultNamespaceURI = addrAttr.getNamespaceURI(); - assertEquals("nsuri", "http://www.newattr.com";, resultNamespaceURI); - resultLocalName = addrAttr.getLocalName(); - assertEquals("lname", "newAttr", resultLocalName); - resultPrefix = addrAttr.getPrefix(); - assertEquals("prefix", "emp", resultPrefix); - + Attr addrAttr = ((Element) /*Node */testAddr).getAttributeNodeNS(namespaceURI, localName); + String resultAttr = ((Element) /*Node */testAddr).getAttributeNS(namespaceURI, localName); + assertEquals("newValue", resultAttr, "attrValue"); + String resultNamespaceURI = addrAttr.getNamespaceURI(); + assertEquals("http://www.newattr.com";, resultNamespaceURI, "nsuri"); + String resultLocalName = addrAttr.getLocalName(); + assertEquals("newAttr", resultLocalName, "lname"); + String resultPrefix = addrAttr.getPrefix(); + assertEquals("emp", resultPrefix, "prefix"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.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; @@ -49,35 +50,19 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNodeNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.newattr.com";; String qualifiedName = "emp:newAttr"; - Document doc; - Element newElement; - Attr newAttr; - NodeList elementList; - Node testAddr; - Node appendedChild; - Attr setAttr1; - Attr setAttr2; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); - newElement = doc.createElement("newElement"); - appendedChild = testAddr.appendChild(newElement); - newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); - setAttr1 = newElement.setAttributeNodeNS(newAttr); - - { - boolean success = false; - try { - setAttr2 = ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr); - } catch (DOMException ex) { - success = (ex.code == DOMException.INUSE_ATTRIBUTE_ERR); - } - assertTrue("throw_INUSE_ATTRIBUTE_ERR", success); - } + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); + Element newElement = doc.createElement("newElement"); + Node appendedChild = testAddr.appendChild(newElement); + Attr newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); + Attr setAttr1 = newElement.setAttributeNodeNS(newAttr); + DOMException ex = assertThrows(DOMException.class, () -> ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr)); + assertEquals(DOMException.INUSE_ATTRIBUTE_ERR, ex.code, "throw_INUSE_ATTRIBUTE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.w3c.domts.DOMTest.isExpandEntityReferences; import static org.w3c.domts.DOMTest.load; @@ -49,43 +48,27 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNodeNS02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - NodeList genderList; - Node gender; - NodeList genList; - Node gen; - NodeList gList; - Element genElement; - Attr newAttr; - Attr setAttr1; - doc = load("staffNS", true); + Document doc = load("staffNS", true); + Node gen; if (!isExpandEntityReferences()) { - genderList = doc.getElementsByTagName("gender"); - gender = genderList.item(2); - genList = gender.getChildNodes(); + NodeList genderList = doc.getElementsByTagName("gender"); + Node gender = genderList.item(2); + NodeList genList = gender.getChildNodes(); gen = genList.item(0); } else { gen = doc.createEntityReference("ent4"); } - gList = gen.getChildNodes(); - genElement = (Element) gList.item(0); - assertNotNull("notnull", genElement); - newAttr = doc.createAttributeNS("www.xyz.com", "emp:local1"); - - { - boolean success = false; - try { - setAttr1 = genElement.setAttributeNodeNS(newAttr); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); - } + NodeList gList = gen.getChildNodes(); + Element genElement = (Element) gList.item(0); + assertNotNull(genElement, "notnull"); + Attr newAttr = doc.createAttributeNS("www.xyz.com", "emp:local1"); + DOMException ex = assertThrows(DOMException.class, () -> genElement.setAttributeNodeNS(newAttr)); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "throw_NO_MODIFICATION_ALLOWED_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.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 setAttributeNodeNS03 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.newattr.com";; String qualifiedName = "emp:newAttr"; - Document doc; - NodeList elementList; - Node testAddr; - Attr newAttr; - Attr newAddrAttr; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); - newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); - newAddrAttr = ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr); - assertNull("throw_Null", newAddrAttr); - + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); + Attr newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); + Attr newAddrAttr = ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr); + assertNull(newAddrAttr, "throw_Null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.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; @@ -45,21 +45,14 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNodeNS04 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node testAddr; - Attr newAttr; - Attr newAddrAttr; - String newName; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); - newAttr = doc.createAttributeNS("http://www.nist.gov";, "xxx:domestic"); - newAddrAttr = ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr); - newName = newAddrAttr.getNodeName(); - assertEquals("nodeName", "emp:domestic", newName); - + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); + Attr newAttr = doc.createAttributeNS("http://www.nist.gov";, "xxx:domestic"); + Attr newAddrAttr = ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr); + String newName = newAddrAttr.getNodeName(); + assertEquals("emp:domestic", newName, "nodeName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.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; @@ -49,31 +50,17 @@ import static org.w3c.domts.DOMTest.load */ public class setAttributeNodeNS05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.newattr.com";; String qualifiedName = "emp:newAttr"; - Document doc1; - Document doc2; - Attr newAttr; - NodeList elementList; - Node testAddr; - Attr setAttr1; - doc1 = load("staffNS", true); - doc2 = load("staffNS", true); - newAttr = doc2.createAttributeNS(namespaceURI, qualifiedName); - elementList = doc1.getElementsByTagName("emp:address"); - testAddr = elementList.item(0); - - { - boolean success = false; - try { - setAttr1 = ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr); - } catch (DOMException ex) { - success = (ex.code == DOMException.WRONG_DOCUMENT_ERR); - } - assertTrue("throw_WRONG_DOCUMENT_ERR", success); - } + Document doc1 = load("staffNS", true); + Document doc2 = load("staffNS", true); + Attr newAttr = doc2.createAttributeNS(namespaceURI, qualifiedName); + NodeList elementList = doc1.getElementsByTagName("emp:address"); + Node testAddr = elementList.item(0); + DOMException ex = assertThrows(DOMException.class, () -> ((Element) /*Node */testAddr).setAttributeNodeNS(newAttr)); + assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code, "throw_WRONG_DOCUMENT_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.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; @@ -46,33 +47,17 @@ import static org.w3c.domts.DOMTest.load */ public class setNamedItemNS01 { @Test - public void testRun() throws Throwable { - Document doc; - NodeList elementList; - Node anotherElement; - NamedNodeMap anotherMap; - Node arg; - Node testAddress; - NamedNodeMap map; - Node setNode; - doc = load("staffNS", true); - elementList = doc.getElementsByTagName("address"); - anotherElement = elementList.item(2); - anotherMap = anotherElement.getAttributes(); - arg = anotherMap.getNamedItemNS("http://www.netzero.com";, "domestic"); - testAddress = elementList.item(0); - map = testAddress.getAttributes(); - - { - boolean success = false; - try { - setNode = map.setNamedItemNS(arg); - } catch (DOMException ex) { - success = (ex.code == DOMException.INUSE_ATTRIBUTE_ERR); - } - assertTrue("throw_INUSE_ATTRIBUTE_ERR", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagName("address"); + Node anotherElement = elementList.item(2); + NamedNodeMap anotherMap = anotherElement.getAttributes(); + Node arg = anotherMap.getNamedItemNS("http://www.netzero.com";, "domestic"); + Node testAddress = elementList.item(0); + NamedNodeMap map = testAddress.getAttributes(); + DOMException ex = assertThrows(DOMException.class, () -> map.setNamedItemNS(arg)); + assertEquals(DOMException.INUSE_ATTRIBUTE_ERR, ex.code, "throw_INUSE_ATTRIBUTE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.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; @@ -46,34 +47,19 @@ import static org.w3c.domts.DOMTest.load */ public class setNamedItemNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.usa.com";; String qualifiedName = "dmstc:domestic"; - Document doc; - Document anotherDoc; - Node arg; - NodeList elementList; - Node testAddress; - NamedNodeMap attributes; - Node setNode; - doc = load("staffNS", true); - anotherDoc = load("staffNS", true); - arg = anotherDoc.createAttributeNS(namespaceURI, qualifiedName); + Document doc = load("staffNS", true); + Document anotherDoc = load("staffNS", true); + Node arg = anotherDoc.createAttributeNS(namespaceURI, qualifiedName); arg.setNodeValue("Maybe"); - elementList = doc.getElementsByTagName("address"); - testAddress = elementList.item(0); - attributes = testAddress.getAttributes(); - - { - boolean success = false; - try { - setNode = attributes.setNamedItemNS(arg); - } catch (DOMException ex) { - success = (ex.code == DOMException.WRONG_DOCUMENT_ERR); - } - assertTrue("throw_WRONG_DOCUMENT_ERR", success); - } + NodeList elementList = doc.getElementsByTagName("address"); + Node testAddress = elementList.item(0); + NamedNodeMap attributes = testAddress.getAttributes(); + DOMException ex = assertThrows(DOMException.class, () -> attributes.setNamedItemNS(arg)); + assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code, "throw_WRONG_DOCUMENT_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.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.NamedNodeMap; 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; @@ -47,28 +47,19 @@ import static org.w3c.domts.DOMTest.load */ public class setNamedItemNS03 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String qualifiedName = "prefix:newAttr"; - Document doc; - Node arg; - NodeList elementList; - Node testAddress; - NamedNodeMap attributes; - Node retnode; - String value; - Node setNode; - doc = load("staffNS", true); - arg = doc.createAttributeNS(namespaceURI, qualifiedName); + Document doc = load("staffNS", true); + Node arg = doc.createAttributeNS(namespaceURI, qualifiedName); arg.setNodeValue("newValue"); - elementList = doc.getElementsByTagName("address"); - testAddress = elementList.item(0); - attributes = testAddress.getAttributes(); - setNode = attributes.setNamedItemNS(arg); - retnode = attributes.getNamedItemNS(namespaceURI, "newAttr"); - value = retnode.getNodeValue(); - assertEquals("throw_Equals", "newValue", value); - + NodeList elementList = doc.getElementsByTagName("address"); + Node testAddress = elementList.item(0); + NamedNodeMap attributes = testAddress.getAttributes(); + Node setNode = attributes.setNamedItemNS(arg); + Node retnode = attributes.getNamedItemNS(namespaceURI, "newAttr"); + String value = retnode.getNodeValue(); + assertEquals("newValue", value, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java Sun Feb 6 01:51:55 2022 @@ -22,12 +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.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.w3c.domts.DOMTest.isExpandEntityReferences; import static org.w3c.domts.DOMTest.load; @@ -49,47 +48,30 @@ import static org.w3c.domts.DOMTest.load */ public class setNamedItemNS04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/2000/xmlns/";; String localName = "local1"; - Document doc; - NodeList elementList; - Node testAddress; - NodeList nList; - Node child; - NodeList n2List; - Node child2; - NamedNodeMap attributes; - Node arg; - Node setNode; - doc = load("staffNS", true); + Document doc = load("staffNS", true); + Node child; if (!isExpandEntityReferences()) { - elementList = doc.getElementsByTagName("gender"); - testAddress = elementList.item(2); - nList = testAddress.getChildNodes(); + NodeList elementList = doc.getElementsByTagName("gender"); + Node testAddress = elementList.item(2); + NodeList nList = testAddress.getChildNodes(); child = nList.item(0); } else { child = doc.createEntityReference("ent4"); } - n2List = child.getChildNodes(); - child2 = n2List.item(0); - assertNotNull("notnull", child2); - attributes = child2.getAttributes(); - arg = attributes.getNamedItemNS(namespaceURI, localName); - - { - boolean success = false; - try { - setNode = attributes.setNamedItemNS(arg); - } catch (DOMException ex) { - success = (ex.code == DOMException.NO_MODIFICATION_ALLOWED_ERR); - } - assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); - } + NodeList n2List = child.getChildNodes(); + Node child2 = n2List.item(0); + assertNotNull(child2, "notnull"); + NamedNodeMap attributes = child2.getAttributes(); + Node arg = attributes.getNamedItemNS(namespaceURI, localName); + DOMException ex = assertThrows(DOMException.class, () -> attributes.setNamedItemNS(arg)); + assertEquals(DOMException.NO_MODIFICATION_ALLOWED_ERR, ex.code, "throw_NO_MODIFICATION_ALLOWED_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.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.NamedNodeMap; 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; @@ -47,26 +47,18 @@ import static org.w3c.domts.DOMTest.load */ public class setNamedItemNS05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.usa.com";; String qualifiedName = "dmstc:domestic"; - Document doc; - Node arg; - NodeList elementList; - Node testAddress; - NamedNodeMap attributes; - Node retnode; - String value; - doc = load("staffNS", true); - arg = doc.createAttributeNS(namespaceURI, qualifiedName); + Document doc = load("staffNS", true); + Node arg = doc.createAttributeNS(namespaceURI, qualifiedName); arg.setNodeValue("newValue"); - elementList = doc.getElementsByTagName("address"); - testAddress = elementList.item(0); - attributes = testAddress.getAttributes(); - retnode = attributes.setNamedItemNS(arg); - value = retnode.getNodeValue(); - assertEquals("throw_Equals", "Yes", value); - + NodeList elementList = doc.getElementsByTagName("address"); + Node testAddress = elementList.item(0); + NamedNodeMap attributes = testAddress.getAttributes(); + Node retnode = attributes.setNamedItemNS(arg); + String value = retnode.getNodeValue(); + assertEquals("Yes", value, "throw_Equals"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/systemId01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/systemId01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/systemId01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/systemId01.java Sun Feb 6 01:51:55 2022 @@ -21,9 +21,8 @@ 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; @@ -43,15 +42,11 @@ import static org.w3c.domts.DOMTest.load */ public class systemId01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - String systemId; - int index; - doc = load("staffNS", false); - docType = doc.getDoctype(); - systemId = docType.getSystemId(); + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + String systemId = docType.getSystemId(); assertURIEquals("systemId", "staffNS.dtd", systemId); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
