You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/01/18 23:08:48 UTC
svn commit: r1851656 [7/28] - in /xmlbeans/trunk: ./ external/ lib/
resources/ resources/typeimpl/ resources/typeimpl/org/
resources/typeimpl/org/apache/ resources/typeimpl/org/apache/xmlbeans/
resources/typeimpl/org/apache/xmlbeans/impl/ resources/typ...
Modified: xmlbeans/trunk/test/src/dom/checkin/DomImplementationTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DomImplementationTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DomImplementationTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DomImplementationTest.java Fri Jan 18 23:08:44 2019
@@ -17,20 +17,16 @@
package dom.checkin;
import dom.common.Loader;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.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.*;
-public class DomImplementationTest extends TestCase {
+public class DomImplementationTest {
DOMImplementation m_imp;
DocumentType m_docType;
@@ -39,22 +35,13 @@ public class DomImplementationTest exten
Document m_docNS;
String sXmlNS;
- public DomImplementationTest(String sName) {
- super(sName);
+ public DomImplementationTest() {
sXmlNS =
"<foo xmlns:myns=\"uri:foo\" at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" at3=\"val3\" at4=\"val4\"/>";
}
- public static Test suite() {
- return new TestSuite(DomImplementationTest.class);
- }
-
- public void testCreateDocumentType() {
- //not implemented by Eric
-
- }
-
//$TODO: non null doctype
+ @Test
public void testCreateDocument() {
String sUri = "http://foo.org";
String sQName = "qname";
@@ -66,6 +53,7 @@ public class DomImplementationTest exten
//$TODO: implem. w/o "XML" feature; WRONG_DOCUMENT_ERR
//NOT_SUPPORTED_ERR
+ @Test
public void testCreateDocumentInvalid() {
String sUri = "http://foo.org";
String sQName = "<qname";
@@ -96,9 +84,9 @@ public class DomImplementationTest exten
}
+ @Test
public void testHasFeature() {
-
- String[] features = new String[]{
+ String[] features = {
"Core", "XML", "Events", "MutationEvents", "Range", "Traversal", "HTML", "Views", "StyleSheets", "CSS", "CSS2", "UIEvents", "HTMLEvents"
};
boolean bResult = true;
@@ -112,6 +100,7 @@ public class DomImplementationTest exten
}
+ @Test
public void testHasFeatureIlegal() {
assertFalse(m_imp.hasFeature(null, "2.0"));
assertFalse(m_imp.hasFeature("foobar", "2.0"));
@@ -134,8 +123,8 @@ public class DomImplementationTest exten
}
+ @Before
public void setUp() throws Exception {
-
_loader = Loader.getLoader();
m_docNS = (org.w3c.dom.Document) _loader.load(sXmlNS);
moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/DomTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DomTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DomTests.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DomTests.java Fri Jan 18 23:08:44 2019
@@ -16,12 +16,9 @@
package dom.checkin;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@@ -30,14 +27,9 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import java.io.StringReader;
-public class DomTests extends TestCase {
- public DomTests(String name) {
- super(name);
- }
+import static org.junit.Assert.assertEquals;
- public static Test suite() {
- return new TestSuite(DomTests.class);
- }
+public class DomTests {
static String[] _args;
static String _test;
@@ -53,14 +45,14 @@ public class DomTests extends TestCase {
XmlObject x = XmlObject.Factory.parse(doc);
- Assert.assertTrue(x.xmlText().equals(xml));
+ assertEquals(x.xmlText(), xml);
}
public void doTestDomExport(String xml)
throws Exception {
XmlObject x = XmlObject.Factory.parse(
XmlObject.Factory.parse(xml).newDomNode());
- Assert.assertTrue(x.xmlText().equals(xml));
+ assertEquals(x.xmlText(), xml);
}
public void doTest(String xml)
@@ -73,9 +65,9 @@ public class DomTests extends TestCase {
// throws Exception
// {
// DOMParser parser = new DOMParser();
-//
+//
// parser.setFeature( "http://xml.org/sax/features/namespaces", true );
-//
+//
// parser.parse( new InputSource( new StringReader( "<foo a='x\n\ny'></foo>" ) ) );
//
// XmlObject x = XmlLoader.Factory.parse( parser.getDocument() );
@@ -83,6 +75,7 @@ public class DomTests extends TestCase {
// System.out.println( x.xmlText() );
// }
+ @Test
public void testDom()
throws Exception {
doTest("<foo xmlns=\"x\"/>");
Modified: xmlbeans/trunk/test/src/dom/checkin/ElementSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/ElementSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/ElementSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/ElementSyncTest.java Fri Jan 18 23:08:44 2019
@@ -16,24 +16,11 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
-/**
- *
- *
- */
-
public class ElementSyncTest extends ElementTest {
- public ElementSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(ElementSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/ElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/ElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/ElementTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/ElementTest.java Fri Jan 18 23:08:44 2019
@@ -18,73 +18,70 @@ package dom.checkin;
import dom.common.NodeWithChildrenTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.*;
import xmlcursor.common.Common;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ElementTest extends NodeWithChildrenTest {
-
- public ElementTest(String s) {
- super(s);
- String sDTD = "<?xml version=\"1.0\"?>" +
- "<!DOCTYPE bardoc [" +
- "<!ELEMENT bar>" +
- "<!ELEMENT foo>" +
- "<!ATTLIST bar at_spec CDATA \"0\">" +
- "]>";
- sXmlNS = "<bar xmlns:other=\"uri:other\" xmlns:myns=\"uri:foo\">" +
- "<foo myns:at0=\"val01\" myns:at2=\"at2\" at2=\"val2\" myns:at3=\"val3\" at4=\"val4\">" +
- "txt0<foo>nestedfoo</foo><myns:yana/>" +
- "</foo>" +
- "<myns:foo>nstext<ZeD/></myns:foo>" +
- "</bar>";
+ public ElementTest() {
+ String sDTD =
+ "<?xml version=\"1.0\"?>" +
+ "<!DOCTYPE bardoc [" +
+ "<!ELEMENT bar>" +
+ "<!ELEMENT foo>" +
+ "<!ATTLIST bar at_spec CDATA \"0\">" +
+ "]>";
+ sXmlNS =
+ "<bar xmlns:other=\"uri:other\" xmlns:myns=\"uri:foo\">" +
+ "<foo myns:at0=\"val01\" myns:at2=\"at2\" at2=\"val2\" myns:at3=\"val3\" at4=\"val4\">" +
+ "txt0<foo>nestedfoo</foo><myns:yana/>" +
+ "</foo>" +
+ "<myns:foo>nstext<ZeD/></myns:foo>" +
+ "</bar>";
if (bDTD)
sXmlNS = sDTD + sXmlNS;
sXml = Common.XML_FOO_BAR_NESTED_SIBLINGS;
}
- public static Test suite() {
- return new TestSuite(ElementTest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("zed", m_node.getNodeName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.ELEMENT_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
- assertEquals(null, m_node.getNodeValue());
+ assertNull(m_node.getNodeValue());
}
-
+ @Test
public void testNextSibling() {
- assertEquals(null, m_node.getNextSibling());
+ assertNull(m_node.getNextSibling());
}
+ @Test
public void testPreviousSibling() {
Node prSib = m_node.getPreviousSibling();
assertEquals("text0", prSib.getNodeValue());
}
+ @Test
public void testParent() {
Node parent = m_node.getParentNode();
assertEquals("bar", parent.getLocalName());
assertEquals(m_doc.getFirstChild().getFirstChild(), parent);
}
+ @Test
public void testPrefix() {
assertEquals("", m_node.getPrefix());
@@ -93,10 +90,12 @@ public class ElementTest extends NodeWit
assertEquals("myns", m_node.getPrefix());
}
+ @Test
public void testNamespaceUri() {
- assertEquals("",m_node.getNamespaceURI());
+ assertEquals("", m_node.getNamespaceURI());
}
-
+
+ @Test
public void testCloneNode() {
super.testCloneNode();
}
@@ -104,6 +103,7 @@ public class ElementTest extends NodeWit
/**
* Clone node with atts
*/
+ @Test
public void testCloneNodeAttrs() {
Node toClone = m_docNS.getFirstChild(); //the foo elt
/* Node clone1=toClone.cloneNode(false);
@@ -114,20 +114,23 @@ public class ElementTest extends NodeWit
Node clone2 = toClone.cloneNode(true);
}
+ @Test
public void testHasAttributes() {
super.testHasAttributes();
m_node = m_doc.getFirstChild();
- assertEquals(true, ((Element) m_node).hasAttributes());
+ assertTrue(m_node.hasAttributes());
}
+ @Test
public void testGetAttribute() {
m_node = m_docNS.getFirstChild();
if (bDTD)
assertEquals("0", ((Element) m_node).getAttribute("at_spec"));
assertEquals("val2",
- ((Element) m_node.getFirstChild()).getAttribute("at2"));
+ ((Element) m_node.getFirstChild()).getAttribute("at2"));
}
+ @Test
public void testGetAttributeDNE() {
m_node = m_docNS.getFirstChild();
assertEquals("", ((Element) m_node).getAttribute("at3"));
@@ -136,58 +139,64 @@ public class ElementTest extends NodeWit
assertEquals("", ((Element) m_node).getAttribute(sNull));
}
+ @Test
public void testGetAttributeNode() {
m_node = m_docNS.getFirstChild();
assertEquals("bar", ((Element) m_node).getTagName());
//assertEquals("uri:foo",((Attr)((Element)m_node).getAttributeNodeNS("xmlns","myns")).getNodeValue());
m_node = m_node.getFirstChild();
assertEquals("val2",
- ((Attr) ((Element) m_node).getAttributeNode("at2")).getNodeValue());
+ ((Element) m_node).getAttributeNode("at2").getNodeValue());
if (bDTD)
assertEquals("0",
- ((Attr) ((Element) m_node).getAttributeNode("at_spec")).getNodeValue());
+ ((Element) m_node).getAttributeNode("at_spec").getNodeValue());
}
+ @Test
public void testGetAttributeNodeDNE() {
m_node = m_docNS.getFirstChild();
- assertEquals(null, ((Element) m_node).getAttributeNode("at3"));
- assertEquals(null, ((Element) m_node).getAttributeNode("foobar"));
+ assertNull(((Element) m_node).getAttributeNode("at3"));
+ assertNull(((Element) m_node).getAttributeNode("foobar"));
String sNull = null;
assertEquals("", ((Element) m_node).getAttribute(sNull));
}
+ @Test
public void getAttributeNodeNS() {
- m_node = m_docNS.getFirstChild();
- assertEquals("0",
- ((Attr) ((Element) m_node).getAttributeNodeNS("", "at_spec")).getNodeValue());
+ m_node = m_docNS.getFirstChild().getFirstChild();
+ if (bDTD) {
+ assertEquals("0",
+ ((Element) m_node).getAttributeNodeNS("", "at_spec").getNodeValue());
+ }
assertEquals("val01",
- ((Attr) ((Element) m_node).getAttributeNodeNS("uri:foo", "at0")).getNodeValue());
- assertEquals("val0",
- ((Attr) ((Element) m_node).getAttributeNodeNS(null, "at0")).getNodeValue());
+ ((Element) m_node).getAttributeNodeNS("uri:foo", "at0").getNodeValue());
+ assertEquals("val2",
+ ((Element) m_node).getAttributeNodeNS(null, "at2").getNodeValue());
assertEquals("val3",
- ((Attr) ((Element) m_node).getAttributeNodeNS("uri:foo", "at3")).getNodeValue());
+ ((Element) m_node).getAttributeNodeNS("uri:foo", "at3").getNodeValue());
}
+ @Test
public void testGetAttributeNodeNS_DNE() {
m_node = m_docNS.getFirstChild();
- assertEquals(null, ((Element) m_node).getAttributeNodeNS("", "at3"));
- assertEquals(null,
- ((Element) m_node).getAttributeNodeNS("uri:foo", "at1"));
+ assertNull(((Element) m_node).getAttributeNodeNS("", "at3"));
+ assertNull(((Element) m_node).getAttributeNodeNS("uri:foo", "at1"));
String sNull = null;
- assertEquals(null,
- ((Element) m_node).getAttributeNodeNS("uri:foo", sNull));
+ assertNull(((Element) m_node).getAttributeNodeNS("uri:foo", sNull));
}
+ @Test
public void testGetAttributeNS() {
m_node = m_docNS.getFirstChild().getFirstChild();
if (bDTD)
assertEquals("0",
- ((Element) m_node).getAttributeNS(null, "at_spec"));
+ ((Element) m_node).getAttributeNS(null, "at_spec"));
assertEquals("val01",
- ((Element) m_node).getAttributeNS("uri:foo", "at0"));
+ ((Element) m_node).getAttributeNS("uri:foo", "at0"));
assertEquals("val2", ((Element) m_node).getAttributeNS("", "at2"));
}
+ @Test
public void testGetAttributeNS_DNE() {
m_node = m_docNS.getFirstChild();
assertEquals("", ((Element) m_node).getAttributeNS("", "at3"));
@@ -196,6 +205,7 @@ public class ElementTest extends NodeWit
assertEquals("", ((Element) m_node).getAttributeNS("uri:foo", sNull));
}
+ @Test
public void testGetElementsByTagName() {
//move node @ foo
m_node = m_node.getParentNode().getParentNode();
@@ -209,31 +219,34 @@ public class ElementTest extends NodeWit
assertEquals("nested1", result.item(1).getFirstChild().getNodeValue());
}
+ @Test
public void testGetElementsByTagNameDNE() {
NodeList result = ((Element) m_node.getParentNode()).getElementsByTagName(
- "foobar");
+ "foobar");
assertEquals(0, result.getLength());
}
//elts need to come out in preorder order
+ @Test
public void testGetElementsByTagNamePreorder() {
m_node = m_docNS.getFirstChild();
NodeList result = ((Element) m_node).getElementsByTagName("foo");
assertEquals(2, result.getLength());
assertEquals("txt0", result.item(0).getFirstChild().getNodeValue());
assertEquals("nestedfoo",
- result.item(1).getFirstChild().getNodeValue());
+ result.item(1).getFirstChild().getNodeValue());
}
+ @Test
public void testGetElementsByTagNameDescendant() {
m_node = m_docNS.getFirstChild().getFirstChild();
NodeList result = ((Element) m_node).getElementsByTagName("foo");//self should not be selected
assertEquals(1, result.getLength());
assertEquals("nestedfoo",
- result.item(0).getFirstChild().getNodeValue());
+ result.item(0).getFirstChild().getNodeValue());
}
-
+ @Test
public void testGetElementsByTagNameNS() {
m_node = m_docNS.getFirstChild();
NodeList result = ((Element) m_node).getElementsByTagNameNS("*", "*");
@@ -245,7 +258,7 @@ public class ElementTest extends NodeWit
assertEquals(nEltCount, result.getLength());
assertEquals("txt0", result.item(0).getFirstChild().getNodeValue());
assertEquals("nestedfoo",
- result.item(1).getFirstChild().getNodeValue());
+ result.item(1).getFirstChild().getNodeValue());
assertEquals("nstext", result.item(2).getFirstChild().getNodeValue());
@@ -256,9 +269,9 @@ public class ElementTest extends NodeWit
result = ((Element) m_node).getElementsByTagNameNS(null, "foo");
assertEquals("txt0", result.item(0).getFirstChild().getNodeValue());
assertEquals("nestedfoo",
- result.item(1).getFirstChild().getNodeValue());
+ result.item(1).getFirstChild().getNodeValue());
NodeList result1 = ((Element) m_node).getElementsByTagNameNS("", "foo");
- assertEquals(true, compareNodeList(result, result1));
+ assertTrue(compareNodeList(result, result1));
result = ((Element) m_node).getElementsByTagNameNS(null, "*");
@@ -266,50 +279,50 @@ public class ElementTest extends NodeWit
assertEquals("ZeD", ((Element) result.item(2)).getTagName());
}
+ @Test
public void testGetElementsByTagNameNS_DNE() {
m_node = m_docNS.getFirstChild();
NodeList result = ((Element) m_node).getElementsByTagNameNS("uri:foo",
- "zed");
+ "zed");
assertEquals(0, result.getLength());
result =
- ((Element) m_node).getElementsByTagNameNS("foo:uri_DNE", "foo");
+ ((Element) m_node).getElementsByTagNameNS("foo:uri_DNE", "foo");
assertEquals(0, result.getLength());
-
}
+ @Test
public void testGetTagName() {
m_node =
- m_docNS.getFirstChild().getChildNodes().item(1).getChildNodes()
+ m_docNS.getFirstChild().getChildNodes().item(1).getChildNodes()
.item(1);
assertEquals("ZeD", ((Element) m_node).getTagName());
-
}
-
+ @Test
public void testHasAttribute() {
m_node = m_docNS.getFirstChild();
if (bDTD)
- assertEquals(true, ((Element) m_node).hasAttribute("at_spec"));
+ assertTrue(((Element) m_node).hasAttribute("at_spec"));
m_node = m_docNS.getFirstChild();
- assertEquals(false, ((Element) m_node).hasAttribute("at3"));
- assertEquals(false, ((Element) m_node).hasAttribute("at0"));
+ assertFalse(((Element) m_node).hasAttribute("at3"));
+ assertFalse(((Element) m_node).hasAttribute("at0"));
}
+ @Test
public void testHasAttributeNS() {
m_node = m_docNS.getFirstChild();
if (bDTD)
- assertEquals(true,
- ((Element) m_node).hasAttributeNS(null, "at_spec"));
+ assertTrue(((Element) m_node).hasAttributeNS(null, "at_spec"));
m_node = m_node.getFirstChild();
- assertEquals(true, ((Element) m_node).hasAttributeNS("uri:foo", "at3"));
- assertEquals(false,
- ((Element) m_node).hasAttributeNS("uri:foo:org", "at0"));
- assertEquals(false, ((Element) m_node).hasAttributeNS("uri:foo", null));
+ assertTrue(((Element) m_node).hasAttributeNS("uri:foo", "at3"));
+ assertFalse(((Element) m_node).hasAttributeNS("uri:foo:org", "at0"));
+ assertFalse(((Element) m_node).hasAttributeNS("uri:foo", null));
}
+ @Test
public void testRemoveAttribute() {
m_node = m_docNS.getFirstChild();
//remove default
@@ -331,13 +344,14 @@ public class ElementTest extends NodeWit
}
+ @Test
public void testRemoveAttributeNode() {
Node removed;
//remove default
m_node = m_docNS.getFirstChild();
if (bDTD) {
((Element) m_node).removeAttributeNode(
- ((Element) m_node).getAttributeNode("at_spec"));
+ ((Element) m_node).getAttributeNode("at_spec"));
assertEquals(1, m_node.getAttributes().getLength());
}
m_node = m_node.getFirstChild();
@@ -345,11 +359,12 @@ public class ElementTest extends NodeWit
assertEquals(5, m_node.getAttributes().getLength());
Attr remove = ((Element) m_node).getAttributeNode("at2");
removed = ((Element) m_node).removeAttributeNode(remove);
- assertFalse(removed == null);
+ assertNotNull(removed);
assertEquals(4, m_node.getAttributes().getLength());
assertEquals(removed, remove);
}
+ @Test
public void testRemoveAttributeNode_DNE() {
//DNE
Node removed;
@@ -357,8 +372,7 @@ public class ElementTest extends NodeWit
try {
removed = ((Element) m_node).removeAttributeNode(remove);
fail("removing Non existing attr");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NOT_FOUND_ERR, de.code);
}
@@ -366,8 +380,7 @@ public class ElementTest extends NodeWit
try {
removed = ((Element) m_node).removeAttributeNode(remove);
fail("removing Non existing attr");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NOT_FOUND_ERR, de.code);
}
@@ -376,12 +389,12 @@ public class ElementTest extends NodeWit
try {
removed = ((Element) m_node).removeAttributeNode(remove);
fail("removing Non existing attr");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NOT_FOUND_ERR, de.code);
}
}
+ @Test
public void testRemoveAttributeNS() {
//remove default
m_node = m_docNS.getFirstChild();
@@ -401,15 +414,14 @@ public class ElementTest extends NodeWit
assertEquals(4, m_node.getAttributes().getLength());
}
-
+ @Test
public void testSetAttribute() {
m_node = m_doc.getDocumentElement();
try {
((Element) m_node).setAttribute("invalid<", "0");
fail("Invalid attr name");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.INVALID_CHARACTER_ERR, de.code);
}
@@ -422,6 +434,7 @@ public class ElementTest extends NodeWit
assertEquals(2, m_node.getAttributes().getLength());
}
+ @Test
public void testSetAttributeNode() {
Attr result;
Attr newAttr = m_doc.createAttribute("attr0");
@@ -430,7 +443,7 @@ public class ElementTest extends NodeWit
result = ((Element) m_node).setAttributeNode(newAttr);
assertEquals(oldAttr, result);
assertEquals("newval",
- ((Element) m_node).getAttributeNode("attr0").getNodeValue());
+ ((Element) m_node).getAttributeNode("attr0").getNodeValue());
//insert self
try {
@@ -438,8 +451,7 @@ public class ElementTest extends NodeWit
String v1 = at0.getNodeValue();
((Element) m_node).setAttributeNode(at0);
assertEquals(v1, ((Element) m_node).getAttribute("attr0"));
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(de.code, DOMException.INUSE_ATTRIBUTE_ERR);
}
@@ -447,24 +459,25 @@ public class ElementTest extends NodeWit
newAttr = m_doc.createAttribute("attr1");
newAttr.setValue("newval");
result = ((Element) m_node).setAttributeNode(newAttr);
- assertEquals(null, result);
+ assertNull(result);
assertEquals("newval",
- ((Element) m_node).getAttributeNode("attr1").getNodeValue());
+ ((Element) m_node).getAttributeNode("attr1").getNodeValue());
assertEquals(2, m_node.getAttributes().getLength());
}
+ @Test
public void testSetAttributeNodeDiffDoc() {
Attr result;
Attr newAttr = m_docNS.createAttribute("attr0");
try {
result = ((Element) m_node).setAttributeNode(newAttr);
fail("Attr Node diff doc in use");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.WRONG_DOCUMENT_ERR, de.code);
}
}
+ @Test
public void testSetAttributeNodeInUse() {
//insert new
m_node = m_node.getParentNode().getParentNode();
@@ -473,24 +486,24 @@ public class ElementTest extends NodeWit
try {
((Element) m_node).setAttributeNode(newAttr);
fail("Attr Node in use");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.INUSE_ATTRIBUTE_ERR, de.code);
}
}
+ @Test
public void testSetAttributeNodeNS() {
m_node = m_docNS.getFirstChild().getFirstChild();
Attr result;
Attr newAttr = m_docNS.createAttributeNS("uri:foo", "at0");
Attr oldAttr = ((Element) m_node).getAttributeNodeNS("uri:foo", "at0");
- assertFalse(oldAttr == null);
+ assertNotNull(oldAttr);
newAttr.setValue("newval");
result = ((Element) m_node).setAttributeNodeNS(newAttr);
assertEquals(oldAttr, result);
Attr insertedAtt = ((Element) m_node).getAttributeNodeNS("uri:foo",
- "at0");
- assertFalse(insertedAtt == null);
+ "at0");
+ assertNotNull(insertedAtt);
assertEquals("newval", insertedAtt.getNodeValue());
//insert new
@@ -498,9 +511,9 @@ public class ElementTest extends NodeWit
newAttr = m_docNS.createAttributeNS("uri:foo", "attr1");
newAttr.setValue("newval");
result = ((Element) m_node).setAttributeNode(newAttr);
- assertEquals(null, result);
+ assertNull(result);
assertEquals("newval",
- ((Element) m_node).getAttributeNS("uri:foo", "attr1"));
+ ((Element) m_node).getAttributeNS("uri:foo", "attr1"));
assertEquals(nAttrCnt + 1, m_node.getAttributes().getLength());
//insert new
@@ -508,35 +521,34 @@ public class ElementTest extends NodeWit
newAttr.setValue("newURIval");
result = ((Element) m_node).setAttributeNodeNS(newAttr);
- assertEquals(null, result);
+ assertNull(result);
assertEquals("newURIval",
- ((Element) m_node).getAttributeNS("uri:foo:org", "attr1"));
+ ((Element) m_node).getAttributeNS("uri:foo:org", "attr1"));
assertEquals(nAttrCnt + 2, m_node.getAttributes().getLength());
-
}
+ @Test
public void testSetAttributeNS() {
m_node = m_docNS.getFirstChild().getFirstChild();
//overwrite
((Element) m_node).setAttributeNS("uri:foo", "at0", "newval");
assertEquals("newval",
- ((Element) m_node).getAttributeNS("uri:foo", "at0"));
+ ((Element) m_node).getAttributeNS("uri:foo", "at0"));
((Element) m_node).setAttributeNS("uri:foo:org", "attr1", "newval");
assertEquals("newval",
- ((Element) m_node).getAttributeNS("uri:foo:org", "attr1"));
+ ((Element) m_node).getAttributeNS("uri:foo:org", "attr1"));
assertEquals(6, m_node.getAttributes().getLength());
-
}
+ @Test
public void testSetAttributeNSBadNS() {
//qualifiedName is malformed
try {
((Element) m_node).setAttributeNS("foo:org", "invalid<", "0");
fail("Invalid attr name");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.INVALID_CHARACTER_ERR, de.code);
}
@@ -545,77 +557,81 @@ public class ElementTest extends NodeWit
String sNull = null;
((Element) m_node).setAttributeNS(sNull, "myfoo:at", "0");
fail("Invalid attr name");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NAMESPACE_ERR, de.code);
}
}
+ @Test
public void testSetAttributeNSBadNS_xmlns() {
//the qualifiedName, or its prefix, is "xmlns" and the namespaceURI is different from " http://www.w3.org/2000/xmlns/".
try {
((Element) m_node).setAttributeNS("foo:org:uri", "xmlns", "0");
fail("Invalid attr name");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NAMESPACE_ERR, de.code);
}
try {
((Element) m_node).setAttributeNS("foo:org:uri", "xmlns:foo", "0");
fail("Invalid attr name");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NAMESPACE_ERR, de.code);
}
}
+ @Test
public void testSetAttributeNSBadNS_xml() {
//if the qualifiedName has a prefix that is "xml"
// and the namespaceURI is different from " http://www.w3.org/XML/1998/namespace"
try {
((Element) m_node).setAttributeNS("foo:org:uri", "xml:foo", "0");
fail("Invalid attr name");
- }
- catch (DOMException de) {
+ } catch (DOMException de) {
assertEquals(DOMException.NAMESPACE_ERR, de.code);
}
}
+ @Test
public void testGetChildNodes() {
m_node = m_node.getParentNode();
assertEquals(2, m_node.getChildNodes().getLength());
}
+ @Test
public void testFirstChild() {
assertEquals("nested0", m_node.getFirstChild().getNodeValue());
}
+ @Test
public void testLastChild() {
assertEquals("nested0", m_node.getLastChild().getNodeValue());
}
//code coverage: need a node with penultimate elt and last text
+ @Test
public void testLastChildMixedContent() {
Node prevSibling = m_doc.createElement("penultimateNode");
m_node.insertBefore(prevSibling, m_node.getFirstChild());
assertEquals("nested0", m_node.getLastChild().getNodeValue());
}
-
+ @Test
public void testGetAttributes() {
assertEquals(0, m_node.getAttributes().getLength());
}
+ @Test
public void testLocalName() {
assertEquals("zed", m_node.getLocalName());
}
+ @Test
public void testSetPrefix() {
//set a null prefix
m_node =
- m_docNS.getFirstChild().getFirstChild().getChildNodes().item(2);//<myns:yana/>
- assertFalse(m_node == null);
+ m_docNS.getFirstChild().getFirstChild().getChildNodes().item(2);//<myns:yana/>
+ assertNotNull(m_node);
m_node.setPrefix(null);
assertEquals("", m_node.getPrefix());
@@ -625,25 +641,23 @@ public class ElementTest extends NodeWit
assertEquals("other:yana", ((Element) m_node).getTagName());
// assertEquals("uri:other",m_node.getNamespaceURI());--this is the URI @ creation--never changes
assertEquals(1,
- ((Element) m_docNS.getDocumentElement()).getElementsByTagName(
- "other:yana")
+ ((Element) m_docNS.getDocumentElement()).getElementsByTagName(
+ "other:yana")
.getLength());
-
-
}
+ @Test
public void testNormalizeNode() throws Exception {
m_node = m_node.getParentNode();
m_node.replaceChild(m_doc.createTextNode("txt1"),
- m_node.getLastChild());
+ m_node.getLastChild());
assertEquals(2, m_node.getChildNodes().getLength());
m_node.normalize();
assertEquals(1, m_node.getChildNodes().getLength());
-
-
}
+ @Test
public void testNormalizeNodeNoChildren() throws Exception {
m_node = m_doc.createElement("foobar");
assertEquals(0, m_node.getChildNodes().getLength());
@@ -651,6 +665,7 @@ public class ElementTest extends NodeWit
assertEquals(0, m_node.getChildNodes().getLength());
}
+ @Test
public void testNormalizeNodeOneChild() throws Exception {
m_node = m_doc.createElement("foobar");
m_node.appendChild(m_doc.createElement("foobar"));
@@ -659,45 +674,42 @@ public class ElementTest extends NodeWit
assertEquals(1, m_node.getChildNodes().getLength());
}
+ @Test
public void testAppendChildExisting() {
m_node = m_docNS.getFirstChild().getLastChild();
Node child = m_docNS.getFirstChild().getFirstChild();
super.testAppendChildExisting(child);
}
+ @Test
public void testInsertExisitingNode() {
m_node = m_docNS.getFirstChild().getLastChild();
Node child = m_docNS.getFirstChild().getFirstChild();
super.testAppendChildExisting(child);
-
}
-
+ @Test
public void testDomLevel1() {
- Element elt = m_doc.createElement("foobar");
- assertNull("L1 prefix null", elt.getPrefix());
- assertNull("L1 LocalName null", elt.getLocalName());
- assertNull("L1 Uri null", elt.getNamespaceURI());
- try
- {
- elt.setPrefix("foo");
- fail("L1 prefix null");
- }
- catch (DOMException de)
- {
- assertEquals(DOMException.NAMESPACE_ERR, de.code);
- }
- }
+ Element elt = m_doc.createElement("foobar");
+ assertNull("L1 prefix null", elt.getPrefix());
+ assertNull("L1 LocalName null", elt.getLocalName());
+ assertNull("L1 Uri null", elt.getNamespaceURI());
+ try {
+ elt.setPrefix("foo");
+ fail("L1 prefix null");
+ } catch (DOMException de) {
+ assertEquals(DOMException.NAMESPACE_ERR, de.code);
+ }
+ }
public void moveToNode() {
m_node = m_doc.getFirstChild().getFirstChild().getChildNodes().item(1);//zed node;
- assertFalse(m_node == null);
+ assertNotNull(m_node);
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
}
-
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,27 +17,12 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- *
- */
+import org.junit.Before;
public class NamedNodeMapSyncTest extends NamedNodeMapTest {
- public NamedNodeMapSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(NamedNodeMapSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
}
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/NamedNodeMapTest.java Fri Jan 18 23:08:44 2019
@@ -19,19 +19,15 @@ package dom.checkin;
import dom.common.Loader;
import dom.common.NodeTest;
import dom.common.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.*;
import org.apache.xmlbeans.XmlObject;
-/**
- *
- *
- */
+import static org.junit.Assert.*;
-public class NamedNodeMapTest extends TestCase implements TestSetup {
+public class NamedNodeMapTest implements TestSetup {
Document m_doc;
Document m_docNS;
Node m_node;
@@ -42,19 +38,13 @@ public class NamedNodeMapTest extends Te
int nCount = 5;
- public NamedNodeMapTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(NamedNodeMapTest.class);
- }
-
+ @Test
public void testLength() {
//assertEquals(m_nodeMap.length,nCount);
assertEquals(m_nodeMap.getLength(), nCount);
}
+ @Test
public void testGetNamedItem() {
result = m_nodeMap.getNamedItem("at0");
assertEquals("val0", result.getNodeValue());
@@ -63,13 +53,14 @@ public class NamedNodeMapTest extends Te
assertEquals("val4", result.getNodeValue());
}
+ @Test
public void testGetNamedItemDNE() {
result = m_nodeMap.getNamedItem("attt4");
assertEquals(null, result);
}
+ @Test
public void testGetNamedItemNS() {
-
m_nodeMap = m_docNS.getFirstChild().getAttributes();
result = m_nodeMap.getNamedItemNS("uri:foo", "at0");
@@ -85,12 +76,10 @@ public class NamedNodeMapTest extends Te
result = m_nodeMap.getNamedItemNS(null, "at3");
assertEquals("val3", result.getNodeValue());
-
-
}
+ @Test
public void testGetNamedItemNS_DNE() {
-
m_nodeMap = m_docNS.getFirstChild().getAttributes();
result = m_nodeMap.getNamedItemNS("uri:fol", "at0");
@@ -108,6 +97,7 @@ public class NamedNodeMapTest extends Te
*/
}
+ @Test
public void testItem() {
result = m_nodeMap.item(0);
assertEquals("val0", result.getNodeValue());
@@ -115,14 +105,16 @@ public class NamedNodeMapTest extends Te
assertEquals("val3", result.getNodeValue());
}
+ @Test
public void testItemNeg() {
- assertFalse(null == m_nodeMap);
- assertEquals(null, m_nodeMap.item(-1));
+ assertNotNull(m_nodeMap);
+ assertNull(m_nodeMap.item(-1));
}
+ @Test
public void testItemLarge() {
- assertFalse(null == m_nodeMap);
- assertEquals(null, m_nodeMap.item(m_nodeMap.getLength() + 1));
+ assertNotNull(m_nodeMap);
+ assertNull(m_nodeMap.item(m_nodeMap.getLength() + 1));
}
/**
@@ -130,6 +122,7 @@ public class NamedNodeMapTest extends Te
* read-only map
* attr w/ default val
*/
+ @Test
public void testRemoveNamedItemNull() {
try {
m_nodeMap.removeNamedItem(null);
@@ -140,6 +133,7 @@ public class NamedNodeMapTest extends Te
}
}
+ @Test
public void testRemoveNamedItem() {
try {
m_nodeMap.removeNamedItem("at7");
@@ -151,17 +145,13 @@ public class NamedNodeMapTest extends Te
result = m_nodeMap.removeNamedItem("at3");
assertEquals("val3", result.getNodeValue());
- assertEquals(m_nodeMap.getNamedItem("at3"), null);
+ assertNull(m_nodeMap.getNamedItem("at3"));
//liveness test
assertEquals(m_node.getAttributes().getLength(), nCount - 1);
- assertEquals(m_node.getAttributes().getNamedItem("at3"), null);
-
+ assertNull(m_node.getAttributes().getNamedItem("at3"));
}
- /**
- *
- */
-
+ @Test
public void testRemoveNamedItemNS() {
m_node = m_docNS.getDocumentElement();
m_nodeMap = m_node.getAttributes();
@@ -175,22 +165,22 @@ public class NamedNodeMapTest extends Te
result = m_nodeMap.getNamedItemNS("uri:foo", "at4");
assertEquals(result, m_nodeMap.removeNamedItemNS("uri:foo", "at4"));
- assertEquals(null, m_nodeMap.getNamedItemNS("uri:foo", "at4"));
+ assertNull(m_nodeMap.getNamedItemNS("uri:foo", "at4"));
assertEquals(nCount - 1, m_node.getAttributes().getLength());
result = m_nodeMap.removeNamedItemNS(null, "at3");
assertEquals("val3", result.getNodeValue());
- assertEquals(null, m_nodeMap.getNamedItem("at3"));
+ assertNull(m_nodeMap.getNamedItem("at3"));
assertEquals(m_node.getAttributes().getLength(), nCount - 2);
//liveness test
assertEquals(nCount - 2,
m_docNS.getFirstChild().getAttributes().getLength());
- assertEquals(null,
- m_docNS.getFirstChild().getAttributes().getNamedItem("at3"));
+ assertNull(m_docNS.getFirstChild().getAttributes().getNamedItem("at3"));
}
+ @Test
public void testRemoveNamedItemNS_DNE() {
m_nodeMap = m_docNS.getFirstChild().getAttributes();
int nLen = m_node.getAttributes().getLength();
@@ -219,6 +209,7 @@ public class NamedNodeMapTest extends Te
* node in diff elt
* node not an attr
*/
+ @Test
public void testSetNamedItem() {
Node newAt = m_doc.createAttribute("newAt");
((Attr) newAt).setValue("newval");
@@ -260,15 +251,12 @@ public class NamedNodeMapTest extends Te
}
+ @Test(expected = IllegalArgumentException.class)
public void testSetNamedItemNull() {
- try {
- m_nodeMap.setNamedItem(null);
- fail("Setting to null");
- }
- catch (java.lang.IllegalArgumentException e) {
- }
+ m_nodeMap.setNamedItem(null);
}
+ @Test
public void testSetNamedItemDiffImpl() throws Exception {
Node toSet = NodeTest.getApacheNode(sXml, false, 'A');
try {
@@ -280,22 +268,23 @@ public class NamedNodeMapTest extends Te
}
}
+ @Test
public void testSetNamedItemNS() {
- Node newAt = m_doc.createAttributeNS("uri:foo", "newAt");
- ((Attr) newAt).setValue("newval");
+ Attr newAt = m_doc.createAttributeNS("uri:foo", "newAt");
+ newAt.setValue("newval");
m_nodeMap.setNamedItemNS(newAt);
assertEquals(nCount + 1, m_nodeMap.getLength());
result = m_nodeMap.getNamedItemNS("uri:foo", "newAt");
assertEquals("newval", result.getNodeValue());
//OK, reset value
- ((Attr) newAt).setValue("newval_overwrite");
+ newAt.setValue("newval_overwrite");
m_nodeMap.setNamedItemNS(newAt);
assertEquals(nCount + 1, m_nodeMap.getLength());
result = m_nodeMap.getNamedItemNS("uri:foo", "newAt");
assertEquals("newval_overwrite", result.getNodeValue());
newAt = m_doc.createAttributeNS("uri:foo1", "newAt");
- ((Attr) newAt).setValue("newval1");
+ newAt.setValue("newval1");
//insert a new item
m_nodeMap.setNamedItemNS(newAt);
assertEquals(nCount + 2, m_nodeMap.getLength());
@@ -304,15 +293,12 @@ public class NamedNodeMapTest extends Te
//the path cases are the same as in SetNamedItem
}
+ @Test(expected = IllegalArgumentException.class)
public void testSetNamedItemNSNull() {
- try {
- m_nodeMap.setNamedItemNS(null);
- fail("Setting to null");
- }
- catch (java.lang.IllegalArgumentException e) {
- }
+ m_nodeMap.setNamedItemNS(null);
}
+ @Test
public void testSetNamedItemNSDiffImpl() throws Exception {
Node toSet = NodeTest.getApacheNode(sXml, true, 'A');
try {
@@ -325,6 +311,7 @@ public class NamedNodeMapTest extends Te
}
//try to set a node of a diff type than the current collection
+ @Test
public void testSetNamedItemDiffType() throws Exception {
Node toSet = m_doc.createElement("foobar");
try {
@@ -336,6 +323,7 @@ public class NamedNodeMapTest extends Te
}
}
+ @Test
public void testSetNamedItemNSDiffType() throws Exception {
Node toSet = m_doc.createElementNS("foo:org", "com:foobar");
try {
@@ -365,12 +353,11 @@ public class NamedNodeMapTest extends Te
}
+ @Before
public void setUp() throws Exception {
-
m_doc = (org.w3c.dom.Document) XmlObject.Factory.parse( sXml ).getDomNode();
m_docNS = (org.w3c.dom.Document) XmlObject.Factory.parse( sXmlNS ).getDomNode();
moveToNode();
-
}
private Loader _loader;
Modified: xmlbeans/trunk/test/src/dom/checkin/NodeListSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/NodeListSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/NodeListSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/NodeListSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,27 +17,12 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- *
- */
+import org.junit.Before;
public class NodeListSyncTest extends NodeListTest {
- public NodeListSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(NodeListSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
}
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/NodeListTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/NodeListTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/NodeListTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/NodeListTest.java Fri Jan 18 23:08:44 2019
@@ -19,20 +19,16 @@ package dom.checkin;
import dom.common.Loader;
import dom.common.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-/**
- *
- *
- */
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
-
-public class NodeListTest extends TestCase implements TestSetup {
+public class NodeListTest implements TestSetup {
Document m_doc;
Document m_docNS;
@@ -41,37 +37,35 @@ public class NodeListTest extends TestCa
String sXml = "<foo><ch0>val0</ch0><ch1>val1</ch1><ch2>val2</ch2><ch3>val3</ch3><ch4>val4</ch4></foo>";
int nCount = 5;
- public NodeListTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(NodeListTest.class);
- }
-
+ @Test
public void testLength() {
assertEquals(m_nodeList.getLength(), nCount);
}
+ @Test
public void testItem() {
for (int i = 0; i < m_nodeList.getLength(); i++)
assertEquals("ch" + i, m_nodeList.item(i).getNodeName());
}
+ @Test
public void testItemNeg() {
- assertEquals(null, m_nodeList.item(-1));
+ assertNull(m_nodeList.item(-1));
}
+ @Test
public void testItemLarge() {
- assertEquals(null, m_nodeList.item(nCount + 1));
+ assertNull(m_nodeList.item(nCount + 1));
}
+ @Test
public void voidTestLive() {
m_node.removeChild(m_nodeList.item(1));//"ch1"
assertEquals(m_nodeList.getLength(), nCount - 1);
assertEquals("ch2", m_nodeList.item(1).getNodeName());
}
+ @Test
public void moveToNode() {
m_node = m_doc.getFirstChild();
m_nodeList = m_node.getChildNodes();
@@ -79,15 +73,15 @@ public class NodeListTest extends TestCa
public void loadSync() throws Exception {
_loader = Loader.getLoader();
- m_doc = (org.w3c.dom.Document) _loader.loadSync(sXml);
+ m_doc = _loader.loadSync(sXml);
}
+ @Before
public void setUp() throws Exception {
_loader = Loader.getLoader();
m_doc = (org.w3c.dom.Document) _loader.load(sXml);
moveToNode();
-
}
private Loader _loader;
Modified: xmlbeans/trunk/test/src/dom/checkin/PISyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/PISyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/PISyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/PISyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,24 +17,11 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
-/**
- *
- *
- */
-
public class PISyncTest extends PITest {
- public PISyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(PISyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/PITest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/PITest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/PITest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/PITest.java Fri Jan 18 23:08:44 2019
@@ -17,58 +17,52 @@
package dom.checkin;
import dom.common.NodeTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class PITest extends NodeTest {
- public PITest(String s) {
- super(s);
- sXml =
- "<bar><?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\"?><foo>text</foo></bar>";
+ public PITest() {
+ sXml = "<bar><?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\"?><foo>text</foo></bar>";
//inspired by Common.XML_FOO_PROCINST;
}
- public static Test suite() {
- return new TestSuite(PITest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("xml-stylesheet", m_node.getNodeName());
}
+ @Test
public void testLocalName() {
assertEquals("xml-stylesheet", m_node.getNodeName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.PROCESSING_INSTRUCTION_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
assertEquals(
"type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\"",
m_node.getNodeValue());
}
-
+ @Test
public void testNextSibling() {
Node nxtSibling = m_node.getNextSibling();
assertEquals("foo", nxtSibling.getNodeName());
}
+ @Test
public void testSetNodeValue() {
String sNewVal = "type=\"text/xsl\" xmlns=\"http://xbean.foo.org\"";
m_node.setNodeValue(sNewVal);
@@ -76,63 +70,39 @@ public class PITest extends NodeTest {
}
-
-
- public void testNormalize() {
- //TODO
- }
-
- public void testReplaceChild() {
- }
-
- public void testRemoveChild() {
- }
-
- public void testAppendChild() {
- }
-
- public void testInsertBefore() {
- }
-
+ @Test
public void testPreviousSibling() {
Node prSibling = m_node.getPreviousSibling();
- assertEquals(null, prSibling);
+ assertNull(prSibling);
}
+ @Test
public void testParent() {
Node parent = m_node.getParentNode();
assertEquals(m_doc.getFirstChild(), parent);
assertEquals("bar", parent.getLocalName());
}
+ @Test
public void testGetData() {
assertEquals(
"type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\"",
((ProcessingInstruction) m_node).getData());
}
+ @Test
public void testGetTarget() {
assertEquals("xml-stylesheet",
((ProcessingInstruction) m_node).getTarget());
-
-
- }
-
- public void testSetData(String data) {
-
- ((ProcessingInstruction) m_node).setData(
- "\"type=\\\"text/xsl\\\" xmlns=\\\"http://newURI.org/shipping/\\\"\"");
- assertEquals("type=\"text/xsl\" xmlns=\"http://newURI.org/shipping/\"",
- ((ProcessingInstruction) m_node).getData());
}
public void moveToNode() {
m_node = m_doc.getDocumentElement().getFirstChild();//pi
- assertFalse(m_node == null);
-
+ assertNotNull(m_node);
}
//TODO: Test PI with funky but legal chatacters in the name, eg. :
+ @Test
public void testPiTargetChars() {
ProcessingInstruction node = m_doc.createProcessingInstruction(
"foo:123-_", "some body");
@@ -142,6 +112,7 @@ public class PITest extends NodeTest {
}
//TODO: Test Illegal PI Targets: xml target, starting with a digit
+ @Test
public void testPiTargetIllegalChars() {
ProcessingInstruction node;
try {
@@ -163,6 +134,7 @@ public class PITest extends NodeTest {
}
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/ParserTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/ParserTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/ParserTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/ParserTest.java Fri Jan 18 23:08:44 2019
@@ -16,23 +16,26 @@
package dom.checkin;
-import java.io.ByteArrayInputStream;
-import javax.xml.XMLConstants;
-import javax.xml.stream.XMLInputFactory;
-
-import junit.framework.*;
-
import org.apache.xmlbeans.XmlOptionsBean;
-import org.apache.xmlbeans.impl.common.*;
+import org.apache.xmlbeans.impl.common.SAXHelper;
+import org.apache.xmlbeans.impl.common.StaxHelper;
+import org.apache.xmlbeans.impl.common.XMLBeansConstants;
+import org.junit.Test;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+import javax.xml.stream.XMLInputFactory;
+import java.io.ByteArrayInputStream;
+
+import static org.junit.Assert.*;
+
/**
* Tests for XML Parser settings
*/
-public class ParserTest extends TestCase {
+public class ParserTest {
+ @Test
public void testXmlOptionsDefaults() {
XmlOptionsBean options = new XmlOptionsBean();
assertEquals(2048, options.getEntityExpansionLimit());
@@ -40,6 +43,7 @@ public class ParserTest extends TestCase
assertFalse(options.isLoadExternalDTD());
}
+ @Test
public void testXMLBeansConstantsOverrides() {
XmlOptionsBean options = new XmlOptionsBean();
options.setEntityExpansionLimit(1);
@@ -50,6 +54,7 @@ public class ParserTest extends TestCase
assertTrue(options.isLoadExternalDTD());
}
+ @Test
public void testXmlInputFactoryPropertyDefaults() {
XmlOptionsBean options = new XmlOptionsBean();
XMLInputFactory factory = StaxHelper.newXMLInputFactory(options);
@@ -59,6 +64,7 @@ public class ParserTest extends TestCase
assertEquals(false, factory.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES));
}
+ @Test
public void testXmlInputFactoryPropertyOverrides() {
XmlOptionsBean options = new XmlOptionsBean();
options.setEntityExpansionLimit(1);
@@ -69,6 +75,7 @@ public class ParserTest extends TestCase
assertEquals(true, factory.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES));
}
+ @Test
public void testXMLReader() throws Exception {
XmlOptionsBean options = new XmlOptionsBean();
XMLReader reader = SAXHelper.newXMLReader(options);
@@ -81,6 +88,7 @@ public class ParserTest extends TestCase
reader.parse(new InputSource(new ByteArrayInputStream("<xml></xml>".getBytes("UTF-8"))));
}
+ @Test
public void testXMLReaderOverrides() throws Exception {
XmlOptionsBean options = new XmlOptionsBean();
options.setEntityExpansionLimit(1);
Modified: xmlbeans/trunk/test/src/dom/checkin/TextSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/TextSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/TextSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/TextSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,24 +17,11 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
-/**
- *
- *
- */
-
public class TextSyncTest extends TextTest {
- public TextSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(TextSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/TextTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/TextTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/TextTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/TextTest.java Fri Jan 18 23:08:44 2019
@@ -18,63 +18,59 @@ package dom.checkin;
import dom.common.CharacterDataTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
import xmlcursor.common.Common;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
-/**
- *
- *
- */
public class TextTest extends CharacterDataTest {
- public TextTest(String s) {
- super(s);
+ public TextTest() {
sXml = Common.XML_FOO_BAR_TEXT_EXT;
}
- public static Test suite() {
- return new TestSuite(TextTest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("#text", m_node.getNodeName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.TEXT_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
assertEquals("extended", m_node.getNodeValue());
}
-
+ @Test
public void testNextSibling() {
Node nxtSibling = m_node.getNextSibling();
assertEquals(null, nxtSibling);
}
+ @Test
public void testPreviousSibling() {
Node prSibling = m_node.getPreviousSibling();
assertEquals("bar", prSibling.getLocalName());
assertEquals("text", ((Text) prSibling.getFirstChild()).getData());
}
+ @Test
public void testParent() {
Node parent = m_node.getParentNode();
assertEquals(m_doc.getFirstChild(), parent);
assertEquals("foo", parent.getLocalName());
}
-
+ @Test
public void testSplitTextNegative() {
try {
((Text) m_node).splitText(-1);
@@ -85,6 +81,7 @@ public class TextTest extends CharacterD
}
}
+ @Test
public void testSplitTextLarge() {
try {
((Text) m_node).splitText(((Text) m_node).getLength() + 1);
@@ -95,6 +92,7 @@ public class TextTest extends CharacterD
}
}
+ @Test
public void testSplitText() {
Node parent = m_node.getParentNode();
int nChildCount = parent.getChildNodes().getLength();
@@ -102,6 +100,7 @@ public class TextTest extends CharacterD
assertEquals(nChildCount + 1, parent.getChildNodes().getLength());
}
+ @Test
public void testSplitTextBorder() {
Node parent = m_node.getParentNode();
int nChildCount = parent.getChildNodes().getLength();
@@ -112,12 +111,14 @@ public class TextTest extends CharacterD
}
//code coverage case; not sure why it's important
+ @Test
public void testSplitTextNoParent() {
m_node = m_doc.createTextNode("foobar");
((Text) m_node).splitText(3);
assertEquals("foo", m_node.getNodeValue());
}
+ @Test
public void testSetNodeValue() {
m_node.setNodeValue("new text value");
assertEquals("new text value", m_node.getNodeValue());
@@ -127,11 +128,13 @@ public class TextTest extends CharacterD
m_node = m_doc.getFirstChild().getChildNodes().item(1);//"extended"
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
}
+ @Test
public void testDelete()throws Exception{
org.apache.xmlbeans.XmlObject o= org.apache.xmlbeans.XmlObject.Factory.parse("<foo/>");
Node d = o.newDomNode();
Modified: xmlbeans/trunk/test/src/dom/common/CharacterDataTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/common/CharacterDataTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/common/CharacterDataTest.java (original)
+++ xmlbeans/trunk/test/src/dom/common/CharacterDataTest.java Fri Jan 18 23:08:44 2019
@@ -16,57 +16,52 @@
package dom.common;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Ignore;
+import org.junit.Test;
import org.w3c.dom.CharacterData;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
+import static org.junit.Assert.*;
+@Ignore
public abstract class CharacterDataTest extends NodeTest {
- String NULL = "";
-
- public static Test suite() {
- return new TestSuite(CharacterDataTest.class);
- }
-
-
- public CharacterDataTest(String s) {
- super(s);
- }
-
+ @Test
public void testAppendChild() {
Node newChild = m_doc.createElement("foo");
try {
- ((CharacterData) m_node).appendChild(newChild);
+ m_node.appendChild(newChild);
} catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
}
}
//super method not relevant
+ @Test
public void testInsertBefore() {
Node newChild = m_doc.createElement("foo");
- assertEquals(false, m_node.hasChildNodes());
+ assertFalse(m_node.hasChildNodes());
Node nullNode = m_node.getFirstChild();
try {
- ((CharacterData) m_node).insertBefore(newChild, nullNode);
+ m_node.insertBefore(newChild, nullNode);
} catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
}
}
+ @Test
public void testRemoveChild() {
- assertEquals(false, m_node.hasChildNodes());
+ assertFalse(m_node.hasChildNodes());
}
+ @Test
public void testReplaceChild() {
Node newChild = m_doc.createElement("foo");
- assertEquals(false, m_node.hasChildNodes());
+ assertFalse(m_node.hasChildNodes());
if (m_node.getFirstChild() != null)
try {
- ((CharacterData) m_node).replaceChild(newChild, m_node.getFirstChild());
+ m_node.replaceChild(newChild, m_node.getFirstChild());
} catch (DOMException de) {
if (DOMException.HIERARCHY_REQUEST_ERR != de.code)
throw de;
@@ -74,7 +69,7 @@ public abstract class CharacterDataTest
}
-
+ @Test
public void testAppendData() {
String sOrig = ((CharacterData) m_node).getData();
String sNewData = "some new data";
@@ -84,41 +79,41 @@ public abstract class CharacterDataTest
fail(" Expected " + sExpected + " but got " + ((CharacterData) m_node).getData());
}
+ @Test
public void testAppendDataNull() {
String sOrig = ((CharacterData) m_node).getData();
- String sNewData = "";
- ((CharacterData) m_node).appendData(sNewData);
- assertEquals(sOrig + sNewData, ((CharacterData) m_node).getData());
-
- sNewData = null;
- ((CharacterData) m_node).appendData(sNewData);
+ ((CharacterData) m_node).appendData("");
assertEquals(sOrig, ((CharacterData) m_node).getData());
+ ((CharacterData) m_node).appendData(null);
+ assertEquals(sOrig, ((CharacterData) m_node).getData());
}
-
+ @Test
public void testDeleteDataNegOff() {
_testDeleteData(-1, 10);
}
+ @Test
public void testDeleteDataNegLen() {
_testDeleteData(1, -10);
}
+ @Test
public void testDeleteDataLargeOff() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testDeleteData(nDataLen + 1, 10);
-
}
+ @Test
public void testDeleteDataLargeLen() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testDeleteData(0, nDataLen + 30);
}
-
+ @Test
public void testDeleteDataAverage() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
@@ -142,14 +137,14 @@ public abstract class CharacterDataTest
else if (offset + count == nDataLen || (offset + count) > nDataLen)
assertEquals("", ((CharacterData) m_node).getData());
else if (offset == 0) {
- assertEquals(sData.substring(count, sData.length()), ((CharacterData) m_node).getData());
+ assertEquals(sData.substring(count), ((CharacterData) m_node).getData());
} else
assertEquals(sData.substring(0, offset) + sData.substring(offset + count, sData.length() - (offset + count)), ((CharacterData) m_node).getData());
}
}
-
+ @Test
public void testGetData() {
char[] buff = new char[200];
java.util.Arrays.fill(buff, 'a');
@@ -162,28 +157,30 @@ public abstract class CharacterDataTest
}
}
-
+ @Test
public void testGetLength() {
int nDataLen = ((CharacterData) m_node).getData().length();
assertEquals(((CharacterData) m_node).getLength(), nDataLen);
}
-
+ @Test
public void testInsertNull() {
-
_testInsertData(0, null);
}
+ @Test
public void testInsertNeg() {
_testInsertData(-1, "foo");
}
+ @Test
public void testInsertOOB() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testInsertData(nDataLen + 2, "foo");
}
+ @Test
public void testInsertAverage() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
@@ -203,7 +200,7 @@ public abstract class CharacterDataTest
else {
((CharacterData) m_node).insertData(offset, toInsert);
if (toInsert == null)
- assertTrue(sData.equals(((CharacterData) m_node).getData()));
+ assertEquals(sData, ((CharacterData) m_node).getData());
else if (offset == nDataLen)
assertEquals(sData + toInsert, ((CharacterData) m_node).getData());
else {
@@ -218,44 +215,50 @@ public abstract class CharacterDataTest
}
}
-
+ @Test
public void testReplaceDataNull() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
- String repl = null;
- _testReplaceData(0, nDataLen, repl);
+ _testReplaceData(0, nDataLen, null);
}
+ @Test
public void testReplaceDataNegOff() {
_testReplaceData(-1, 3, "foo");
}
+ @Test
public void testReplaceDataNegCount() {
_testReplaceData(1, -3, "foo");
}
- public void testReplaceDataZeroCount() {
+ @Test
+ public void testReplaceDataZeroCount() {
_testReplaceData(1, 0, "foo");
}
+ @Test
public void testReplaceDataLargeOff() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testReplaceData(nDataLen + 1, 2, "foo");
}
+ @Test
public void testReplaceDataLargeCount() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testReplaceData(0, nDataLen + 2, "foo");
}
+ @Test
public void testReplaceDataLarge() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testReplaceData(nDataLen / 2, nDataLen / 2 + 1, "foo");
}
+ @Test
public void testReplaceDataAverage() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
@@ -292,44 +295,37 @@ public abstract class CharacterDataTest
}
+ @Test
public void testSetDataNull() {
- String sNull = null;
- ((CharacterData) m_node).setData(sNull);
+ ((CharacterData) m_node).setData(null);
assertEquals("", ((CharacterData) m_node).getData());
}
- public void testSetData(String newData) {
- ((CharacterData) m_node).setData(newData);
- assertEquals(newData, ((CharacterData) m_node).getData());
- }
-
- //nothing happens here
- public void testNormalize() {
- }
-
-
+ @Test
public void testSubstringDataNegOff() {
_testSubstringData(-1, 10);
}
+ @Test
public void testSubstringDataNegLen() {
_testSubstringData(1, -10);
}
+ @Test
public void testSubstringDataLargeOff() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testSubstringData(nDataLen + 1, 10);
-
}
+ @Test
public void testSubstringDataLargeLen() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
_testSubstringData(0, nDataLen + 30);
}
-
+ @Test
public void testSubstringDataAverage() {
String sData = ((CharacterData) m_node).getData();
int nDataLen = sData.length();
@@ -358,23 +354,14 @@ public abstract class CharacterDataTest
}
}
- public void testSetNodeValue() {
- fail("Override");
- }
-
-
- public void testSetPrefix()
- {
- try
- {
+ @Test
+ public void testSetPrefix() {
+ try {
m_node.setPrefix("foobar");
fail("Can't set prefix on node other than Element or Attribute");
- }
- catch (DOMException de)
- {
+ } catch (DOMException de) {
assertEquals(DOMException.NAMESPACE_ERR, de.code);
}
-
}
}
Modified: xmlbeans/trunk/test/src/dom/common/NodeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/common/NodeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/common/NodeTest.java (original)
+++ xmlbeans/trunk/test/src/dom/common/NodeTest.java Fri Jan 18 23:08:44 2019
@@ -15,7 +15,9 @@
package dom.common;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -24,9 +26,10 @@ import org.xml.sax.InputSource;
import java.io.StringReader;
+import static org.junit.Assert.*;
-public abstract class NodeTest extends TestCase implements
- TestSetup {
+@Ignore
+public abstract class NodeTest implements TestSetup {
protected Node m_node;
protected Document m_doc;
@@ -36,70 +39,57 @@ public abstract class NodeTest extends T
protected String sXmlNS;
//attributes
- public NodeTest(String s) {
- super(s);
- }
-
- public final void testInherited() {
- };
- public abstract void testNodeName();
-
- public abstract void testNodeType();
-
- public abstract void testNodeValue();
-
- public abstract void testParent();
-
- public abstract void testPreviousSibling();
-
- public abstract void testNextSibling();
-
+ @Test
public void testOwnerDocument() {
assertEquals(m_doc, m_node.getOwnerDocument());
}
+ @Test
public void testPrefix() {
- assertFalse(m_node == null);
- assertEquals(null,m_node.getPrefix());
+ assertNotNull(m_node);
+ assertNull(m_node.getPrefix());
// assertEquals("", m_node.getPrefix());
}
+ @Test
public void testNamespaceUri() {
- assertFalse(m_node == null);
- assertEquals(null,m_node.getNamespaceURI());
+ assertNotNull(m_node);
+ assertNull(m_node.getNamespaceURI());
//assertEquals("", m_node.getNamespaceURI());
}
+ @Test
public void testLocalName() {
- assertFalse(m_node == null);
- assertEquals(null,m_node.getLocalName());
+ assertNotNull(m_node);
+ assertNull(m_node.getLocalName());
// assertEquals("", m_node.getLocalName());
}
//0 length list as of API
+ @Test
public void testGetChildNodes() {
assertEquals(0, m_node.getChildNodes().getLength());
}
+ @Test
public void testFirstChild() {
- assertEquals(null, m_node.getFirstChild());
+ assertNull(m_node.getFirstChild());
}
+ @Test
public void testLastChild() {
- assertEquals(null, m_node.getLastChild());
+ assertNull(m_node.getLastChild());
}
- public abstract void testAppendChild();
-
/**
* pathologic cases: newChild is m_node or an ancestor
* newChild is from a different document
* newChild is not allowed at this pos
*/
- public void testAppendChild(Node newChild) {
+ protected void testAppendChild(Node newChild) {
Node inserted = m_node.appendChild(newChild);
if (newChild.getNodeType() == Node.DOCUMENT_FRAGMENT_NODE)
- assertEquals(true, compareNodeListPrefix(newChild.getChildNodes(), m_node.getChildNodes()));
+ assertTrue(compareNodeListPrefix(newChild.getChildNodes(), m_node.getChildNodes()));
else
assertEquals(inserted, m_node.getLastChild());
if (isInTree(m_node, newChild)) //new child is in the tree
@@ -113,28 +103,24 @@ public abstract class NodeTest extends T
* override for Attribute
* $TODO: ER results in a mutable copy
*/
+ @Test
public void testCloneNode() {
Node m_clone;
- /**not implemented : Eric */
- m_clone=m_node.cloneNode(false);
- assertEquals(true, DomUtils.compareNodesShallow(m_node, m_clone));
+ m_clone=m_node.cloneNode(false);
+ assertTrue(DomUtils.compareNodesShallow(m_node, m_clone));
// assertEquals(true, DomUtils.compareNodeTreePtr(m_clone.getChildNodes(),m_node.getChildNodes())); //ptr eq for ch.
- assertEquals(false,m_clone==m_node);
+ assertNotSame(m_clone, m_node);
m_clone = m_node.cloneNode(true);
- assertEquals(true, DomUtils.compareNodesDeep(m_node, m_clone)); //deep clone: should do for whole tree, not just ch.
- assertEquals(false, m_clone == m_node);
+ assertTrue(DomUtils.compareNodesDeep(m_node, m_clone)); //deep clone: should do for whole tree, not just ch.
+ assertNotSame(m_clone, m_node);
- assertEquals(null, m_clone.getParentNode());
+ assertNull(m_clone.getParentNode());
}
- public abstract void testInsertBefore();
-
-
-
- public void testInsertBefore(Node newChild, Node refChild) {
+ protected void testInsertBefore(Node newChild, Node refChild) {
int newChPos = getChildPos(m_node, newChild);
int pos = getChildPos(m_node, refChild);
@@ -161,10 +147,10 @@ public abstract class NodeTest extends T
else if (pos == -1)//would have thrown exc
fail("Inserting after fake child");
else if (newChild.getNodeType() == Node.DOCUMENT_FRAGMENT_NODE)
- assertEquals(true, compareNodeListPrefix(newChild.getChildNodes(), m_node.getChildNodes()));
+ assertTrue(compareNodeListPrefix(newChild.getChildNodes(), m_node.getChildNodes()));
else if (newChPos != -1) //new child is in the tree
//assert the child is removed first
- assertEquals(false, inserted.getParentNode().equals(prevParent));
+ assertNotEquals(inserted.getParentNode(), prevParent);
else {
assertEquals(newChild, childNodes.item(pos));
assertEquals(nOrigChildNum + 1, m_node.getChildNodes().getLength());
@@ -175,26 +161,27 @@ public abstract class NodeTest extends T
/**
* $NOTE: override for element
*/
+ @Test
public void testGetAttributes() {
- assertEquals(null, m_node.getAttributes());
+ assertNull(m_node.getAttributes());
}
-
+ @Test
public void testHasChildNodes() {
int i = m_node.getChildNodes().getLength();
if (i > 0)
- assertEquals(true, m_node.hasChildNodes());
+ assertTrue(m_node.hasChildNodes());
else
- assertEquals(false, m_node.hasChildNodes());
+ assertFalse(m_node.hasChildNodes());
}
-
//Override for Element
+ @Test
public void testHasAttributes() {
- assertEquals(false, m_node.hasAttributes());
+ assertFalse(m_node.hasAttributes());
}
-
+ @Test
public void testIsSupported() {
String[] features=new String[]{
"Core","XML","Events","MutationEvents","Range","Traversal","HTML","Views","StyleSheets","CSS","CSS2","UIEvents","HTMLEvents"
@@ -208,19 +195,7 @@ public abstract class NodeTest extends T
}
- public void testNormalize() {
- fail("Test Not implemented");
- }
-
-
- /**
- * pathological cases:
- * node is read-only
- * node is not a child of this node
- */
- public abstract void testRemoveChild();
-
- public void testRemoveChild(Node removed) {
+ void testRemoveChild(Node removed) {
int pos = getChildPos(m_node, removed);
int len = m_node.getChildNodes().getLength();
if (removed == null)
@@ -244,15 +219,12 @@ public abstract class NodeTest extends T
}
-
- public abstract void testReplaceChild();
-
/**
* pathological cases:
* node is DocFrag
* node is already in tree
*/
- public void testReplaceChild(Node newChild, Node oldChild) {
+ protected void testReplaceChild(final Node newChild, Node oldChild) {
int pos = getChildPos(m_node, oldChild);
boolean existing = isInTree(m_doc.getDocumentElement(), newChild); //new Child has a parent
@@ -277,10 +249,7 @@ public abstract class NodeTest extends T
Node oldParent = newChild.getParentNode();
NodeList old = m_node.getChildNodes();
assertEquals(oldChild, m_node.replaceChild(newChild, oldChild));
- assertFalse(newChild.getParentNode().equals(oldParent));
- } else if (newChild == null) { //is this equivalent to deletion?
- m_node.replaceChild(newChild, oldChild);
- assertEquals(len - 1, m_node.getChildNodes().getLength());
+ assertNotEquals(newChild.getParentNode(), oldParent);
} else if (newChild.getNodeType() == Node.DOCUMENT_FRAGMENT_NODE) {
int new_len = newChild.getChildNodes().getLength();
assertEquals(oldChild, m_node.replaceChild(newChild, oldChild));
@@ -291,9 +260,8 @@ public abstract class NodeTest extends T
}
- public abstract void testSetNodeValue();
-
//$NOTE:override for element and attribute
+ @Test
public void testSetPrefix()
{
//any prefix here is invalid
@@ -310,7 +278,7 @@ public abstract class NodeTest extends T
}
}
- public static int getChildPos(Node node, Node child) {
+ private static int getChildPos(Node node, Node child) {
if (child == null) return -1;
NodeList ch = node.getChildNodes();
for (int i = 0; i < ch.getLength(); i++)
@@ -319,7 +287,7 @@ public abstract class NodeTest extends T
return -1;
}
- public static boolean isInTree(Node root, Node find) {
+ private static boolean isInTree(Node root, Node find) {
if (find == null) return false;
if (root == null) return false;
if (root == find) return true;
@@ -330,7 +298,7 @@ public abstract class NodeTest extends T
return temp_res;
}
- public static boolean compareNodeList(NodeList l1, NodeList l2) {
+ protected static boolean compareNodeList(NodeList l1, NodeList l2) {
if (l1.getLength() != l2.getLength()) return false;
for (int i = 0; i < l1.getLength(); i++)
if (l1.item(i) != l2.item(i)) //pointer eq
@@ -339,7 +307,7 @@ public abstract class NodeTest extends T
}
//l1 is a prefix of l2
- public static boolean compareNodeListPrefix(NodeList l1, NodeList l2) {
+ private static boolean compareNodeListPrefix(NodeList l1, NodeList l2) {
if (l1.getLength() > l2.getLength()) return false;
for (int i = 0; i < l1.getLength(); i++)
if (l1.item(i) != l2.item(i)) //pointer eq
@@ -347,7 +315,7 @@ public abstract class NodeTest extends T
return true;
}
- public void loadSync() throws Exception {
+ public void loadSync() {
_loader = Loader.getLoader();
if (sXml == null && sXmlNS == null) throw new IllegalArgumentException("Test bug : Initialize xml strings");
@@ -362,7 +330,7 @@ public abstract class NodeTest extends T
throws Exception{
org.apache.xerces.parsers.DOMParser parser = new org.apache.xerces.parsers.DOMParser();
parser.parse(new InputSource(new StringReader(sXml)));
- Document doc = parser.getDocument();
+ Document doc = parser.getDocument();
String name="apache_node";
String nsname="pre:apache_node";
@@ -384,21 +352,22 @@ public abstract class NodeTest extends T
}
-
- public abstract void moveToNode();
-
//exposing a node for other tests...saver in particular
public Node getNode(){
return m_node;
}
+
+ @Before
public void setUp() throws Exception {
//m_doc=(org.w3c.dom.Document)org.apache.xmlbeans.XmlObject.Factory.parse(xml).newDomNode();
_loader = Loader.getLoader();
- if (sXml == null && sXmlNS == null) throw new IllegalArgumentException("Test bug : Initialize xml strings");
- m_doc = (org.w3c.dom.Document) _loader.load(sXml);
+ if (sXml == null && sXmlNS == null) {
+ throw new IllegalArgumentException("Test bug : Initialize xml strings");
+ }
+ m_doc = _loader.load(sXml);
if (sXmlNS != null && sXmlNS.length() > 0)
- m_docNS = (org.w3c.dom.Document) _loader.load(sXmlNS);
+ m_docNS = _loader.load(sXmlNS);
}
private Loader _loader;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org