You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2026/04/28 14:49:21 UTC
(xerces-j) branch main updated: Simplify AbstractTestCase (#93)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xerces-j.git
The following commit(s) were added to refs/heads/main by this push:
new 30f3a4cf8 Simplify AbstractTestCase (#93)
30f3a4cf8 is described below
commit 30f3a4cf80d53b61082a68ce13c662bf3d7ff93c
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Tue Apr 28 09:49:16 2026 -0500
Simplify AbstractTestCase (#93)
* Simplify AbstractTestCase
* exceptions
* fix
* fix
* simpler
* wip
* field
* remove null check
---
build.xml | 2 +-
tests/dom/traversal/AbstractTestCase.java | 41 +++++-----------------
tests/dom/traversal/BasicTest.java | 56 ++++++++++++++-----------------
tests/dom/traversal/ComplexTest.java | 22 ++++++------
4 files changed, 47 insertions(+), 74 deletions(-)
diff --git a/build.xml b/build.xml
index ee84385fe..cc779b5bf 100644
--- a/build.xml
+++ b/build.xml
@@ -813,7 +813,7 @@ Authors:
<junit fork="yes" forkmode="once"
haltonfailure="no"
- haltonerror="no"
+ haltonerror="yes"
failureproperty="test.failed"
errorproperty="test.failed"
showoutput="yes">
diff --git a/tests/dom/traversal/AbstractTestCase.java b/tests/dom/traversal/AbstractTestCase.java
index ebc8bc67a..e2a42b0fb 100644
--- a/tests/dom/traversal/AbstractTestCase.java
+++ b/tests/dom/traversal/AbstractTestCase.java
@@ -24,7 +24,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.ElementTraversal;
@@ -41,43 +40,19 @@ public abstract class AbstractTestCase extends TestCase {
private DocumentBuilder fDocumentBuilder;
- protected final void setUp() {
- try {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setExpandEntityReferences(false);
- fDocumentBuilder = dbf.newDocumentBuilder();
- }
- catch (ParserConfigurationException pce) {
- pce.printStackTrace();
- fail(pce.getMessage());
- }
+ protected void setUp() throws Exception {
+ super.setUp();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ fDocumentBuilder = dbf.newDocumentBuilder();
}
- protected final void tearDown() {
- fDocumentBuilder = null;
- }
-
- protected final ElementTraversal parse(String input) {
- try {
- Document doc = fDocumentBuilder.parse(new InputSource(new StringReader(input)));
- DOMImplementation domImpl = doc.getImplementation();
- assertTrue(domImpl.hasFeature("ElementTraversal", "1.0"));
- return toElementTraversal(doc.getDocumentElement());
- }
- catch (SAXException se) {
- se.printStackTrace();
- fail(se.getMessage());
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- fail(ioe.getMessage());
- }
- return null;
+ protected final ElementTraversal parse(String input) throws IOException, SAXException {
+ Document doc = fDocumentBuilder.parse(new InputSource(new StringReader(input)));
+ return toElementTraversal(doc.getDocumentElement());
}
protected final ElementTraversal toElementTraversal(Element e) {
- assertTrue("e instanceof ElementTraversal", e == null || e instanceof ElementTraversal);
return (ElementTraversal) e;
}
}
diff --git a/tests/dom/traversal/BasicTest.java b/tests/dom/traversal/BasicTest.java
index 9b81a5541..106b2b5db 100644
--- a/tests/dom/traversal/BasicTest.java
+++ b/tests/dom/traversal/BasicTest.java
@@ -26,43 +26,44 @@ import org.w3c.dom.ElementTraversal;
*/
public class BasicTest extends AbstractTestCase {
- private static final String DOC1 = "<root>1<a/>2<b/>3<c/>4<d/><!-- foo -->5<e/>6<?target data?></root>";
- private static final String DOC2 = "<root>1<a>2<b/>7<e/>9</a>3<c>5<d/>0<!-- bar -->8<f/>6</c>4</root>";
+ private ElementTraversal doc1;
+ private ElementTraversal doc2;
+
+ public void setUp() throws Exception {
+ super.setUp();
+ doc1 = parse("<root>1<a/>2<b/>3<c/>4<d/><!-- foo -->5<e/>6<?target data?></root>");
+ doc2 = parse("<root>1<a>2<b/>7<e/>9</a>3<c>5<d/>0<!-- bar -->8<f/>6</c>4</root>");
+ }
public void testGetFirstChild1() {
- ElementTraversal et = parse(DOC1);
- Element e = et.getFirstElementChild();
+ Element e = doc1.getFirstElementChild();
assertEquals("a", e.getNodeName());
}
public void testGetFirstChild2() {
- ElementTraversal et = parse(DOC2);
- Element e = et.getFirstElementChild();
+ Element e = doc2.getFirstElementChild();
assertEquals("a", e.getNodeName());
- et = toElementTraversal(e);
+ ElementTraversal et = toElementTraversal(e);
e = et.getFirstElementChild();
assertEquals("b", e.getNodeName());
}
public void testGetLastChild1() {
- ElementTraversal et = parse(DOC1);
- Element e = et.getLastElementChild();
+ Element e = doc1.getLastElementChild();
assertEquals("e", e.getNodeName());
}
public void testGetLastChild2() {
- ElementTraversal et = parse(DOC2);
- Element e = et.getLastElementChild();
+ Element e = doc2.getLastElementChild();
assertEquals("c", e.getNodeName());
- et = toElementTraversal(e);
+ ElementTraversal et = toElementTraversal(e);
e = et.getLastElementChild();
assertEquals("f", e.getNodeName());
}
public void testGetNextElementSibling1() {
- ElementTraversal et = parse(DOC1);
- Element e = et.getFirstElementChild();
- et = toElementTraversal(e);
+ Element e = doc1.getFirstElementChild();
+ ElementTraversal et = toElementTraversal(e);
e = et.getNextElementSibling();
assertEquals("b", e.getNodeName());
et = toElementTraversal(e);
@@ -74,9 +75,8 @@ public class BasicTest extends AbstractTestCase {
}
public void testGetNextElementSibling2() {
- ElementTraversal et = parse(DOC2);
- Element e = et.getFirstElementChild();
- et = toElementTraversal(e);
+ Element e = doc2.getFirstElementChild();
+ ElementTraversal et = toElementTraversal(e);
e = et.getNextElementSibling();
assertEquals("c", e.getNodeName());
et = toElementTraversal(e);
@@ -88,9 +88,8 @@ public class BasicTest extends AbstractTestCase {
}
public void testGetPreviousElementSibling1() {
- ElementTraversal et = parse(DOC1);
- Element e = et.getLastElementChild();
- et = toElementTraversal(e);
+ Element e = doc1.getLastElementChild();
+ ElementTraversal et = toElementTraversal(e);
e = et.getPreviousElementSibling();
assertEquals("d", e.getNodeName());
et = toElementTraversal(e);
@@ -102,9 +101,8 @@ public class BasicTest extends AbstractTestCase {
}
public void testGetPreviousElementSibling2() {
- ElementTraversal et = parse(DOC2);
- Element e = et.getLastElementChild();
- et = toElementTraversal(e);
+ Element e = doc2.getLastElementChild();
+ ElementTraversal et = toElementTraversal(e);
e = et.getPreviousElementSibling();
assertEquals("a", e.getNodeName());
et = toElementTraversal(e);
@@ -116,16 +114,14 @@ public class BasicTest extends AbstractTestCase {
}
public void testChildElementCount1() {
- ElementTraversal et = parse(DOC1);
- assertEquals(5, et.getChildElementCount());
+ assertEquals(5, doc1.getChildElementCount());
}
public void testChildElementCount2() {
- ElementTraversal et = parse(DOC2);
- assertEquals(2, et.getChildElementCount());
- ElementTraversal et2 = toElementTraversal(et.getFirstElementChild());
+ assertEquals(2, doc2.getChildElementCount());
+ ElementTraversal et2 = toElementTraversal(doc2.getFirstElementChild());
assertEquals(2, et2.getChildElementCount());
- et2 = toElementTraversal(et.getLastElementChild());
+ et2 = toElementTraversal(doc2.getLastElementChild());
assertEquals(2, et2.getChildElementCount());
}
}
diff --git a/tests/dom/traversal/ComplexTest.java b/tests/dom/traversal/ComplexTest.java
index 8fc40ade8..0183375ac 100644
--- a/tests/dom/traversal/ComplexTest.java
+++ b/tests/dom/traversal/ComplexTest.java
@@ -17,6 +17,8 @@
package dom.traversal;
+import java.io.IOException;
+import org.xml.sax.SAXException;
import org.w3c.dom.Element;
import org.w3c.dom.ElementTraversal;
@@ -40,7 +42,7 @@ public class ComplexTest extends AbstractTestCase {
"<!ENTITY c '&b;'>" +
"]><root>&c;</root>";
- public void testGetFirstChild1() {
+ public void testGetFirstChild1() throws IOException, SAXException {
ElementTraversal et = parse(DOC1);
Element e = et.getFirstElementChild();
assertEquals("r", e.getNodeName());
@@ -49,7 +51,7 @@ public class ComplexTest extends AbstractTestCase {
assertNull(e);
}
- public void testGetFirstChild2() {
+ public void testGetFirstChild2() throws IOException, SAXException {
ElementTraversal et = parse(DOC2);
Element e = et.getFirstElementChild();
assertEquals("child", e.getNodeName());
@@ -58,7 +60,7 @@ public class ComplexTest extends AbstractTestCase {
assertNull(e);
}
- public void testGetLastChild1() {
+ public void testGetLastChild1() throws IOException, SAXException {
ElementTraversal et = parse(DOC1);
Element e = et.getLastElementChild();
assertEquals("s", e.getNodeName());
@@ -67,7 +69,7 @@ public class ComplexTest extends AbstractTestCase {
assertNull(e);
}
- public void testGetLastChild2() {
+ public void testGetLastChild2() throws IOException, SAXException {
ElementTraversal et = parse(DOC2);
Element e = et.getLastElementChild();
assertEquals("child", e.getNodeName());
@@ -76,7 +78,7 @@ public class ComplexTest extends AbstractTestCase {
assertNull(e);
}
- public void testGetNextElementSibling1() {
+ public void testGetNextElementSibling1() throws IOException, SAXException {
ElementTraversal et = parse(DOC1);
Element e = et.getFirstElementChild();
et = toElementTraversal(e);
@@ -96,7 +98,7 @@ public class ComplexTest extends AbstractTestCase {
assertEquals("i", e.getNodeName());
}
- public void testGetNextElementSibling2() {
+ public void testGetNextElementSibling2() throws IOException, SAXException {
ElementTraversal et = parse(DOC2);
Element e = et.getFirstElementChild();
et = toElementTraversal(e);
@@ -104,7 +106,7 @@ public class ComplexTest extends AbstractTestCase {
assertNull(e);
}
- public void testGetPreviousElementSibling1() {
+ public void testGetPreviousElementSibling1() throws IOException, SAXException {
ElementTraversal et = parse(DOC1);
Element e = et.getLastElementChild();
et = toElementTraversal(e);
@@ -124,7 +126,7 @@ public class ComplexTest extends AbstractTestCase {
assertEquals("i", e.getNodeName());
}
- public void testGetPreviousElementSibling2() {
+ public void testGetPreviousElementSibling2() throws IOException, SAXException {
ElementTraversal et = parse(DOC2);
Element e = et.getLastElementChild();
et = toElementTraversal(e);
@@ -132,12 +134,12 @@ public class ComplexTest extends AbstractTestCase {
assertNull(e);
}
- public void testChildElementCount1() {
+ public void testChildElementCount1() throws IOException, SAXException {
ElementTraversal et = parse(DOC1);
assertEquals(11, et.getChildElementCount());
}
- public void testChildElementCount2() {
+ public void testChildElementCount2() throws IOException, SAXException {
ElementTraversal et = parse(DOC2);
assertEquals(1, et.getChildElementCount());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org