Modified: xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheClassloadersTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheClassloadersTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheClassloadersTest.java (original) +++ xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheClassloadersTest.java Sun Feb 6 01:51:55 2022 @@ -19,7 +19,8 @@ package misc.detailed; import org.apache.xmlbeans.SchemaType; import org.apache.xmlbeans.SchemaTypeLoader; import org.apache.xmlbeans.XmlBeans; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.xml.namespace.QName; import java.io.File; @@ -28,50 +29,43 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /* Test class loading using XmlBeans.getContextLoader() after changes to SystemCache.java (r240333) -* Now a custom implementation of the SystemCache can be provided -*/ + * Now a custom implementation of the SystemCache can be provided + */ public class SystemCacheClassloadersTest { @Test - public void testSystemCacheAndThreadLocal() - { + void testSystemCacheAndThreadLocal() { Thread testThread = new SystemCacheThread("SchemTypeLoader Test Thread"); try { testThread.start(); - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); - } - - finally { + } finally { try { testThread.join(); - } - catch (InterruptedException ie) { + } catch (InterruptedException ie) { ie.printStackTrace(); } } } - public static class SystemCacheThread extends Thread - { + public static class SystemCacheThread extends Thread { private String name; - SystemCacheThread(String threadName) - { + SystemCacheThread(String threadName) { super(); name = threadName; } /** + * */ - public void run() - { + public void run() { System.out.println("Run Method of thread " + name); try { @@ -79,14 +73,12 @@ public class SystemCacheClassloadersTest // test classloading from 2 different scomp jars using the default impl of SystemCache testDefaultSystemCacheClassLoading(); - } - catch (Throwable t) { + } catch (Throwable t) { t.printStackTrace(); } } - void testDefaultSystemCacheClassLoading() - { + void testDefaultSystemCacheClassLoading() { try { // create classloaders here String xbean_home = System.getProperty("xbean.rootdir"); @@ -129,7 +121,7 @@ public class SystemCacheClassloadersTest SchemaTypeLoader initialDomLoader = XmlBeans.getContextTypeLoader(); SchemaType domSchemaType = initialDomLoader.findType(domTypeQName); assertNotNull(domSchemaType); - assertEquals("Invalid Type!", domSchemaType.getFullJavaImplName(), "xbean.misc.syscacheTests2.impl.ElementTImpl"); + assertEquals(domSchemaType.getFullJavaImplName(), "xbean.misc.syscacheTests2.impl.ElementTImpl", "Invalid Type!"); // -ve test, look for the person type from cases\misc\syscachetest.xsd SchemaType personTypeFromMiscTests = initialDomLoader.findType(miscPersonTypeQName); @@ -141,7 +133,7 @@ public class SystemCacheClassloadersTest SchemaTypeLoader initialMiscSchemaLoader = XmlBeans.getContextTypeLoader(); SchemaType miscPersonType = initialMiscSchemaLoader.findType(miscPersonTypeQName); assertNotNull(miscPersonType); - assertEquals("Invalid Type!", miscPersonType.getFullJavaImplName(), "xbean.misc.syscacheTests1.impl.PersonTypeImpl"); + assertEquals(miscPersonType.getFullJavaImplName(), "xbean.misc.syscacheTests1.impl.PersonTypeImpl", "Invalid Type!"); // -ve test SchemaType personTypeFromMisc = initialMiscSchemaLoader.findType(domTypeQName); @@ -151,14 +143,13 @@ public class SystemCacheClassloadersTest setContextClassLoader(domCL); SchemaTypeLoader secondDomLoader = XmlBeans.getContextTypeLoader(); assertNotNull(secondDomLoader.findType(domTypeQName)); - assertSame("SchemaTypeLoaders expected to be equal", initialDomLoader, secondDomLoader); + Assertions.assertSame(initialDomLoader, secondDomLoader, "SchemaTypeLoaders expected to be equal"); setContextClassLoader(miscCL); SchemaTypeLoader secondMiscLoader = XmlBeans.getContextTypeLoader(); - assertSame("SchemaTypeLoaders expected to be equal", initialMiscSchemaLoader, secondMiscLoader); + Assertions.assertSame(initialMiscSchemaLoader, secondMiscLoader, "SchemaTypeLoaders expected to be equal"); - } - catch (Throwable t) { + } catch (Throwable t) { t.printStackTrace(); }
Modified: xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheTests.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheTests.java (original) +++ xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheTests.java Sun Feb 6 01:51:55 2022 @@ -17,15 +17,15 @@ package misc.detailed; import org.apache.xmlbeans.impl.common.SystemCache; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -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; public class SystemCacheTests { @Test - @Ignore("invalid test") + @Disabled("invalid test") public void testSystemCacheImplFromAPITest() { // Test ignored: // this test is dangerous if we eventually execute tests in parallel and @@ -49,7 +49,7 @@ public class SystemCacheTests { } @Test - public void testClearThreadLocal() { + void testClearThreadLocal() { SystemCache cache = SystemCache.get(); String saxLoader = "object is not cast currently..."; Modified: xmlbeans/trunk/src/test/java/misc/detailed/ThreadLocalUtilTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/misc/detailed/ThreadLocalUtilTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/misc/detailed/ThreadLocalUtilTest.java (original) +++ xmlbeans/trunk/src/test/java/misc/detailed/ThreadLocalUtilTest.java Sun Feb 6 01:51:55 2022 @@ -19,17 +19,17 @@ import org.apache.xmlbeans.ThreadLocalUt import org.apache.xmlbeans.impl.common.SystemCache; import org.apache.xmlbeans.impl.schema.StscState; import org.apache.xmlbeans.impl.store.CharUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ThreadLocalUtilTest { @Test - public void testClearThreadLocalsNoData() { + void testClearThreadLocalsNoData() { // simply calling it without any thread locals should work ThreadLocalUtil.clearAllThreadLocals(); } @Test - public void testClearThreadLocalsWithData() { + void testClearThreadLocalsWithData() { // calling it with thread locals should work as well CharUtil.getThreadLocalCharUtil(); Modified: xmlbeans/trunk/src/test/java/misc/detailed/XMLStreamReaderTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/misc/detailed/XMLStreamReaderTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/misc/detailed/XMLStreamReaderTest.java (original) +++ xmlbeans/trunk/src/test/java/misc/detailed/XMLStreamReaderTest.java Sun Feb 6 01:51:55 2022 @@ -16,31 +16,33 @@ package misc.detailed; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.stream.XMLStreamReader; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Adapted from testcase submitted by Brian Bonner for JIRA issue * XMLBEANS-222, based on comments by Cezar Andrei. */ public class XMLStreamReaderTest { - private static final String soapMsg = "<SOAP:Envelope xmlns:SOAP=\"http://schemas.xmlsoap.org/soap/envelope/\"; " - + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " - + "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";>" - + "<SOAP:Body>" - + "<PriceandAvailabilityResponse xmlns=\"http://www.foobar.com\";>" - + "<Header/>" - + "<Body>" - + "<UPC xsi:nil=\"true\"/>" - + "</Body>" - + "</PriceandAvailabilityResponse>" - + "</SOAP:Body>" - + "</SOAP:Envelope>"; + private static final String soapMsg = + "<SOAP:Envelope xmlns:SOAP=\"http://schemas.xmlsoap.org/soap/envelope/\"; " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " + + "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";>" + + "<SOAP:Body>" + + "<PriceandAvailabilityResponse xmlns=\"http://www.foobar.com\";>" + + "<Header/>" + + "<Body>" + + "<UPC xsi:nil=\"true\"/>" + + "</Body>" + + "</PriceandAvailabilityResponse>" + + "</SOAP:Body>" + + "</SOAP:Envelope>"; + @Test - public void testXmlStreamReader1() throws Exception { + void testXmlStreamReader1() throws Exception { XmlObject object = XmlObject.Factory.parse(soapMsg); XmlOptions opts = new XmlOptions().setSaveOuter(); @@ -57,42 +59,38 @@ public class XMLStreamReaderTest { foundXsiNamespace = true; } System.out.println("Namespace " - + reader.getNamespacePrefix(i) + ": " - + reader.getNamespaceURI(i)); + + reader.getNamespacePrefix(i) + ": " + + reader.getNamespaceURI(i)); } } } - assertTrue("xsi namespace is not found", foundXsiNamespace); + assertTrue(foundXsiNamespace, "xsi namespace is not found"); } @Test - public void testXmlStreamReader2() throws Exception { + void testXmlStreamReader2() throws Exception { XmlObject object = XmlObject.Factory.parse(soapMsg); XMLStreamReader reader = object.newXMLStreamReader(); boolean foundXsiNamespace = false; int event = reader.getEventType(); - do - { - if (event == XMLStreamReader.START_ELEMENT) - { + do { + if (event == XMLStreamReader.START_ELEMENT) { System.out.println("namespace count: " + reader.getNamespaceCount()); - for (int i = 0; i < reader.getNamespaceCount(); i++) - { - if (reader.getNamespacePrefix(i).equals("xsi")) - { + for (int i = 0; i < reader.getNamespaceCount(); i++) { + if (reader.getNamespacePrefix(i).equals("xsi")) { foundXsiNamespace = true; } System.out.println("Namespace " - + reader.getNamespacePrefix(i) + ": " - + reader.getNamespaceURI(i)); + + reader.getNamespacePrefix(i) + ": " + + reader.getNamespaceURI(i)); } } event = reader.next(); } while (reader.hasNext()); - assertTrue("xsi namespace is not found", foundXsiNamespace); + assertTrue(foundXsiNamespace, "xsi namespace is not found"); } } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/DOMTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/DOMTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/DOMTest.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/DOMTest.java Sun Feb 6 01:51:55 2022 @@ -51,8 +51,9 @@ import dom.common.Loader; import org.w3c.dom.Document; import tools.util.JarUtil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * This is an abstract base class for generated DOM tests Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement01.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; @@ -42,25 +42,16 @@ import static org.w3c.domts.DOMTest.load public class attrgetownerelement01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Attr attr; - Element element; - Element ownerElement; - String ownerElementName; - NodeList elementList; - NamedNodeMap attributes; - String nullNS = null; - - doc = load("staffNS", false); - elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); - element = (Element) elementList.item(1); - attributes = element.getAttributes(); - attr = (Attr) attributes.getNamedItemNS(nullNS, "defaultAttr"); - ownerElement = attr.getOwnerElement(); - ownerElementName = ownerElement.getNodeName(); - assertEquals("attrgetownerelement01", "emp:employee", ownerElementName); + Document doc = load("staffNS", false); + NodeList elementList = doc.getElementsByTagNameNS("http://www.nist.gov";, "employee"); + Element element = (Element) elementList.item(1); + NamedNodeMap attributes = element.getAttributes(); + Attr attr = (Attr) attributes.getNamedItemNS(null, "defaultAttr"); + Element ownerElement = attr.getOwnerElement(); + String ownerElementName = ownerElement.getNodeName(); + assertEquals("emp:employee", ownerElementName, "attrgetownerelement01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement02.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; @@ -42,20 +42,14 @@ import static org.w3c.domts.DOMTest.load public class attrgetownerelement02 { @Test - public void testRun() throws Throwable { - Document doc; - Element element; - Element ownerElement; - String ownerElementName; - Attr attr; - Attr newAttr; - doc = load("staffNS", false); - element = doc.createElement("root"); - attr = doc.createAttributeNS("http://www.w3.org/DOM/L1";, "L1:att"); - newAttr = element.setAttributeNodeNS(attr); - ownerElement = attr.getOwnerElement(); - ownerElementName = ownerElement.getNodeName(); - assertEquals("attrgetownerelement02", "root", ownerElementName); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Element element = doc.createElement("root"); + Attr attr = doc.createAttributeNS("http://www.w3.org/DOM/L1";, "L1:att"); + element.setAttributeNodeNS(attr); + Element ownerElement = attr.getOwnerElement(); + String ownerElementName = ownerElement.getNodeName(); + assertEquals("root", ownerElementName, "attrgetownerelement02"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -42,14 +42,11 @@ import static org.w3c.domts.DOMTest.load */ public class attrgetownerelement03 { @Test - public void testRun() throws Throwable { - Document doc; - Node ownerElement; - Attr attr; - doc = load("staffNS", false); - attr = doc.createAttributeNS("http://www.w3.org/DOM";, "dom:attr"); - ownerElement = attr.getOwnerElement(); - assertNull("attrgetownerelement03", ownerElement); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Attr attr = doc.createAttributeNS("http://www.w3.org/DOM";, "dom:attr"); + Node ownerElement = attr.getOwnerElement(); + assertNull(ownerElement, "attrgetownerelement03"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement04.java Sun Feb 6 01:51:55 2022 @@ -22,14 +22,14 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.w3c.domts.DOMTest.load; @@ -46,21 +46,15 @@ import static org.w3c.domts.DOMTest.load public class attrgetownerelement04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { - Document doc; - Document docImp; - Node ownerElement; - Element element; - Attr attr; - Attr attrImp; - doc = load("staffNS", false); - docImp = load("staff", false); - element = doc.getElementById("CANADA"); - attr = element.getAttributeNodeNS("http://www.nist.gov";, "zone"); - attrImp = (Attr) docImp.importNode(attr, true); - ownerElement = attrImp.getOwnerElement(); - assertNull("attrgetownerelement04", ownerElement); + Document doc = load("staffNS", false); + Document docImp = load("staff", false); + Element element = doc.getElementById("CANADA"); + Attr attr = element.getAttributeNodeNS("http://www.nist.gov";, "zone"); + Attr attrImp = (Attr) docImp.importNode(attr, true); + Node ownerElement = attrImp.getOwnerElement(); + assertNull(ownerElement, "attrgetownerelement04"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/attrgetownerelement05.java Sun Feb 6 01:51:55 2022 @@ -22,10 +22,10 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -40,28 +40,18 @@ import static org.w3c.domts.DOMTest.load */ public class attrgetownerelement05 { @Test - public void testRun() throws Throwable { - Document doc; - Node element; - Element ownerElement; - Element parentElement; - NodeList elementList; - String ownerElementName; - Attr attr; - Node removedChild; - NamedNodeMap nodeMap; - String nullNS = null; - - doc = load("staffNS", true); - elementList = doc.getElementsByTagNameNS("*", "address"); - element = elementList.item(1); - parentElement = (Element) element.getParentNode(); - nodeMap = element.getAttributes(); - removedChild = parentElement.removeChild(element); - attr = (Attr) nodeMap.getNamedItemNS(nullNS, "street"); - ownerElement = attr.getOwnerElement(); - ownerElementName = ownerElement.getNodeName(); - assertEquals("attrgetownerelement05", "address", ownerElementName); + void testRun() throws Throwable { + + Document doc = load("staffNS", true); + NodeList elementList = doc.getElementsByTagNameNS("*", "address"); + Node element = elementList.item(1); + Element parentElement = (Element) element.getParentNode(); + NamedNodeMap nodeMap = element.getAttributes(); + parentElement.removeChild(element); + Attr attr = (Attr) nodeMap.getNamedItemNS(null, "street"); + Element ownerElement = attr.getOwnerElement(); + String ownerElementName = ownerElement.getNodeName(); + assertEquals("address", ownerElementName, "attrgetownerelement05"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS01.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.Attr; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -47,23 +47,12 @@ import static org.w3c.domts.DOMTest.load */ public class createAttributeNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/";; String malformedName = "prefix::local"; - Document doc; - Attr newAttr; - doc = load("staffNS", false); - - { - boolean success = false; - try { - newAttr = doc.createAttributeNS(namespaceURI, malformedName); - } catch (DOMException ex) { - assertEquals(DOMException.NAMESPACE_ERR, ex.code); - } - - } - + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, malformedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS02.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.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; -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; @@ -47,25 +47,16 @@ import static org.w3c.domts.DOMTest.load */ public class createAttributeNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = null; String qualifiedName = "prefix:local"; Document doc; Attr newAttr; doc = load("staffNS", false); - - { - boolean success = false; - try { - newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); - fail("throw_NAMESPACE_ERR,qualifiedName has a prefix and namespaceURI is null"); - } catch (DOMException ex) { - assertTrue(ex.code == DOMException.NAMESPACE_ERR); - } - //assertTrue("throw_NAMESPACE_ERR", success); - } - + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, qualifiedName), + "throw_NAMESPACE_ERR,qualifiedName has a prefix and namespaceURI is null"); + assertEquals(DOMException.NAMESPACE_ERR, ex.code); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.Attr; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -46,55 +46,17 @@ import static org.w3c.domts.DOMTest.load */ public class createAttributeNS03 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.wedding.com/";; - String qualifiedName; - Document doc; - Attr newAttr; - java.util.List illegalQNames = new java.util.ArrayList(); - illegalQNames.add("person:{"); - illegalQNames.add("person:}"); - illegalQNames.add("person:~"); - illegalQNames.add("person:'"); - illegalQNames.add("person:!"); - illegalQNames.add("person:@"); - illegalQNames.add("person:#"); - illegalQNames.add("person:$"); - illegalQNames.add("person:%"); - illegalQNames.add("person:^"); - illegalQNames.add("person:&"); - illegalQNames.add("person:*"); - illegalQNames.add("person:("); - illegalQNames.add("person:)"); - illegalQNames.add("person:+"); - illegalQNames.add("person:="); - illegalQNames.add("person:["); - illegalQNames.add("person:]"); - illegalQNames.add("person:\\"); - illegalQNames.add("person:/"); - illegalQNames.add("person:;"); - illegalQNames.add("person:`"); - illegalQNames.add("person:<"); - illegalQNames.add("person:>"); - illegalQNames.add("person:,"); - illegalQNames.add("person:a "); - illegalQNames.add("person:\""); - - doc = load("staffNS", false); - for (int indexd292e121 = 0; indexd292e121 < illegalQNames.size(); indexd292e121++) { - qualifiedName = (String) illegalQNames.get(indexd292e121); - - { - boolean success = false; - try { - newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("throw_INVALID_CHARACTER_ERR", success); - } + Document doc = load("staffNS", false); + String[] illeagalChars = { + "{", "}", "~", "'", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", + "+", "=", "[", "]", "\\", "/", ";", "`", "<", ">", ",", "a ", "\"" + }; + for (String ic : illeagalChars) { + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, "person:"+ic)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "throw_INVALID_CHARACTER_ERR"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS04.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.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; -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; @@ -50,24 +50,15 @@ import static org.w3c.domts.DOMTest.load */ public class createAttributeNS04 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/XML/1998/namespaces";; String qualifiedName = "xml:attr1"; - Document doc; Attr newAttr; - doc = load("staffNS", false); - - { - boolean success = false; - try { - newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); - fail("BAD NS for prefix xml"); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, qualifiedName), + "BAD NS for prefix xml"); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createAttributeNS05.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,15 +43,12 @@ import static org.w3c.domts.DOMTest.load */ public class createAttributeNS05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/";; String qualifiedName = "econm:local"; - Document doc; - Attr newAttr; - String attrName; - doc = load("staffNS", false); - newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); - attrName = newAttr.getName(); + Document doc = load("staffNS", false); + Attr newAttr = doc.createAttributeNS(namespaceURI, qualifiedName); + String attrName = newAttr.getName(); assertEquals(qualifiedName, attrName); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument01.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; @@ -50,27 +51,16 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/";; String malformedName = "prefix::local"; - Document doc; DocumentType docType = null; - DOMImplementation domImpl; - Document aNewDoc; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - aNewDoc = domImpl.createDocument(namespaceURI, malformedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, malformedName, docType)); + assertEquals(ex.code, DOMException.NAMESPACE_ERR, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument02.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; @@ -47,28 +48,16 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = null; - String qualifiedName = "k:local"; - Document doc; DocumentType docType = null; - DOMImplementation domImpl; - Document aNewDoc; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR, qualifiedName has a prefix and namespaceURI is null", 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, "throw_NAMESPACE_ERR, qualifiedName has a prefix and namespaceURI is null"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument03.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; @@ -48,28 +49,16 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/schema";; String qualifiedName = "namespaceURI:x"; - Document doc; - DocumentType docType; - DOMImplementation domImpl; - Document aNewDoc; - doc = load("staffNS", false); - docType = doc.getDoctype(); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.WRONG_DOCUMENT_ERR); - } - assertTrue("throw_WRONG_DOCUMENT_ERR", success); - } + Document doc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, qualifiedName, docType)); + assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code, "throw_WRONG_DOCUMENT_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument04.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; @@ -49,29 +50,17 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument04 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/schema";; String qualifiedName = "namespaceURI:x"; - Document doc; - DocumentType docType; - DOMImplementation domImpl; - Document aNewDoc; - doc = load("staffNS", false); - aNewDoc = load("staffNS", false); - docType = doc.getDoctype(); - domImpl = aNewDoc.getImplementation(); - - { - boolean success = false; - try { - aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.WRONG_DOCUMENT_ERR); - } - assertTrue("throw_WRONG_DOCUMENT_ERR", success); - } + Document doc = load("staffNS", false); + Document aNewDoc = load("staffNS", false); + DocumentType docType = doc.getDoctype(); + DOMImplementation domImpl = aNewDoc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, qualifiedName, docType)); + assertEquals(DOMException.WRONG_DOCUMENT_ERR, ex.code, "throw_WRONG_DOCUMENT_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument05.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; @@ -47,58 +48,18 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/schema";; - String qualifiedName; - Document doc; DocumentType docType = null; - - DOMImplementation domImpl; - Document aNewDoc; - String charact; - java.util.List illegalQNames = new java.util.ArrayList(); - illegalQNames.add("namespaceURI:{"); - illegalQNames.add("namespaceURI:}"); - illegalQNames.add("namespaceURI:~"); - illegalQNames.add("namespaceURI:'"); - illegalQNames.add("namespaceURI:!"); - illegalQNames.add("namespaceURI:@"); - illegalQNames.add("namespaceURI:#"); - illegalQNames.add("namespaceURI:$"); - illegalQNames.add("namespaceURI:%"); - illegalQNames.add("namespaceURI:^"); - illegalQNames.add("namespaceURI:&"); - illegalQNames.add("namespaceURI:*"); - illegalQNames.add("namespaceURI:("); - illegalQNames.add("namespaceURI:)"); - illegalQNames.add("namespaceURI:+"); - illegalQNames.add("namespaceURI:="); - illegalQNames.add("namespaceURI:["); - illegalQNames.add("namespaceURI:]"); - illegalQNames.add("namespaceURI:\\"); - illegalQNames.add("namespaceURI:/"); - illegalQNames.add("namespaceURI:;"); - illegalQNames.add("namespaceURI:`"); - illegalQNames.add("namespaceURI:<"); - illegalQNames.add("namespaceURI:>"); - illegalQNames.add("namespaceURI:,"); - illegalQNames.add("namespaceURI:a "); - illegalQNames.add("namespaceURI:\""); - - doc = load("staffNS", false); - for (int indexd299e125 = 0; indexd299e125 < illegalQNames.size(); indexd299e125++) { - qualifiedName = (String) illegalQNames.get(indexd299e125); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("throw_INVALID_CHARACTER_ERR", success); - } + String[] illegalQNames = { + "{", "}", "~", "'", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", + "+", "=", "[", "]", "\\", "/", ";", "`", "<", ">", ",", "a ", "\"" + }; + Document doc = load("staffNS", false); + for (String qualifiedName : illegalQNames) { + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocument(namespaceURI, "namespaceURI:" + qualifiedName, docType)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "throw_INVALID_CHARACTER_ERR"); } } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument06.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument06.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument06.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument06.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; @@ -51,27 +52,16 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument06 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://ecommerce.org/schema";; String qualifiedName = "xml:local"; - Document doc; DocumentType docType = null; - DOMImplementation domImpl; - Document aNewDoc; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR,qualifiedName \"xml:local\", bad NS", 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, "throw_NAMESPACE_ERR,qualifiedName \"xml:local\", bad NS"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument07.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument07.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument07.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocument07.java Sun Feb 6 01:51:55 2022 @@ -22,13 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import 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; @@ -47,24 +47,18 @@ import static org.w3c.domts.DOMTest.load */ public class createDocument07 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/schema";; String qualifiedName = "y:x"; - Document doc; DocumentType docType = null; - DOMImplementation domImpl; - Document aNewDoc; - String nodeName; - String nodeValue; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); - nodeName = aNewDoc.getNodeName(); - nodeValue = aNewDoc.getNodeValue(); - assertEquals("nodeName", "#document", nodeName); - assertNull("nodeValue", nodeValue); - + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + Document aNewDoc = domImpl.createDocument(namespaceURI, qualifiedName, docType); + String nodeName = aNewDoc.getNodeName(); + String nodeValue = aNewDoc.getNodeValue(); + assertEquals("#document", nodeName, "nodeName"); + assertNull(nodeValue, "nodeValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType01.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.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; @@ -51,27 +51,16 @@ import static org.w3c.domts.DOMTest.load public class createDocumentType01 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String publicId = "STAFF"; String systemId = "staff.xml"; String malformedName = "prefix::local"; - Document doc; - DOMImplementation domImpl; - DocumentType newType; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - newType = domImpl.createDocumentType(malformedName, publicId, systemId); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocumentType(malformedName, publicId, systemId)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType02.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.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; @@ -49,60 +49,22 @@ import static org.w3c.domts.DOMTest.load public class createDocumentType02 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String publicId = "http://www.localhost.com/";; String systemId = "myDoc.dtd"; - String qualifiedName; - Document doc; - DocumentType docType = null; - - DOMImplementation domImpl; - java.util.List illegalQNames = new java.util.ArrayList(); - illegalQNames.add("edi:{"); - illegalQNames.add("edi:}"); - illegalQNames.add("edi:~"); - illegalQNames.add("edi:'"); - illegalQNames.add("edi:!"); - illegalQNames.add("edi:@"); - illegalQNames.add("edi:#"); - illegalQNames.add("edi:$"); - illegalQNames.add("edi:%"); - illegalQNames.add("edi:^"); - illegalQNames.add("edi:&"); - illegalQNames.add("edi:*"); - illegalQNames.add("edi:("); - illegalQNames.add("edi:)"); - illegalQNames.add("edi:+"); - illegalQNames.add("edi:="); - illegalQNames.add("edi:["); - illegalQNames.add("edi:]"); - illegalQNames.add("edi:\\"); - illegalQNames.add("edi:/"); - illegalQNames.add("edi:;"); - illegalQNames.add("edi:`"); - illegalQNames.add("edi:<"); - illegalQNames.add("edi:>"); - illegalQNames.add("edi:,"); - illegalQNames.add("edi:a "); - illegalQNames.add("edi:\""); - - doc = load("staffNS", false); - for (int indexd303e125 = 0; indexd303e125 < illegalQNames.size(); indexd303e125++) { - qualifiedName = (String) illegalQNames.get(indexd303e125); - domImpl = doc.getImplementation(); - - { - boolean success = false; - try { - docType = domImpl.createDocumentType(qualifiedName, publicId, systemId); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("throw_INVALID_CHARACTER_ERR", success); - } - } + String[] illegalQNames = { + "{", "}", "~", "'", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", + "+", "=", "[", "]", "\\", "/", ";", "`", "<", ">", ",", "a ", "\"" + }; + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + + for (String qualifiedName : illegalQNames) { + DOMException ex = assertThrows(DOMException.class, () -> domImpl.createDocumentType("edi:" + qualifiedName, publicId, systemId)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "throw_INVALID_CHARACTER_ERR"); + } } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createDocumentType03.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.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; @@ -46,26 +46,20 @@ import static org.w3c.domts.DOMTest.load */ public class createDocumentType03 { @Test - @Ignore + @Disabled public void testRun() throws Throwable { String namespaceURI = "http://ecommerce.org/schema";; String qualifiedName = "prefix:myDoc"; String publicId = "http://www.localhost.com";; String systemId = "myDoc.dtd"; - Document doc; - DOMImplementation domImpl; - DocumentType newType = null; - - String nodeName; - String nodeValue; - doc = load("staffNS", false); - domImpl = doc.getImplementation(); - newType = domImpl.createDocumentType(qualifiedName, publicId, systemId); - nodeName = newType.getNodeName(); - assertEquals("nodeName", "prefix:myDoc", nodeName); - nodeValue = newType.getNodeValue(); - assertNull("nodeValue", nodeValue); + Document doc = load("staffNS", false); + DOMImplementation domImpl = doc.getImplementation(); + DocumentType newType = domImpl.createDocumentType(qualifiedName, publicId, systemId); + String nodeName = newType.getNodeName(); + assertEquals("prefix:myDoc", nodeName, "nodeName"); + String nodeValue = newType.getNodeValue(); + assertNull(nodeValue, "nodeValue"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS01.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -47,23 +47,12 @@ import static org.w3c.domts.DOMTest.load */ public class createElementNS01 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.ecommerce.org/";; String malformedName = "prefix::local"; - Document doc; - Element newElement; - doc = load("staffNS", false); - - { - boolean success = false; - try { - newElement = doc.createElementNS(namespaceURI, malformedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR", success); - } - + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createElementNS(namespaceURI, malformedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS02.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -46,24 +46,14 @@ import static org.w3c.domts.DOMTest.load */ public class createElementNS02 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = null; String qualifiedName = "prefix:local"; - Document doc; - Element newElement; - doc = load("staffNS", false); - - { - boolean success = false; - try { - newElement = doc.createElementNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR, qualifiedName has a prefix and namespaceURI is null.", success); - } + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createElementNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "throw_NAMESPACE_ERR, qualifiedName has a prefix and namespaceURI is null."); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -46,57 +46,17 @@ import static org.w3c.domts.DOMTest.load */ public class createElementNS03 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.wedding.com/";; - String qualifiedName; - Document doc; - boolean done; - Element newElement; - String charact; - java.util.List illegalQNames = new java.util.ArrayList(); - illegalQNames.add("person:{"); - illegalQNames.add("person:}"); - illegalQNames.add("person:~"); - illegalQNames.add("person:'"); - illegalQNames.add("person:!"); - illegalQNames.add("person:@"); - illegalQNames.add("person:#"); - illegalQNames.add("person:$"); - illegalQNames.add("person:%"); - illegalQNames.add("person:^"); - illegalQNames.add("person:&"); - illegalQNames.add("person:*"); - illegalQNames.add("person:("); - illegalQNames.add("person:)"); - illegalQNames.add("person:+"); - illegalQNames.add("person:="); - illegalQNames.add("person:["); - illegalQNames.add("person:]"); - illegalQNames.add("person:\\"); - illegalQNames.add("person:/"); - illegalQNames.add("person:;"); - illegalQNames.add("person:`"); - illegalQNames.add("person:<"); - illegalQNames.add("person:>"); - illegalQNames.add("person:,"); - illegalQNames.add("person:a "); - illegalQNames.add("person:\""); - - doc = load("staffNS", false); - for (int indexd307e125 = 0; indexd307e125 < illegalQNames.size(); indexd307e125++) { - qualifiedName = (String) illegalQNames.get(indexd307e125); - - { - boolean success = false; - try { - newElement = doc.createElementNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("throw_INVALID_CHARACTER_ERR", success); - } + String[] illegalQNames = { + "{", "}", "~", "'", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", + "+", "=", "[", "]", "\\", "/", ";", "`", "<", ">", ",", "a ", "\"" + }; + Document doc = load("staffNS", false); + for (String qualifiedName : illegalQNames) { + DOMException ex = assertThrows(DOMException.class, () -> doc.createElementNS(namespaceURI, "person:" + qualifiedName)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "throw_INVALID_CHARACTER_ERR"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS04.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -49,25 +49,14 @@ import static org.w3c.domts.DOMTest.load */ public class createElementNS04 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/XML/1998/namespaces";; String qualifiedName = "xml:element1"; - Document doc; - Element newElement; - doc = load("staffNS", false); - - { - boolean success = false; - try { - newElement = doc.createElementNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("throw_NAMESPACE_ERR, qualifiedName has an \"xml\" prefix and the namespaceURI is different\n" + - "\n" + - " from http://www.w3.org/XML/1998/namespace";, success); - } + Document doc = load("staffNS", false); + DOMException ex = assertThrows(DOMException.class, () -> doc.createElementNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, + "throw_NAMESPACE_ERR, qualifiedName has an \"xml\" prefix and the namespaceURI is different from http://www.w3.org/XML/1998/namespace";); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS05.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS05.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS05.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/createElementNS05.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -43,16 +43,13 @@ import static org.w3c.domts.DOMTest.load */ public class createElementNS05 { @Test - public void testRun() throws Throwable { + void testRun() throws Throwable { String namespaceURI = "http://www.nist.gov";; String qualifiedName = "gov:faculty"; - Document doc; - Element newElement; - String elementName; - doc = load("staffNS", false); - newElement = doc.createElementNS(namespaceURI, qualifiedName); - elementName = newElement.getTagName(); - assertEquals("throw_Equals", qualifiedName, elementName); + Document doc = load("staffNS", false); + Element newElement = doc.createElementNS(namespaceURI, qualifiedName); + String elementName = newElement.getTagName(); + assertEquals(qualifiedName, elementName, "throw_Equals"); } Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS01.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS01.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS01.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS01.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -41,21 +41,13 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateattributeNS01 { @Test - public void testRun() throws Throwable { - Document doc; - Attr attribute; + void testRun() throws Throwable { String namespaceURI = null; - String qualifiedName = "test"; - String name; - String nodeName; - String nodeValue; - doc = load("staffNS", false); - attribute = doc.createAttributeNS(namespaceURI, qualifiedName); - nodeName = attribute.getNodeName(); - nodeValue = attribute.getNodeValue(); - assertEquals("documentcreateattributeNS01", "test", nodeName); - + Document doc = load("staffNS", false); + Attr attribute = doc.createAttributeNS(namespaceURI, qualifiedName); + String nodeName = attribute.getNodeName(); + assertEquals("test", nodeName, "documentcreateattributeNS01"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS02.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS02.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS02.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS02.java Sun Feb 6 01:51:55 2022 @@ -22,11 +22,11 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.w3c.domts.DOMTest.load; @@ -41,38 +41,29 @@ import static org.w3c.domts.DOMTest.load //BUG:eric's code treats QName as a localname here public class documentcreateattributeNS02 { @Test - public void testRun() throws Throwable { - Document doc; - Attr attribute1; - Attr attribute2; - String name; - String nodeName; - String nodeValue; - String prefix; - String namespaceURI; - doc = load("staffNS", false); - attribute1 = doc.createAttributeNS("http://www.w3.org/XML/1998/namespace";, "xml:xml"); - name = attribute1.getName(); - nodeName = attribute1.getNodeName(); - nodeValue = attribute1.getNodeValue(); - prefix = attribute1.getPrefix(); - namespaceURI = attribute1.getNamespaceURI(); - assertEquals("documentcreateattributeNS02_att1_name", "xml:xml", name); - assertEquals("documentcreateattributeNS02_att1_nodeName", "xml:xml", nodeName); - assertEquals("documentcreateattributeNS02_att1_nodeValue", "", nodeValue); - assertEquals("documentcreateattributeNS02_att1_prefix", "xml", prefix); - assertEquals("documentcreateattributeNS02_att1_namespaceURI", "http://www.w3.org/XML/1998/namespace";, namespaceURI); - attribute2 = doc.createAttributeNS("http://www.w3.org/2000/xmlns/";, "xmlns"); + void testRun() throws Throwable { + Document doc = load("staffNS", false); + Attr attribute1 = doc.createAttributeNS("http://www.w3.org/XML/1998/namespace";, "xml:xml"); + String name = attribute1.getName(); + String nodeName = attribute1.getNodeName(); + String nodeValue = attribute1.getNodeValue(); + String prefix = attribute1.getPrefix(); + String namespaceURI = attribute1.getNamespaceURI(); + assertEquals("xml:xml", name, "documentcreateattributeNS02_att1_name"); + assertEquals("xml:xml", nodeName, "documentcreateattributeNS02_att1_nodeName"); + assertEquals("", nodeValue, "documentcreateattributeNS02_att1_nodeValue"); + assertEquals("xml", prefix, "documentcreateattributeNS02_att1_prefix"); + assertEquals("http://www.w3.org/XML/1998/namespace";, namespaceURI, "documentcreateattributeNS02_att1_namespaceURI"); + Attr attribute2 = doc.createAttributeNS("http://www.w3.org/2000/xmlns/";, "xmlns"); name = attribute2.getName(); nodeName = attribute2.getNodeName(); nodeValue = attribute2.getNodeValue(); prefix = attribute2.getPrefix(); namespaceURI = attribute2.getNamespaceURI(); - assertEquals("documentcreateattributeNS02_att2_name", "xmlns", name); - assertEquals("documentcreateattributeNS02_att2_nodeName", "xmlns", nodeName); - assertEquals("documentcreateattributeNS02_att2_nodeValue", "", nodeValue); - assertEquals("documentcreateattributeNS02_att2_namespaceURI", "http://www.w3.org/2000/xmlns/";, namespaceURI); - + assertEquals("xmlns", name, "documentcreateattributeNS02_att2_name"); + assertEquals("xmlns", nodeName, "documentcreateattributeNS02_att2_nodeName"); + assertEquals("", nodeValue, "documentcreateattributeNS02_att2_nodeValue"); + assertEquals("http://www.w3.org/2000/xmlns/";, namespaceURI, "documentcreateattributeNS02_att2_namespaceURI"); } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS03.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS03.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS03.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS03.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,13 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -44,37 +45,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateattributeNS03 { @Test - public void testRun() throws Throwable { - Document doc; + void testRun() throws Throwable { Attr attribute; String namespaceURI = "http://www.w3.org/DOM/Test/Level2";; - String qualifiedName; - java.util.List qualifiedNames = new java.util.ArrayList(); - qualifiedNames.add("/"); - qualifiedNames.add("//"); - qualifiedNames.add("\\"); - qualifiedNames.add(";"); - qualifiedNames.add("&"); - qualifiedNames.add("*"); - qualifiedNames.add("]]"); - qualifiedNames.add(">"); - qualifiedNames.add("<"); - - doc = load("staffNS", false); - for (int indexd312e67 = 0; indexd312e67 < qualifiedNames.size(); indexd312e67++) { - qualifiedName = (String) qualifiedNames.get(indexd312e67); - - { - boolean success = false; - try { - attribute = doc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.INVALID_CHARACTER_ERR); - } - assertTrue("documentcreateattributeNS03", success); - } + String[] qualifiedNames = { "/", "//", "\\", ";", "&", "*", "]]", ">", "<" }; + Document doc = load("staffNS", false); + for (String qualifiedName : qualifiedNames) { + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.INVALID_CHARACTER_ERR, ex.code, "documentcreateattributeNS03"); } - } /** Modified: xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java (original) +++ xmlbeans/trunk/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java Sun Feb 6 01:51:55 2022 @@ -22,12 +22,12 @@ See W3C License http://www.w3.org/Consor package org.w3c.domts.level2.core; -import org.junit.Test; -import org.w3c.dom.Attr; +import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.w3c.domts.DOMTest.load; @@ -43,34 +43,15 @@ import static org.w3c.domts.DOMTest.load */ public class documentcreateattributeNS04 { @Test - public void testRun() throws Throwable { - Document doc; - Attr attribute; + void testRun() throws Throwable { String namespaceURI = "http://www.w3.org/DOM/Test/Level2";; - String qualifiedName; - java.util.List qualifiedNames = new java.util.ArrayList(); - qualifiedNames.add("_:"); - qualifiedNames.add(":0a"); - qualifiedNames.add(":"); - qualifiedNames.add("a:b:c"); - qualifiedNames.add("_::a"); - - doc = load("staffNS", false); - for (int indexd313e55 = 0; indexd313e55 < qualifiedNames.size(); indexd313e55++) { - qualifiedName = (String) qualifiedNames.get(indexd313e55); - - { - boolean success = false; - try { - attribute = doc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); - } - assertTrue("documentcreateattributeNS04,valid value for " + - " namespaceURI, and malformed qualifiedNames", success); - } - } + String[] qualifiedNames = { "_:", ":0a", ":", "a:b:c", "_::a" }; + Document doc = load("staffNS", false); + for (String qualifiedName : qualifiedNames) { + DOMException ex = assertThrows(DOMException.class, () -> doc.createAttributeNS(namespaceURI, qualifiedName)); + assertEquals(DOMException.NAMESPACE_ERR, ex.code, "documentcreateattributeNS04,valid value for namespaceURI, and malformed qualifiedNames"); + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
