You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2005/07/13 14:04:14 UTC
cvs commit: xml-xalan/test/java/src/org/apache/qetest/xslwrapper TraxDOMWrapper.java TraxFileWrapper.java TraxLocalPathWrapper.java TraxSAXWrapper.java TraxStreamWrapper.java TraxSystemIdWrapper.java
mkwan 2005/07/13 05:04:14
Modified: test/java/src/org/apache/qetest/xslwrapper
TraxDOMWrapper.java TraxFileWrapper.java
TraxLocalPathWrapper.java TraxSAXWrapper.java
TraxStreamWrapper.java TraxSystemIdWrapper.java
Log:
Fix problems for conferr tests.
We need to set an ErrorListener on TranformerFactory and Transformer in order to
catch exceptions on errors.
Revision Changes Path
1.9 +10 -2 xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxDOMWrapper.java
Index: TraxDOMWrapper.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxDOMWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TraxDOMWrapper.java 17 Feb 2004 17:33:54 -0000 1.8
+++ TraxDOMWrapper.java 13 Jul 2005 12:04:14 -0000 1.9
@@ -32,6 +32,7 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.qetest.QetestUtils;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
@@ -133,6 +134,7 @@
//@todo do we need to do any other cleanup?
reset(false);
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Verify the factory supports DOM!
if (!(factory.getFeature(DOMSource.FEATURE)
&& factory.getFeature(DOMResult.FEATURE)))
@@ -192,6 +194,7 @@
// Timed: build Transformer from DOMSource
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Timed: read xml into a DOM
@@ -222,6 +225,7 @@
// Untimed: prepare serializer with outputProperties
// from the stylesheet
Transformer resultSerializer = factory.newTransformer();
+ resultSerializer.setErrorListener(new DefaultErrorHandler());
Properties serializationProps = transformer.getOutputProperties();
resultSerializer.setOutputProperties(serializationProps);
@@ -342,6 +346,7 @@
// Untimed: get Transformer from Templates
Transformer transformer = builtTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
@@ -374,6 +379,7 @@
// Untimed: prepare serializer with outputProperties
// from the stylesheet
Transformer resultSerializer = factory.newTransformer();
+ resultSerializer.setErrorListener(new DefaultErrorHandler());
Properties serializationProps = transformer.getOutputProperties();
resultSerializer.setOutputProperties(serializationProps);
@@ -447,6 +453,7 @@
// Timed: build Transformer from Source
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: create DOMResult
@@ -467,6 +474,7 @@
// Untimed: prepare serializer with outputProperties
// from the stylesheet
Transformer resultSerializer = factory.newTransformer();
+ resultSerializer.setErrorListener(new DefaultErrorHandler());
Properties serializationProps = transformer.getOutputProperties();
resultSerializer.setOutputProperties(serializationProps);
1.8 +7 -2 xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxFileWrapper.java
Index: TraxFileWrapper.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxFileWrapper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TraxFileWrapper.java 17 Feb 2004 17:33:54 -0000 1.7
+++ TraxFileWrapper.java 13 Jul 2005 12:04:14 -0000 1.8
@@ -28,6 +28,7 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.utils.DefaultErrorHandler;
/**
* Implementation of TransformWrapper that uses the TrAX API and
@@ -118,6 +119,7 @@
//@todo do we need to do any other cleanup?
reset(false);
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Verify the factory supports Streams!
if (!(factory.getFeature(StreamSource.FEATURE)
&& factory.getFeature(StreamResult.FEATURE)))
@@ -161,6 +163,7 @@
// Timed: read/build xsl from a File
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(new StreamSource(new File(xslName)));
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: Set any of our options as Attributes on the transformer
@@ -262,6 +265,7 @@
// UNTimed: get Transformer from Templates
Transformer transformer = builtTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
// Untimed: Set any of our options as Attributes on the transformer
TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
@@ -322,6 +326,7 @@
// Timed: build xsl from a URL
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: Set any of our options as Attributes on the transformer
1.6 +7 -2 xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxLocalPathWrapper.java
Index: TraxLocalPathWrapper.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxLocalPathWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TraxLocalPathWrapper.java 17 Feb 2004 17:33:54 -0000 1.5
+++ TraxLocalPathWrapper.java 13 Jul 2005 12:04:14 -0000 1.6
@@ -28,6 +28,7 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.utils.DefaultErrorHandler;
/**
* Implementation of TransformWrapper that uses the TrAX API and
@@ -122,6 +123,7 @@
//@todo do we need to do any other cleanup?
reset(false);
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Verify the factory supports Streams!
if (!(factory.getFeature(StreamSource.FEATURE)
&& factory.getFeature(StreamResult.FEATURE)))
@@ -166,6 +168,7 @@
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(
new StreamSource(xslName));
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: Set any of our options as Attributes on the transformer
@@ -269,6 +272,7 @@
// UNTimed: get Transformer from Templates
Transformer transformer = builtTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
// Untimed: Set any of our options as Attributes on the transformer
TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
@@ -329,6 +333,7 @@
// Timed: build xsl from a URL
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: Set any of our options as Attributes on the transformer
1.10 +4 -2 xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxSAXWrapper.java
Index: TraxSAXWrapper.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxSAXWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TraxSAXWrapper.java 17 Feb 2004 17:33:54 -0000 1.9
+++ TraxSAXWrapper.java 13 Jul 2005 12:04:14 -0000 1.10
@@ -36,6 +36,7 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.qetest.QetestUtils;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -131,6 +132,7 @@
//@todo do we need to do any other cleanup?
reset(false);
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Verify the factory supports SAX!
if (!(factory.getFeature(SAXSource.FEATURE)
&& factory.getFeature(SAXResult.FEATURE)))
1.9 +8 -3 xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxStreamWrapper.java
Index: TraxStreamWrapper.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxStreamWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TraxStreamWrapper.java 17 Feb 2004 17:33:54 -0000 1.8
+++ TraxStreamWrapper.java 13 Jul 2005 12:04:14 -0000 1.9
@@ -34,6 +34,7 @@
import javax.xml.transform.stream.StreamSource;
import org.apache.qetest.QetestUtils;
+import org.apache.xml.utils.DefaultErrorHandler;
/**
* Implementation of TransformWrapper that uses the TrAX API and
@@ -129,6 +130,7 @@
//@todo do we need to do any other cleanup?
reset(false);
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Verify the factory supports Streams!
if (!(factory.getFeature(StreamSource.FEATURE)
&& factory.getFeature(StreamResult.FEATURE)))
@@ -190,6 +192,7 @@
// Timed: build Transformer from StreamSource
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
File xmlFile = new File(xmlName);
@@ -348,7 +351,8 @@
// Timed: get Transformer from Templates
startTime = System.currentTimeMillis();
Transformer transformer = builtTemplates.newTransformer();
- getTransformer = System.currentTimeMillis() - startTime;
+ transformer.setErrorListener(new DefaultErrorHandler());
+ getTransformer = System.currentTimeMillis() - startTime;
File xmlFile = new File(xmlName);
int xmlLength = new Long(xmlFile.length()).intValue(); //@todo warning: possible overflow
@@ -452,6 +456,7 @@
// Timed: build xsl from a URL
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Re-read the XML file for use in transform; not timed
1.7 +7 -2 xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxSystemIdWrapper.java
Index: TraxSystemIdWrapper.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxSystemIdWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraxSystemIdWrapper.java 17 Feb 2004 17:33:54 -0000 1.6
+++ TraxSystemIdWrapper.java 13 Jul 2005 12:04:14 -0000 1.7
@@ -29,6 +29,7 @@
import javax.xml.transform.stream.StreamSource;
import org.apache.qetest.QetestUtils;
+import org.apache.xml.utils.DefaultErrorHandler;
/**
* Implementation of TransformWrapper that uses the TrAX API and
@@ -119,6 +120,7 @@
//@todo do we need to do any other cleanup?
reset(false);
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Verify the factory supports Streams!
if (!(factory.getFeature(StreamSource.FEATURE)
&& factory.getFeature(StreamResult.FEATURE)))
@@ -163,6 +165,7 @@
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(
new StreamSource(QetestUtils.filenameToURL(xslName)));
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: Set any of our options as Attributes on the transformer
@@ -266,6 +269,7 @@
// UNTimed: get Transformer from Templates
Transformer transformer = builtTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
// Untimed: Set any of our options as Attributes on the transformer
TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
@@ -326,6 +330,7 @@
// Timed: build xsl from a URL
startTime = System.currentTimeMillis();
Transformer transformer = factory.newTransformer(xslSource);
+ transformer.setErrorListener(new DefaultErrorHandler());
xslBuild = System.currentTimeMillis() - startTime;
// Untimed: Set any of our options as Attributes on the transformer
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org