vhardy 2002/11/18 08:44:45
Modified: test-sources/org/apache/batik/test/xml XMLReflect.java
XMLTestReportProcessor.java XMLTestSuiteLoader.java
XMLTestSuiteRunner.java
XMLTestSuiteRunnerValidator.java
Log:
Removed dependency of the test infrastructure on the SVGDOMImplementation
Revision Changes Path
1.5 +6 -8 xml-batik/test-sources/org/apache/batik/test/xml/XMLReflect.java
Index: XMLReflect.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLReflect.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLReflect.java 16 Oct 2001 10:38:10 -0000 1.4
+++ XMLReflect.java 18 Nov 2002 16:44:45 -0000 1.5
@@ -90,7 +90,7 @@
if(tagName == XR_PROPERTY_TAG){
Object arg = buildArgument(childElement);
String propertyName
- = childElement.getAttributeNS(null, XR_NAME_ATTRIBUTE);
+ = childElement.getAttribute(XR_NAME_ATTRIBUTE);
setObjectProperty(obj, propertyName, arg);
}
}
@@ -162,9 +162,8 @@
// String based argument
Class cl = Class.forName(classAttr);
- if(element.hasAttributeNS(null, XR_VALUE_ATTRIBUTE)){
- String value = element.getAttributeNS(null,
- XR_VALUE_ATTRIBUTE);
+ if(element.hasAttribute(XR_VALUE_ATTRIBUTE)){
+ String value = element.getAttribute(XR_VALUE_ATTRIBUTE);
Constructor constructor
@@ -189,9 +188,8 @@
*/
public static String getInheritedClassAttribute(Element element){
if(element != null){
- String classAttr = element.getAttributeNS(null,
- XR_CLASS_ATTRIBUTE);
-
+ String classAttr = element.getAttribute(XR_CLASS_ATTRIBUTE);
+
if(classAttr == null || "".equals(classAttr)){
Node parent = element.getParentNode();
if(parent != null && parent.getNodeType() == Node.ELEMENT_NODE){
1.15 +31 -38
xml-batik/test-sources/org/apache/batik/test/xml/XMLTestReportProcessor.java
Index: XMLTestReportProcessor.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestReportProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLTestReportProcessor.java 19 Oct 2001 09:22:17 -0000 1.14
+++ XMLTestReportProcessor.java 18 Nov 2002 16:44:45 -0000 1.15
@@ -25,13 +25,15 @@
import java.util.Calendar;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.batik.test.TestReport;
import org.apache.batik.test.TestReportProcessor;
import org.apache.batik.test.TestSuite;
import org.apache.batik.test.TestException;
import org.apache.batik.util.XMLConstants;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -168,8 +170,10 @@
* <testReport> element. Then, process the
* TestReports recursively.
*/
+ DocumentBuilder docBuilder
+ = DocumentBuilderFactory.newInstance().newDocumentBuilder();
DOMImplementation impl
- = SVGDOMImplementation.getDOMImplementation();
+ = docBuilder.getDOMImplementation();
Document document = null;
@@ -184,7 +188,7 @@
Element root = document.getDocumentElement();
- root.setAttributeNS(null, XTR_DATE_ATTRIBUTE,
+ root.setAttribute(XTR_DATE_ATTRIBUTE,
reportDate);
processReport(report, root, document);
@@ -311,30 +315,26 @@
throw new IllegalArgumentException();
}
- reportElement.setAttributeNS(null,
- XTR_TEST_NAME_ATTRIBUTE,
- report.getTest().getName());
+ reportElement.setAttribute(XTR_TEST_NAME_ATTRIBUTE,
+ report.getTest().getName());
String id = report.getTest().getQualifiedId();
if( !"".equals(id) ){
- reportElement.setAttributeNS(null,
- XTR_ID_ATTRIBUTE,
- id
- );
+ reportElement.setAttribute(XTR_ID_ATTRIBUTE,
+ id
+ );
}
String status = report.hasPassed()
? XTR_PASSED_VALUE
: XTR_FAILED_VALUE;
- reportElement.setAttributeNS(null,
- XTR_STATUS_ATTRIBUTE,
- status);
+ reportElement.setAttribute(XTR_STATUS_ATTRIBUTE,
+ status);
if(!report.hasPassed()){
- reportElement.setAttributeNS(null,
- XTR_ERROR_CODE_ATTRIBUTE,
- report.getErrorCode());
+ reportElement.setAttribute(XTR_ERROR_CODE_ATTRIBUTE,
+ report.getErrorCode());
}
TestReport.Entry[] entries = report.getDescription();
@@ -391,13 +391,11 @@
descriptionElement.appendChild(entryElement);
- entryElement.setAttributeNS(null,
- XTR_KEY_ATTRIBUTE,
- key.toString());
-
- entryElement.setAttributeNS(null,
- XTR_VALUE_ATTRIBUTE,
- value.toString());
+ entryElement.setAttribute(XTR_KEY_ATTRIBUTE,
+ key.toString());
+
+ entryElement.setAttribute(XTR_VALUE_ATTRIBUTE,
+ value.toString());
}
else if(value instanceof File){
@@ -418,13 +416,11 @@
descriptionElement.appendChild(entryElement);
- entryElement.setAttributeNS(null,
- XTR_KEY_ATTRIBUTE,
- key.toString());
-
- entryElement.setAttributeNS(null,
- XTR_VALUE_ATTRIBUTE,
- tmpFileCopy.toURL().toString());
+ entryElement.setAttribute(XTR_KEY_ATTRIBUTE,
+ key.toString());
+
+ entryElement.setAttribute(XTR_VALUE_ATTRIBUTE,
+ tmpFileCopy.toURL().toString());
}
else {
@@ -435,15 +431,12 @@
descriptionElement.appendChild(entryElement);
- entryElement.setAttributeNS(null,
- XTR_KEY_ATTRIBUTE,
- key.toString());
+ entryElement.setAttribute(XTR_KEY_ATTRIBUTE,
+ key.toString());
- Attr a = reportDocument.createAttributeNS(null,
- XTR_VALUE_ATTRIBUTE);
+ Attr a = reportDocument.createAttribute(XTR_VALUE_ATTRIBUTE);
a.setValue(value!=null?value.toString():"null");
- entryElement.setAttributeNodeNS(a);
-
+ entryElement.setAttributeNode(a);
}
}
1.6 +12 -22
xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteLoader.java
Index: XMLTestSuiteLoader.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLTestSuiteLoader.java 6 Nov 2001 15:04:52 -0000 1.5
+++ XMLTestSuiteLoader.java 18 Nov 2002 16:44:45 -0000 1.6
@@ -20,6 +20,9 @@
import java.util.Vector;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.batik.test.DefaultTestSuite;
import org.apache.batik.test.TestReport;
import org.apache.batik.test.TestSuite;
@@ -27,12 +30,6 @@
import org.apache.batik.test.TestException;
import org.apache.batik.test.TestReportProcessor;
-import org.apache.batik.dom.util.DocumentFactory;
-import org.apache.batik.dom.util.SAXDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-
-import org.apache.batik.util.XMLResourceDescriptor;
-
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
@@ -86,18 +83,14 @@
*/
protected static Document loadTestSuiteDocument(String testSuiteURI)
throws TestException{
- DocumentFactory df
- = new SAXDocumentFactory(SVGDOMImplementation.getDOMImplementation(),
- XMLResourceDescriptor.getXMLParserClassName());
Document doc = null;
try{
- URL url = new URL(testSuiteURI);
- doc = df.createDocument(null,
- XTS_TEST_SUITE_TAG,
- url.toString(),
- url.openStream());
+ DocumentBuilder docBuilder
+ = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+
+ doc = docBuilder.parse(testSuiteURI);
}catch(Exception e){
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
@@ -127,12 +120,10 @@
= new DefaultTestSuite();
String suiteName
- = element.getAttributeNS(null,
- XTS_NAME_ATTRIBUTE);
+ = element.getAttribute(XTS_NAME_ATTRIBUTE);
String suiteId
- = element.getAttributeNS(null,
- XTS_ID_ATTRIBUTE);
+ = element.getAttribute(XTS_ID_ATTRIBUTE);
testSuite.setId(suiteId);
@@ -165,8 +156,7 @@
Test t = (Test)XMLReflect.buildObject(element);
String id
- = element.getAttributeNS(null,
- XTS_ID_ATTRIBUTE);
+ = element.getAttribute(XTS_ID_ATTRIBUTE);
t.setId(id);
return t;
}catch (Exception e) {
@@ -174,7 +164,7 @@
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
throw new TestException(CANNOT_CREATE_TEST,
- new Object[] { element.getAttributeNS(null,
XR_CLASS_ATTRIBUTE),
+ new Object[] {
element.getAttribute(XR_CLASS_ATTRIBUTE),
e.getClass().getName(),
e.getMessage(),
sw.toString() },
1.10 +13 -19
xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunner.java
Index: XMLTestSuiteRunner.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLTestSuiteRunner.java 6 Nov 2001 15:04:52 -0000 1.9
+++ XMLTestSuiteRunner.java 18 Nov 2002 16:44:45 -0000 1.10
@@ -22,6 +22,9 @@
import java.util.Set;
import java.util.Vector;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+
import org.apache.batik.test.DefaultTestSuite;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
@@ -31,12 +34,6 @@
import org.apache.batik.test.TestException;
import org.apache.batik.test.TestReportProcessor;
-import org.apache.batik.dom.util.DocumentFactory;
-import org.apache.batik.dom.util.SAXDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-
-import org.apache.batik.util.XMLResourceDescriptor;
-
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
@@ -271,7 +268,7 @@
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
throw new TestException(CANNOT_CREATE_TEST_REPORT_PROCESSOR,
- new Object[] { element.getAttributeNS(null,
XR_CLASS_ATTRIBUTE),
+ new Object[] {
element.getAttribute(XR_CLASS_ATTRIBUTE),
e.getClass().getName(),
e.getMessage(),
sw.toString() },
@@ -293,10 +290,10 @@
//
// Set the testRun name and id on the top level testSuite
//
- String name = element.getAttributeNS(null, XTRun_NAME_ATTRIBUTE);
+ String name = element.getAttribute(XTRun_NAME_ATTRIBUTE);
testSuite.setName(name);
- String id = element.getAttributeNS(null, XTRun_ID_ATTRIBUTE);
+ String id = element.getAttribute(XTRun_ID_ATTRIBUTE);
testSuite.setId(id);
Element[] testSuites
@@ -305,7 +302,7 @@
int n = testSuites != null ? testSuites.length : 0;
for(int i=0; i<n; i++){
String suiteHref =
- testSuites[i].getAttributeNS(null, XTRun_HREF_ATTRIBUTE);
+ testSuites[i].getAttribute(XTRun_HREF_ATTRIBUTE);
Test test = XMLTestSuiteLoader.loadTestSuite(suiteHref, testSuite);
if(test != null){
@@ -532,18 +529,15 @@
}
}
- DocumentFactory df
- = new SAXDocumentFactory(SVGDOMImplementation.getDOMImplementation(),
- XMLResourceDescriptor.getXMLParserClassName());
-
Document doc = null;
try{
System.err.println("Loading document ...");
- doc = df.createDocument(null,
- XTRun_TEST_RUN_TAG,
- url.toString(),
- url.openStream());
+
+ DocumentBuilder docBuilder
+ = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+
+ doc = docBuilder.parse(url.toString());
}catch(Exception e){
e.printStackTrace();
System.err.println(Messages.formatMessage(INVALID_DOCUMENT,
1.4 +8 -15
xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java
Index: XMLTestSuiteRunnerValidator.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLTestSuiteRunnerValidator.java 6 Nov 2001 15:04:52 -0000 1.3
+++ XMLTestSuiteRunnerValidator.java 18 Nov 2002 16:44:45 -0000 1.4
@@ -17,6 +17,9 @@
import java.util.Set;
import java.util.StringTokenizer;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+
import org.w3c.dom.Document;
import org.apache.batik.test.DefaultTestReport;
@@ -26,12 +29,6 @@
import org.apache.batik.test.TestReport;
import org.apache.batik.test.TestSuiteReport;
-import org.apache.batik.dom.util.DocumentFactory;
-import org.apache.batik.dom.util.SAXDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-
-import org.apache.batik.util.XMLResourceDescriptor;
-
/**
* Validates the operation of the <tt>XMLTestSuireRunner</tt> by checking
* that it runs the tests specified by the command line parameter and
@@ -294,15 +291,11 @@
* Loads the dummy testRun description
*/
protected Document loadDummyTestRun() throws Exception{
- DocumentFactory df
- = new
SAXDocumentFactory(SVGDOMImplementation.getDOMImplementation(),
-
XMLResourceDescriptor.getXMLParserClassName());
-
+ DocumentBuilder docBuilder
+ = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+
URL url = (new File(XMLTestSuiteRunnerValidator.dummyTestRun)).toURL();
- return df.createDocument(null,
- XTRunConstants.XTRun_TEST_RUN_TAG,
- url.toString(),
- url.openStream());
+ return docBuilder.parse(url.toString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
