Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode22.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode22.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode22.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentimportnode22.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -43,67 +43,41 @@ import static org.w3c.domts.DOMTest.load * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core";>http://www.w3.org/TR/DOM-Level-2-Core/core</a> * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode";>http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a> */ - -/** - * @ignore true: ER, etc - */ public class documentimportnode22 { @Test - @Ignore + @Disabled("ER, etc") public void testRun() throws Throwable { - Document doc; DocumentType docTypeNull = null; - Document docImp; - DOMImplementation domImpl; - DocumentType docType; - NamedNodeMap nodeMap; - Notation notation1; - Notation notation2; - Notation notationImp1; - Notation notationImp2; - Notation notationImpNew1; - Notation notationImpNew2; - String publicId1; - String publicId1Imp; - String publicId1NewImp; - String publicId2Imp; - String publicId2NewImp; - String systemId1Imp; - String systemId1NewImp; - String systemId2; - String systemId2Imp; - String systemId2NewImp; - doc = load("staffNS", true); - domImpl = doc.getImplementation(); - docType = doc.getDoctype(); - docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); - nodeMap = docType.getNotations(); - notation1 = (Notation) nodeMap.getNamedItem("notation1"); - notation2 = (Notation) nodeMap.getNamedItem("notation2"); - notationImp1 = (Notation) doc.importNode(notation1, true); - notationImp2 = (Notation) doc.importNode(notation2, false); - notationImpNew1 = (Notation) docImp.importNode(notation1, false); - notationImpNew2 = (Notation) docImp.importNode(notation2, true); - publicId1 = notation1.getPublicId(); - publicId1Imp = notation1.getPublicId(); - publicId1NewImp = notation1.getPublicId(); - systemId1Imp = notation1.getSystemId(); - systemId1NewImp = notation1.getSystemId(); - publicId2Imp = notation2.getPublicId(); - publicId2NewImp = notation2.getPublicId(); - systemId2 = notation2.getSystemId(); - systemId2Imp = notation2.getSystemId(); - systemId2NewImp = notation2.getSystemId(); - assertEquals("documentimportnode22_N1PID", publicId1, publicId1Imp); - assertEquals("documentimportnode22_N1NPID", publicId1, publicId1NewImp); - assertNull("documentimportnode22_N1SID", systemId1Imp); - assertNull("documentimportnode22_N1NSID", systemId1NewImp); - assertEquals("documentimportnode22_N2SID", systemId2, systemId2Imp); - assertEquals("documentimportnode22_N2NSID", systemId2, systemId2NewImp); - assertNull("documentimportnode22_N2PID", publicId2Imp); - assertNull("documentimportnode22_N2NPID", publicId2Imp); - + Document doc = load("staffNS", true); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = doc.getDoctype(); + Document docImp = domImpl.createDocument("http://www.w3.org/DOM/Test";, "a:b", docTypeNull); + NamedNodeMap nodeMap = docType.getNotations(); + Notation notation1 = (Notation) nodeMap.getNamedItem("notation1"); + Notation notation2 = (Notation) nodeMap.getNamedItem("notation2"); + Notation notationImp1 = (Notation) doc.importNode(notation1, true); + Notation notationImp2 = (Notation) doc.importNode(notation2, false); + Notation notationImpNew1 = (Notation) docImp.importNode(notation1, false); + Notation notationImpNew2 = (Notation) docImp.importNode(notation2, true); + String publicId1 = notation1.getPublicId(); + String publicId1Imp = notation1.getPublicId(); + String publicId1NewImp = notation1.getPublicId(); + String systemId1Imp = notation1.getSystemId(); + String systemId1NewImp = notation1.getSystemId(); + String publicId2Imp = notation2.getPublicId(); + String publicId2NewImp = notation2.getPublicId(); + String systemId2 = notation2.getSystemId(); + String systemId2Imp = notation2.getSystemId(); + String systemId2NewImp = notation2.getSystemId(); + assertEquals(publicId1, publicId1Imp, "documentimportnode22_N1PID"); + assertEquals(publicId1, publicId1NewImp, "documentimportnode22_N1NPID"); + assertNull(systemId1Imp, "documentimportnode22_N1SID"); + assertNull(systemId1NewImp, "documentimportnode22_N1NSID"); + assertEquals(systemId2, systemId2Imp, "documentimportnode22_N2SID"); + assertEquals(systemId2, systemId2NewImp, "documentimportnode22_N2NSID"); + assertNull(publicId2Imp, "documentimportnode22_N2PID"); + assertNull(publicId2Imp, "documentimportnode22_N2NPID"); } /**
Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypeinternalSubset01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypeinternalSubset01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypeinternalSubset01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypeinternalSubset01.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -42,20 +42,15 @@ import static org.w3c.domts.DOMTest.load */ public class documenttypeinternalSubset01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - DOMImplementation domImpl; - String internal; String nullNS = null; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - docType = domImpl.createDocumentType("l2:root", nullNS, nullNS); - internal = docType.getInternalSubset(); - assertNull("documenttypeinternalSubset01", internal); - + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = domImpl.createDocumentType("l2:root", nullNS, nullNS); + String internal = docType.getInternalSubset(); + assertNull(internal, "documenttypeinternalSubset01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypepublicid01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypepublicid01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypepublicid01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypepublicid01.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -42,20 +42,15 @@ import static org.w3c.domts.DOMTest.load */ public class documenttypepublicid01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - DOMImplementation domImpl; - String publicId; String nullNS = null; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - docType = domImpl.createDocumentType("l2:root", "PUB", nullNS); - publicId = docType.getPublicId(); - assertEquals("documenttypepublicid01", "PUB", publicId); - + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = domImpl.createDocumentType("l2:root", "PUB", nullNS); + String publicId = docType.getPublicId(); + assertEquals("PUB", publicId, "documenttypepublicid01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypesystemid01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypesystemid01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypesystemid01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documenttypesystemid01.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.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 documenttypesystemid01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DocumentType docType; - DOMImplementation domImpl; - String publicId; - String systemId; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - docType = domImpl.createDocumentType("l2:root", "PUB", "SYS"); - publicId = docType.getPublicId(); - systemId = docType.getSystemId(); - assertEquals("documenttypepublicid01", "PUB", publicId); - assertEquals("documenttypesystemid01", "SYS", systemId); - + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType docType = domImpl.createDocumentType("l2:root", "PUB", "SYS"); + String publicId = docType.getPublicId(); + String systemId = docType.getSystemId(); + assertEquals("PUB", publicId, "documenttypepublicid01"); + assertEquals("SYS", systemId, "documenttypesystemid01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument03.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.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.w3c.domts.DOMTest.load; @@ -42,38 +42,21 @@ import static org.w3c.domts.DOMTest.load * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument";>http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument</a> */ public class domimplementationcreatedocument03 { - - @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - Document newDoc; + void testRun() throws Throwable { DocumentType docType = null; - String namespaceURI = "http://www.w3.org/DOMTest/L2";; - String qualifiedName; - java.util.List qualifiedNames = new java.util.ArrayList(); - qualifiedNames.add("_:_"); - qualifiedNames.add("_:h0"); - qualifiedNames.add("_:test"); - qualifiedNames.add("l_:_"); - qualifiedNames.add("ns:_0"); - qualifiedNames.add("ns:a0"); - qualifiedNames.add("ns0:test"); - // qualifiedNames.add(new Double("a.b:c")); - qualifiedNames.add("a.b:c"); - qualifiedNames.add("a-b:c"); - qualifiedNames.add("a-b:c"); - - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - for (int indexd351e76 = 0; indexd351e76 < qualifiedNames.size(); indexd351e76++) { - qualifiedName = (String) qualifiedNames.get(indexd351e76); - newDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - assertNotNull("domimplementationcreatedocument03", newDoc); - } + String[] qualifiedNames = { + "_:_", "_:h0", "_:test", "l_:_", "ns:_0", "ns:a0", "ns0:test", "a.b:c", "a-b:c", "a-b:c" /* , "a.b:c" */ + }; + + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + for (String qualifiedName : qualifiedNames) { + Document newDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); + assertNotNull(newDoc, "domimplementationcreatedocument03"); + } } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument04.java Sun Feb 6 01:51:55 2022 @@ -22,14 +22,14 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -46,29 +46,17 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationcreatedocument04 { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - Document newDoc; + void testRun() throws Throwable { String namespaceURI = null; - String qualifiedName = "dom:root"; DocumentType docType = null; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - newDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - fail("qualifiedName has a prefix and the namespaceURI is null: NAMESPACE_ERR"); - } catch (DOMException ex) { - assertEquals(ex.code, DOMException.NAMESPACE_ERR); - } - - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, qualifiedName, docType), + "qualifiedName has a prefix and the namespaceURI is null: NAMESPACE_ERR"); + assertEquals(ex.code, DOMException.NAMESPACE_ERR); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument05.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.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -45,27 +46,17 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationcreatedocument05 { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - Document newDoc; + void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/xml/1998/namespace";; String qualifiedName = "xml:root"; DocumentType docType = null; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - newDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("domimplementationcreatedocument05, NS http://www.w3.org/xml/1998/namespace and a qualifiedName that has the prefix xml", success); - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, qualifiedName, docType)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, + "domimplementationcreatedocument05, NS http://www.w3.org/xml/1998/namespace and a qualifiedName that has the prefix xml"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument07.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.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -43,26 +44,15 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationcreatedocument07 { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - Document newDoc; + void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/DOMTest/level2";; DocumentType docType = null; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - newDoc = domImpl.createDocument(namespaceURI, ":", docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("domimplementationcreatedocument07,malformed qualifiedName", success); - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, ":", docType)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "domimplementationcreatedocument07,malformed qualifiedName"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype01.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.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -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,36 +45,22 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationcreatedocumenttype01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - DocumentType newDocType; - Document ownerDocument; String qualifiedName = "test:root"; - String publicId; - String systemId; - java.util.List publicIds = new java.util.ArrayList(); - publicIds.add("1234"); - publicIds.add("test"); - - java.util.List systemIds = new java.util.ArrayList(); - systemIds.add(""); - systemIds.add("test"); - - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - for (int indexd355e61 = 0; indexd355e61 < publicIds.size(); indexd355e61++) { - publicId = (String) publicIds.get(indexd355e61); - for (int indexd355e63 = 0; indexd355e63 < systemIds.size(); indexd355e63++) { - systemId = (String) systemIds.get(indexd355e63); - newDocType = domImpl.createDocumentType(qualifiedName, publicId, systemId); - assertNotNull("domimplementationcreatedocumenttype01_newDocType", newDocType); - ownerDocument = newDocType.getOwnerDocument(); - assertNull("domimplementationcreatedocumenttype01_ownerDocument", ownerDocument); + String[] publicIds = { "1234", "test" }; + String[] systemIds = { "", "test" }; + + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + for (String publicId : publicIds) { + for (String systemId : systemIds) { + DocumentType newDocType = domImpl.createDocumentType(qualifiedName, publicId, systemId); + assertNotNull(newDocType, "domimplementationcreatedocumenttype01_newDocType"); + Document ownerDocument = newDocType.getOwnerDocument(); + assertNull(ownerDocument, "domimplementationcreatedocumenttype01_ownerDocument"); } } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype02.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.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -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,41 +45,23 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationcreatedocumenttype02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - DocumentType newDocType; - Document ownerDocument; String publicId = "http://www.w3.org/DOM/Test/dom2.dtd";; String systemId = "dom2.dtd"; - String qualifiedName; - java.util.List qualifiedNames = new java.util.ArrayList(); - qualifiedNames.add("_:_"); - qualifiedNames.add("_:h0"); - qualifiedNames.add("_:test"); - // qualifiedNames.add(new Double("_:_.")); - qualifiedNames.add("_:a-"); - qualifiedNames.add("l_:_"); - qualifiedNames.add("ns:_0"); - qualifiedNames.add("ns:a0"); - qualifiedNames.add("ns0:test"); - // qualifiedNames.add(new Double("ns:EEE.")); - qualifiedNames.add("ns:_-"); - // qualifiedNames.add(new Double("a.b:c")); - // qualifiedNames.add(new Double("a-b:c.j")); - qualifiedNames.add("a-b:c"); - - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - for (int indexd356e88 = 0; indexd356e88 < qualifiedNames.size(); indexd356e88++) { - qualifiedName = (String) qualifiedNames.get(indexd356e88); - newDocType = domImpl.createDocumentType(qualifiedName, publicId, systemId); - assertNotNull("domimplementationcreatedocumenttype02_newDocType", newDocType); - ownerDocument = newDocType.getOwnerDocument(); - assertNull("domimplementationcreatedocumenttype02_ownerDocument", ownerDocument); + String[] qualifiedNames = { + "_:_", "_:h0", "_:test", "_:a-", "l_:_", "ns:_0", "ns:a0", "ns0:test", "ns:_-", "a-b:c" + /* ,"_:_.", "ns:EEE.", "a.b:c", "a-b:c.j" */ + }; + + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + for (String qualifiedName : qualifiedNames) { + DocumentType newDocType = domImpl.createDocumentType(qualifiedName, publicId, systemId); + assertNotNull(newDocType, "domimplementationcreatedocumenttype02_newDocType"); + Document ownerDocument = newDocType.getOwnerDocument(); + assertNull(ownerDocument, "domimplementationcreatedocumenttype02_ownerDocument"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype04.java Sun Feb 6 01:51:55 2022 @@ -22,14 +22,15 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -44,46 +45,19 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationcreatedocumenttype04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; DocumentType newDocType; String publicId = "http://www.w3.org/DOM/Test/dom2.dtd";; String systemId = "dom2.dtd"; - 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("%"); - qualifiedNames.add("^"); - qualifiedNames.add("&"); - qualifiedNames.add("*"); - qualifiedNames.add("("); - qualifiedNames.add(")"); - - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - for (int indexd357e86 = 0; indexd357e86 < qualifiedNames.size(); indexd357e86++) { - qualifiedName = (String) qualifiedNames.get(indexd357e86); - - { - boolean success = false; - try { - newDocType = domImpl.createDocumentType(qualifiedName, publicId, systemId); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("domimplementationcreatedocumenttype04", success); - } - } + String[] qualifiedNames = { "{", "}", "'", "~", "`", "@", "#", "$", "%", "^", "&", "*", "(", ")" }; + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + for (String qualifiedName : qualifiedNames) { + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocumentType(qualifiedName, publicId, systemId)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "domimplementationcreatedocumenttype04"); + } } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturecore.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturecore.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturecore.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturecore.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.DOMImplementation; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -46,15 +46,11 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationfeaturecore { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - boolean state; - doc = load("staff", false); - domImpl = doc.getImplementation(); - state = domImpl.hasFeature("core", "2.0"); - assertTrue("domimplementationFeaturecoreAssert", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + DOMImplementation domImpl = doc.getImplementation(); + boolean state = domImpl.hasFeature("core", "2.0"); + assertTrue(state, "domimplementationFeaturecoreAssert"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturexmlversion2.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturexmlversion2.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturexmlversion2.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturexmlversion2.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.DOMImplementation; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -47,15 +47,11 @@ import static org.w3c.domts.DOMTest.load public class domimplementationfeaturexmlversion2 { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - boolean state; - doc = load("staff", false); - domImpl = doc.getImplementation(); - state = domImpl.hasFeature("xml", "2.0"); - assertTrue("domimplementationFeaturexmlVersion2Assert", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + DOMImplementation domImpl = doc.getImplementation(); + boolean state = domImpl.hasFeature("xml", "2.0"); + assertTrue(state, "domimplementationFeaturexmlVersion2Assert"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature01.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.DOMImplementation; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -42,41 +42,25 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationhasfeature01 { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; + void testRun() throws Throwable { String version = ""; String version1 = "1.0"; String version2 = "2.0"; - String featureCore; - String featureXML; + String[] featuresXML = { "XML", "xmL" }; + String[] featuresCore = { "Core", "CORE" }; + + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); boolean success; - java.util.List featuresXML = new java.util.ArrayList(); - featuresXML.add("XML"); - featuresXML.add("xmL"); - - java.util.List featuresCore = new java.util.ArrayList(); - featuresCore.add("Core"); - featuresCore.add("CORE"); - - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - for (int indexd360e63 = 0; indexd360e63 < featuresXML.size(); indexd360e63++) { - featureXML = (String) featuresXML.get(indexd360e63); - success = domImpl.hasFeature(featureXML, version); - assertTrue("domimplementationhasfeature01_XML_1", success); - success = domImpl.hasFeature(featureXML, version1); - assertTrue("domimplementationhasfeature01_XML_2", success); + for (String featureXML : featuresXML) { + assertTrue(domImpl.hasFeature(featureXML, version), "domimplementationhasfeature01_XML_1"); + assertTrue(domImpl.hasFeature(featureXML, version1), "domimplementationhasfeature01_XML_2"); } - for (int indexd360e74 = 0; indexd360e74 < featuresCore.size(); indexd360e74++) { - featureCore = (String) featuresCore.get(indexd360e74); - success = domImpl.hasFeature(featureCore, version); - assertTrue("domimplementationhasfeature01_Core_1", success); - success = domImpl.hasFeature(featureCore, version1); - success = domImpl.hasFeature(featureCore, version2); - assertTrue("domimplementationhasfeature01_Core_3", success); + for (String featureCore : featuresCore) { + assertTrue(domImpl.hasFeature(featureCore, version), "domimplementationhasfeature01_Core_1"); + assertTrue(domImpl.hasFeature(featureCore, version1), "domimplementationhasfeature01_Core_2"); + assertTrue(domImpl.hasFeature(featureCore, version2), "domimplementationhasfeature01_Core_3"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature02.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.DOMImplementation; import org.w3c.dom.Document; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -40,15 +40,11 @@ import static org.w3c.domts.DOMTest.load */ public class domimplementationhasfeature02 { @Test - public void testRun() throws Throwable { - Document doc; - DOMImplementation domImpl; - boolean success; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - success = domImpl.hasFeature("Blah Blah", ""); - assertFalse("domimplementationhasfeature02", success); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + boolean success = domImpl.hasFeature("Blah Blah", ""); + assertFalse(success, "domimplementationhasfeature02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens01.java Sun Feb 6 01:51:55 2022 @@ -20,12 +20,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; @@ -40,37 +40,24 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetattributenodens01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute1; - Attr attribute2; - Attr newAttribute1; - Attr newAttribute2; - Attr attribute; - String attrValue; - String attrName; - String attNodeName; - String attrLocalName; - String attrNS; - doc = load("staffNS", false); - element = doc.createElementNS("namespaceURI", "root"); - attribute1 = doc.createAttributeNS("http://www.w3.org/DOM/Level2";, "l2:att"); - newAttribute1 = element.setAttributeNodeNS(attribute1); - attribute2 = doc.createAttributeNS("http://www.w3.org/DOM/Level1";, "att"); - newAttribute2 = element.setAttributeNodeNS(attribute2); - attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Level2";, "att"); - attrValue = attribute.getNodeValue(); - attrName = attribute.getName(); - attNodeName = attribute.getNodeName(); - attrLocalName = attribute.getLocalName(); - attrNS = attribute.getNamespaceURI(); - assertEquals("elementgetattributenodens01_attrValue", "", attrValue); - assertEquals("elementgetattributenodens01_attrName", "l2:att", attrName); - assertEquals("elementgetattributenodens01_attrNodeName", "l2:att", attNodeName); - assertEquals("elementgetattributenodens01_attrLocalName", "att", attrLocalName); - assertEquals("elementgetattributenodens01_attrNs", "http://www.w3.org/DOM/Level2";, attrNS); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element element = doc.createElementNS("namespaceURI", "root"); + Attr attribute1 = doc.createAttributeNS("http://www.w3.org/DOM/Level2";, "l2:att"); + Attr newAttribute1 = element.setAttributeNodeNS(attribute1); + Attr attribute2 = doc.createAttributeNS("http://www.w3.org/DOM/Level1";, "att"); + Attr newAttribute2 = element.setAttributeNodeNS(attribute2); + Attr attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Level2";, "att"); + String attrValue = attribute.getNodeValue(); + String attrName = attribute.getName(); + String attNodeName = attribute.getNodeName(); + String attrLocalName = attribute.getLocalName(); + String attrNS = attribute.getNamespaceURI(); + assertEquals("", attrValue, "elementgetattributenodens01_attrValue"); + assertEquals("l2:att", attrName, "elementgetattributenodens01_attrName"); + assertEquals("l2:att", attNodeName, "elementgetattributenodens01_attrNodeName"); + assertEquals("att", attrLocalName, "elementgetattributenodens01_attrLocalName"); + assertEquals("http://www.w3.org/DOM/Level2";, attrNS, "elementgetattributenodens01_attrNs"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens02.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; @@ -40,20 +40,14 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetattributenodens02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - Attr newAttribute1; - String attrValue; - doc = load("staffNS", false); - element = doc.createElementNS("namespaceURI", "root"); - attribute = doc.createAttributeNS("http://www.w3.org/DOM/Level2";, "l2:att"); - newAttribute1 = element.setAttributeNodeNS(attribute); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element element = doc.createElementNS("namespaceURI", "root"); + Attr attribute = doc.createAttributeNS("http://www.w3.org/DOM/Level2";, "l2:att"); + Attr newAttribute1 = element.setAttributeNodeNS(attribute); attribute = element.getAttributeNodeNS("http://www.w3.org/DOM/Level2";, "att"); - attrValue = attribute.getNodeValue(); - assertEquals("elementgetattributenodens02", "", attrValue); - + String attrValue = attribute.getNodeValue(); + assertEquals("", attrValue, "elementgetattributenodens02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens03.java Sun Feb 6 01:51:55 2022 @@ -22,14 +22,14 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,22 +43,16 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetattributenodens03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute; - String attrValue; - NodeList childList; String nullNS = null; - doc = load("staffNS", false); - childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); - element = (Element) childList.item(1); - attribute = element.getAttributeNodeNS(nullNS, "defaultAttr"); - attrValue = attribute.getNodeValue(); - assertEquals("elementgetattributenodens03", "defaultVal", attrValue); - + Document doc = load("staffNS", false); + NodeList childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); + Element element = (Element) childList.item(1); + Attr attribute = element.getAttributeNodeNS(nullNS, "defaultAttr"); + String attrValue = attribute.getNodeValue(); + assertEquals("defaultVal", attrValue, "elementgetattributenodens03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributens02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributens02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributens02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetattributens02.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; @@ -42,20 +42,15 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetattributens02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - String attrValue; - NodeList childList; String nullNS = null; - doc = load("staffNS", false); - childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); - element = (Element) childList.item(1); - attrValue = element.getAttributeNS(nullNS, "defaultAttr"); - assertEquals("elementgetattributens02", "defaultVal", attrValue); - + Document doc = load("staffNS", false); + NodeList childList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); + Element element = (Element) childList.item(1); + String attrValue = element.getAttributeNS(nullNS, "defaultAttr"); + assertEquals("defaultVal", attrValue, "elementgetattributens02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens02.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; @@ -42,15 +42,11 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetelementsbytagnamens02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - NodeList elementList; - doc = load("staffNS", false); - element = doc.getDocumentElement(); - elementList = element.getElementsByTagNameNS("**", "*"); - assertEquals("elementgetelementsbytagnamens02", 0, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element element = doc.getDocumentElement(); + NodeList elementList = element.getElementsByTagNameNS("**", "*"); + assertEquals(0, elementList.getLength(), "elementgetelementsbytagnamens02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens04.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import 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,29 +46,21 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetelementsbytagnamens04 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Element child1; - Element child2; - Element child3; - Node appendedChild; - NodeList elementList; + void testRun() throws Throwable { String nullNS = null; - doc = load("staffNS", false); - element = doc.createElementNS("http://www.w3.org/DOM";, "root"); - child1 = doc.createElementNS("http://www.w3.org/DOM/Level1";, "dom:child"); - child2 = doc.createElementNS(nullNS, "child"); - child3 = doc.createElementNS("http://www.w3.org/DOM/Level2";, "dom:child"); - appendedChild = element.appendChild(child1); + Document doc = load("staffNS", false); + Element element = doc.createElementNS("http://www.w3.org/DOM";, "root"); + Element child1 = doc.createElementNS("http://www.w3.org/DOM/Level1";, "dom:child"); + Element child2 = doc.createElementNS(nullNS, "child"); + Element child3 = doc.createElementNS("http://www.w3.org/DOM/Level2";, "dom:child"); + Node appendedChild = element.appendChild(child1); appendedChild = element.appendChild(child2); appendedChild = element.appendChild(child3); - elementList = element.getElementsByTagNameNS(nullNS, "child"); - assertEquals("elementgetelementsbytagnamens04_1", 1, elementList.getLength()); + NodeList elementList = element.getElementsByTagNameNS(nullNS, "child"); + assertEquals(1, elementList.getLength(), "elementgetelementsbytagnamens04_1"); elementList = element.getElementsByTagNameNS("*", "child"); - assertEquals("elementgetelementsbytagnamens04_2", 3, elementList.getLength()); - + assertEquals(3, elementList.getLength(), "elementgetelementsbytagnamens04_2"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens05.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,15 +43,11 @@ import static org.w3c.domts.DOMTest.load */ public class elementgetelementsbytagnamens05 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - NodeList elementList; - doc = load("staffNS", false); - element = doc.getDocumentElement(); - elementList = element.getElementsByTagNameNS("http://www.altavista.com";, "*"); - assertEquals("elementgetelementsbytagnamens05", 1, elementList.getLength()); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element element = doc.getDocumentElement(); + NodeList elementList = element.getElementsByTagNameNS("http://www.altavista.com";, "*"); + assertEquals(1, elementList.getLength(), "elementgetelementsbytagnamens05"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute01.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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -39,15 +39,11 @@ import static org.w3c.domts.DOMTest.load */ public class elementhasattribute01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - doc = load("staff", false); - element = doc.getDocumentElement(); - state = element.hasAttribute(""); - assertFalse("elementhasattribute01", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.getDocumentElement(); + boolean state = element.hasAttribute(""); + assertFalse(state, "elementhasattribute01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute02.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; @@ -42,18 +42,13 @@ import static org.w3c.domts.DOMTest.load */ public class elementhasattribute02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - NodeList elementList; - doc = load("staffNS", false); - elementList = doc.getElementsByTagName("emp:employee"); - element = (Element) elementList.item(0); - state = element.hasAttribute("defaultAttr"); - assertTrue("elementhasattribute02", state); - + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagName("emp:employee"); + Element element = (Element) elementList.item(0); + boolean state = element.hasAttribute("defaultAttr"); + assertTrue(state, "elementhasattribute02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute03.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 static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -43,21 +43,15 @@ import static org.w3c.domts.DOMTest.load */ public class elementhasattribute03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - Attr attribute; - Attr newAttribute; - doc = load("staff", false); - element = doc.createElement("address"); - attribute = doc.createAttribute("domestic"); + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.createElement("address"); + Attr attribute = doc.createAttribute("domestic"); + boolean state = element.hasAttribute("domestic"); + assertFalse(state, "elementhasattribute03_False"); + Attr newAttribute = element.setAttributeNode(attribute); state = element.hasAttribute("domestic"); - assertFalse("elementhasattribute03_False", state); - newAttribute = element.setAttributeNode(attribute); - state = element.hasAttribute("domestic"); - assertTrue("elementhasattribute03_True", state); - + assertTrue(state, "elementhasattribute03_True"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattribute04.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -41,19 +41,13 @@ import static org.w3c.domts.DOMTest.load */ public class elementhasattribute04 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - Attr attribute; - Attr newAttribute; - doc = load("staff", false); - element = doc.createElement("address"); - attribute = doc.createAttribute("domestic"); - newAttribute = element.setAttributeNode(attribute); - state = element.hasAttribute("domestic"); - assertTrue("elementhasattribute04", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.createElement("address"); + Attr attribute = doc.createAttribute("domestic"); + Attr newAttribute = element.setAttributeNode(attribute); + boolean state = element.hasAttribute("domestic"); + assertTrue(state, "elementhasattribute04"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens01.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 elementhasattributens01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - NodeList elementList; - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS("*", "employee"); - element = (Element) elementList.item(0); - state = element.hasAttributeNS("http://www.w3.org/2000/xmlns/";, "xmlns"); - assertTrue("elementhasattributens01", state); - + void testRun() throws Throwable { + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS("*", "employee"); + Element element = (Element) elementList.item(0); + boolean state = element.hasAttributeNS("http://www.w3.org/2000/xmlns/";, "xmlns"); + assertTrue(state, "elementhasattributens01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens02.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -44,19 +44,13 @@ import static org.w3c.domts.DOMTest.load */ public class elementhasattributens02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - Attr attribute; - Attr newAttribute; - doc = load("staff", false); - element = doc.createElementNS("http://www.w3.org/DOM";, "address"); - attribute = doc.createAttributeNS("http://www.w3.org/DOM";, "domestic"); - newAttribute = element.setAttributeNode(attribute); - state = element.hasAttributeNS("http://www.w3.org/DOM";, "domestic"); - assertTrue("elementhasattributens02", state); - + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.createElementNS("http://www.w3.org/DOM";, "address"); + Attr attribute = doc.createAttributeNS("http://www.w3.org/DOM";, "domestic"); + Attr newAttribute = element.setAttributeNode(attribute); + boolean state = element.hasAttributeNS("http://www.w3.org/DOM";, "domestic"); + assertTrue(state, "elementhasattributens02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementhasattributens03.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.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.w3c.domts.DOMTest.load; @@ -45,21 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class elementhasattributens03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - Attr attribute; - Attr newAttribute; + void testRun() throws Throwable { String nullNS = null; - doc = load("staff", false); - element = doc.createElementNS("http://www.w3.org/DOM";, "address"); - attribute = doc.createAttributeNS(nullNS, "domestic"); - newAttribute = element.setAttributeNode(attribute); - state = element.hasAttributeNS(nullNS, "domestic"); - assertTrue("elementhasattributens03", state); - + Document doc = load("staff", false); + Element element = doc.createElementNS("http://www.w3.org/DOM";, "address"); + Attr attribute = doc.createAttributeNS(nullNS, "domestic"); + Attr newAttribute = element.setAttributeNode(attribute); + boolean state = element.hasAttributeNS(nullNS, "domestic"); + assertTrue(state, "elementhasattributens03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementremoveattributens01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementremoveattributens01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementremoveattributens01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementremoveattributens01.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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.w3c.domts.DOMTest.load; @@ -42,20 +42,14 @@ import static org.w3c.domts.DOMTest.load */ public class elementremoveattributens01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - boolean state; - Attr attribute; - Attr newAttribute; - doc = load("staff", false); - element = doc.createElementNS("http://www.w3.org/DOM";, "elem"); - attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test/createAttributeNS";, "attr"); - newAttribute = element.setAttributeNodeNS(attribute); + void testRun() throws Throwable { + Document doc = load("staff", false); + Element element = doc.createElementNS("http://www.w3.org/DOM";, "elem"); + Attr attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test/createAttributeNS";, "attr"); + Attr newAttribute = element.setAttributeNodeNS(attribute); element.removeAttributeNS("http://www.w3.org/DOM/Test/createAttributeNS";, "attr"); - state = element.hasAttributeNS("http://www.w3.org/DOM/Test/createAttributeNS";, "attr"); - assertFalse("elementremoveattributens01", state); - + boolean state = element.hasAttributeNS("http://www.w3.org/DOM/Test/createAttributeNS";, "attr"); + assertFalse(state, "elementremoveattributens01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens01.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.NamedNodeMap; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -46,34 +46,22 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributenodens01 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Attr attribute1; - Attr attribute2; - Attr attrNode; - String attrName; - String attrNS; - String attrValue; - NamedNodeMap attributes; - Attr newAttribute; - int length; - doc = load("staff", true); - element = doc.createElementNS("http://www.w3.org/DOM/Test/Level2";, "new:element"); - attribute1 = doc.createAttributeNS("http://www.w3.org/DOM/Test/att1";, "p1:att"); - attribute2 = doc.createAttributeNS("http://www.w3.org/DOM/Test/att1";, "p2:att"); + void testRun() throws Throwable { + Document doc = load("staff", true); + Element element = doc.createElementNS("http://www.w3.org/DOM/Test/Level2";, "new:element"); + Attr attribute1 = doc.createAttributeNS("http://www.w3.org/DOM/Test/att1";, "p1:att"); + Attr attribute2 = doc.createAttributeNS("http://www.w3.org/DOM/Test/att1";, "p2:att"); attribute2.setValue("value2"); - newAttribute = element.setAttributeNodeNS(attribute1); + Attr newAttribute = element.setAttributeNodeNS(attribute1); newAttribute = element.setAttributeNodeNS(attribute2); - attrNode = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/att1";, "att"); - attrName = attrNode.getNodeName(); - attrNS = attrNode.getNamespaceURI(); - assertEquals("elementsetattributenodens01_attrName", "p2:att", attrName); - assertEquals("elementsetattributenodens01_attrNS", "http://www.w3.org/DOM/Test/att1";, attrNS); - attributes = element.getAttributes(); - length = attributes.getLength(); - assertEquals("length", 1, length); - + Attr attrNode = element.getAttributeNodeNS("http://www.w3.org/DOM/Test/att1";, "att"); + String attrName = attrNode.getNodeName(); + String attrNS = attrNode.getNamespaceURI(); + assertEquals("p2:att", attrName, "elementsetattributenodens01_attrName"); + assertEquals("http://www.w3.org/DOM/Test/att1";, attrNS, "elementsetattributenodens01_attrNS"); + NamedNodeMap attributes = element.getAttributes(); + int length = attributes.getLength(); + assertEquals(1, length, "length"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens02.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; @@ -43,30 +43,20 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributenodens02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Element element2; - Attr attribute; - Attr attributeCloned; - Attr newAttr; - NodeList elementList; - String attrName; - String attrValue; + void testRun() throws Throwable { String nullNS = null; - doc = load("staffNS", true); - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); - element = (Element) elementList.item(1); - attribute = element.getAttributeNodeNS(nullNS, "street"); - attributeCloned = (Attr) attribute.cloneNode(true); - element2 = (Element) elementList.item(2); - newAttr = element2.setAttributeNodeNS(attributeCloned); - attrName = newAttr.getNodeName(); - attrValue = newAttr.getNodeValue(); - assertEquals("elementsetattributenodens02_attrName", "street", attrName); - assertEquals("elementsetattributenodens02_attrValue", "Yes", attrValue); - + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); + Element element = (Element) elementList.item(1); + Attr attribute = element.getAttributeNodeNS(nullNS, "street"); + Attr attributeCloned = (Attr) attribute.cloneNode(true); + Element element2 = (Element) elementList.item(2); + Attr newAttr = element2.setAttributeNodeNS(attributeCloned); + String attrName = newAttr.getNodeName(); + String attrValue = newAttr.getNodeValue(); + assertEquals("street", attrName, "elementsetattributenodens02_attrName"); + assertEquals("Yes", attrValue, "elementsetattributenodens02_attrValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens03.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -40,31 +41,17 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributenodens03 { @Test - public void testRun() throws Throwable { - Document doc; - Element element1; - Element element2; - Attr attribute; - Attr newAttribute; - NodeList elementList; + void testRun() throws Throwable { String nullNS = null; - doc = load("staffNS", true); - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); - element1 = (Element) elementList.item(1); - attribute = element1.getAttributeNodeNS(nullNS, "street"); - element2 = (Element) elementList.item(2); - - { - boolean success = false; - try { - newAttribute = element2.setAttributeNodeNS(attribute); - } catch (DOMException ex) { - success = (ex.code == DOMException.INUSE_ATTRIBUTE_ERR); - } - assertTrue("elementsetattributenodens03", success); - } + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "address"); + Element element1 = (Element) elementList.item(1); + Attr attribute = element1.getAttributeNodeNS(nullNS, "street"); + Element element2 = (Element) elementList.item(2); + DOMException ex = assertThrows(DOMException.class, () -> element2.setAttributeNodeNS(attribute)); + assertEquals(DOMException.INUSE_ATTRIBUTE_ERR, ex.code, "elementsetattributenodens03"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens04.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; @@ -43,28 +44,15 @@ import static org.w3c.domts.DOMTest.load */ public class elementsetattributenodens04 { @Test - public void testRun() throws Throwable { - Document doc; - Element element1; - Element element2; - Attr attribute; - Attr newAttribute; - doc = load("staffNS", true); - element1 = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem1"); - element2 = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem2"); - attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "attr"); - newAttribute = element1.setAttributeNodeNS(attribute); - - { - boolean success = false; - try { - newAttribute = element2.setAttributeNodeNS(attribute); - } catch (DOMException ex) { - success = (ex.code == DOMException.INUSE_ATTRIBUTE_ERR); - } - assertTrue("elementsetattributenodens04", success); - } + void testRun() throws Throwable { + Document doc = load("staffNS", true); + Element element1 = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem1"); + Element element2 = doc.createElementNS("http://www.w3.org/DOM/Test";, "elem2"); + Attr attribute = doc.createAttributeNS("http://www.w3.org/DOM/Test";, "attr"); + Attr newAttribute = element1.setAttributeNodeNS(attribute); + DOMException ex = assertThrows(DOMException.class, () -> element2.setAttributeNodeNS(attribute)); + assertEquals(DOMException.INUSE_ATTRIBUTE_ERR, ex.code, "elementsetattributenodens04"); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
