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/06/03 18:22:31 UTC
cvs commit: xml-xalan/test/java/src/org/apache/qetest/trax/stream StreamResultAPITest.java StreamSourceAPITest.java
mkwan 2005/06/03 09:22:31
Modified: test test.properties
test/java/src/org/apache/qetest/trax ErrorListenerTest.java
ParameterTest.java TemplatesAPITest.java
TransformerAPITest.java
TransformerFactoryAPITest.java
test/java/src/org/apache/qetest/trax/dom
DOMResultAPITest.java DOMSourceAPITest.java
test/java/src/org/apache/qetest/trax/sax
SAXResultAPITest.java SAXSourceAPITest.java
SAXTransformerFactoryAPITest.java
TemplatesHandlerAPITest.java
TransformerHandlerAPITest.java
TransformerHandlerTest.java
test/java/src/org/apache/qetest/trax/stream
StreamResultAPITest.java StreamSourceAPITest.java
Log:
Patch for XALANJ-2139.
Update the test harness for the change in error handling.
Revision Changes Path
1.114 +1 -2 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- test.properties 6 Dec 2004 11:38:13 -0000 1.113
+++ test.properties 3 Jun 2005 16:22:30 -0000 1.114
@@ -163,8 +163,7 @@
smoketest.extensions.excludes=javaBugzilla3722.xsl;libraryNodeset05.xsl;libraryNodeset06.xsl;libraryNodeset07.xsl;libraryNodeset08.xsl
# Runs a selected set of known passing API tests
-# Hack out trax.ErrorListenerTest; since fails are prob. due to differing parser versions -sc 03-May-02
-smoketest.api.tests=trax.EmbeddedStylesheetTest;trax.ErrorListenerAPITest;trax.ExamplesTest;trax.OutputPropertiesTest;trax.TemplatesAPITest;trax.TransformerAPITest;trax.TransformerFactoryAPITest;trax.SystemIdTest;trax.SystemIdImpInclTest;trax.URIResolverTest;;trax.dom.DOMResultAPITest;trax.dom.DOMSourceAPITest;;trax.sax.SAXResultAPITest;trax.sax.SAXSourceAPITest;trax.sax.TemplatesHandlerAPITest;trax.sax.TransformerHandlerAPITest;trax.sax.TransformerHandlerTest;;trax.stream.StreamResultAPITest;trax.stream.StreamSourceAPITest;;xalanj2.FactoryFeatureTest;xalanj2.ProgrammaticDOMTest;xalanj2.SerializedStylesheetTest;xalanj2.TraceListenerTest;xalanj2.TransformStateAPITest;xalanj2.TransformStateTest;xalanj2.TestXPathAPI;;OutputSettingsTest;;ParameterTest;SAXTransformerFactoryAPITest;
+smoketest.api.tests=trax.EmbeddedStylesheetTest;trax.ErrorListenerTest;trax.ErrorListenerAPITest;trax.ExamplesTest;trax.OutputPropertiesTest;trax.TemplatesAPITest;trax.TransformerAPITest;trax.TransformerFactoryAPITest;trax.SystemIdTest;trax.SystemIdImpInclTest;trax.URIResolverTest;;trax.dom.DOMResultAPITest;trax.dom.DOMSourceAPITest;;trax.sax.SAXResultAPITest;trax.sax.SAXSourceAPITest;trax.sax.TemplatesHandlerAPITest;trax.sax.TransformerHandlerAPITest;trax.sax.TransformerHandlerTest;;trax.stream.StreamResultAPITest;trax.stream.StreamSourceAPITest;;xalanj2.FactoryFeatureTest;xalanj2.ProgrammaticDOMTest;xalanj2.SerializedStylesheetTest;xalanj2.TraceListenerTest;xalanj2.TransformStateAPITest;xalanj2.TransformStateTest;xalanj2.TestXPathAPI;;OutputSettingsTest;;ParameterTest;SAXTransformerFactoryAPITest;
smoketest.api.inputDir=tests/api
smoketest.api.goldDir=tests/api-gold
smoketest.api.outputDir=smoketest/api
1.10 +2 -67 xml-xalan/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java
Index: ErrorListenerTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ErrorListenerTest.java 17 Feb 2004 17:30:09 -0000 1.9
+++ ErrorListenerTest.java 3 Jun 2005 16:22:30 -0000 1.10
@@ -190,35 +190,6 @@
// Clear out any setExpected or counters
loggingErrorListener.reset();
reporter.checkPass("set ErrorListener prevented any exceptions in newTemplates()");
-
- // This stylesheet will still work, even though errors
- // were detected during it's building. Note that
- // future versions of Xalan or other processors may
- // not be able to continue here...
- transformer = templates.newTransformer();
-
- reporter.logTraceMsg("default transformer's getErrorListener is: " + transformer.getErrorListener());
- // Set the errorListener and validate it
- transformer.setErrorListener(loggingErrorListener);
- reporter.check((transformer.getErrorListener() == loggingErrorListener),
- true, "set/getErrorListener on transformer");
-
- // Validate the first xsl:message call in the stylesheet
- loggingErrorListener.setExpected(transformExpectedType,
- transformExpectedValue);
- reporter.logTraceMsg("about to transform(...)");
- transformer.transform(new StreamSource(QetestUtils.filenameToURL(testFileInfo.xmlName)),
- new StreamResult(outNames.nextName()));
- reporter.logTraceMsg("after transform(...)");
- // Clear out any setExpected or counters
- loggingErrorListener.reset();
-
- // Validate the actual output file as well: in this case,
- // the stylesheet should still work
- fileChecker.check(reporter,
- new File(outNames.currentName()),
- new File(testFileInfo.goldName),
- "transform of error xsl into: " + outNames.currentName());
}
catch (Throwable t)
{
@@ -274,42 +245,6 @@
// Clear out any setExpected or counters
loggingErrorListener.reset();
reporter.checkPass("set ErrorListener prevented any exceptions in newTransformerHandler()");
-
- // This stylesheet will still work, even though errors
- // were detected during it's building. Note that
- // future versions of Xalan or other processors may
- // not be able to continue here...
-
- // Create a result and setup SAX parsing 'tree'
- Result result = new StreamResult(outNames.nextName());
- handler.setResult(result);
- reader.setContentHandler(handler);
-
- LoggingSAXErrorHandler loggingSAXErrorHandler = new LoggingSAXErrorHandler(reporter);
- loggingSAXErrorHandler.setThrowWhen(LoggingSAXErrorHandler.THROW_NEVER);
- reporter.logTraceMsg("LoggingSAXErrorHandler originally setup:" + loggingSAXErrorHandler.getQuickCounters());
- reader.setErrorHandler(loggingSAXErrorHandler);
-
- // Validate the first xsl:message call in the stylesheet
- loggingErrorListener.setExpected(transformExpectedType,
- transformExpectedValue);
- reporter.logInfoMsg("about to parse/transform(" + QetestUtils.filenameToURL(testFileInfo.xmlName) + ")");
- reader.parse(QetestUtils.filenameToURL(testFileInfo.xmlName));
- reporter.logTraceMsg("LoggingSAXErrorHandler after parse:" + loggingSAXErrorHandler.getQuickCounters());
- // Clear out any setExpected or counters
- loggingErrorListener.reset();
- loggingSAXErrorHandler.reset();
-
- // Validate the actual output file as well: in this case,
- // the stylesheet should still work
- reporter.logErrorMsg("Output file validation Moved to SmoketestOuttakes.java.testCase3 Oct-01 -sc Bugzilla#4044");
-/* **** Moved to SmoketestOuttakes.java.testCase3 Oct-01 -sc
- fileChecker.check(reporter,
- new File(outNames.currentName()),
- new File(testFileInfo.goldName),
- "SAX transform of error xsl into: " + outNames.currentName());
-**** Moved to SmoketestOuttakes.java.testCase3 Oct-01 -sc **** */
-
}
catch (Throwable t)
{
1.9 +7 -2 xml-xalan/test/java/src/org/apache/qetest/trax/ParameterTest.java
Index: ParameterTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/ParameterTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParameterTest.java 23 Feb 2004 21:33:14 -0000 1.8
+++ ParameterTest.java 3 Jun 2005 16:22:30 -0000 1.9
@@ -43,6 +43,7 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
//-------------------------------------------------------------------------
@@ -354,6 +355,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
templates = factory.newTemplates(new StreamSource(paramTest.inputName));
}
catch (Exception e)
@@ -368,6 +370,7 @@
{
// Process the file as-is, without any params set
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
transformer.transform(new StreamSource(paramTest.xmlName),
new StreamResult(outNames.nextName()));
transformer.clearParameters();
@@ -470,7 +473,9 @@
try
{
TransformerFactory factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
Transformer transformer = factory.newTransformer(xslStylesheet);
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("setParameter(" + paramName + ", " + paramVal +")");
transformer.setParameter(paramName, paramVal);
1.13 +3 -1 xml-xalan/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java
Index: TemplatesAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TemplatesAPITest.java 17 Feb 2004 17:30:09 -0000 1.12
+++ TemplatesAPITest.java 3 Jun 2005 16:22:30 -0000 1.13
@@ -38,6 +38,7 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
//-------------------------------------------------------------------------
@@ -149,6 +150,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
}
catch (Exception e)
{
1.23 +30 -2 xml-xalan/test/java/src/org/apache/qetest/trax/TransformerAPITest.java
Index: TransformerAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/TransformerAPITest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TransformerAPITest.java 17 Feb 2004 17:30:09 -0000 1.22
+++ TransformerAPITest.java 3 Jun 2005 16:22:30 -0000 1.23
@@ -43,6 +43,7 @@
import org.apache.qetest.QetestUtils;
import org.apache.qetest.TestletImpl;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
//-------------------------------------------------------------------------
@@ -202,7 +203,9 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
identityTransformer = factory.newTransformer();
+ identityTransformer.setErrorListener(new DefaultErrorHandler());
templates = factory.newTemplates(new StreamSource(paramTest.inputName));
}
catch (Exception e)
@@ -241,6 +244,7 @@
try
{
transformer = templates.newTransformer(); // may throw TransformerConfigurationException
+ transformer.setErrorListener(new DefaultErrorHandler());
// Default Transformer should not have any parameters..
Object tmp = transformer.getParameter("This-param-does-not-exist");
reporter.checkObject(tmp, null, "This-param-does-not-exist is null by default");
@@ -284,6 +288,7 @@
try
{
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
// Verify simple set/get of a single parameter - Integer
transformer.setParameter(PARAM3S, new Integer(1234));
reporter.logTraceMsg("Just set " + PARAM3S + " to Integer(1234)");
@@ -355,6 +360,7 @@
try
{
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
transformer.setParameter(PARAM1S, "'test-param-1s'"); // note single quotes
transformer.setParameter(PARAM1N, new Integer(1234));
// Verify basic params actually affect transformation
@@ -415,16 +421,21 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
outputTemplates = factory.newTemplates(new StreamSource(outputFormatTest.inputName));
outputTransformer = outputTemplates.newTransformer();
+ outputTransformer.setErrorListener(new DefaultErrorHandler());
htmlTemplates = factory.newTemplates(new StreamSource(htmlFormatTest.inputName));
htmlTransformer = htmlTemplates.newTransformer();
+ htmlTransformer.setErrorListener(new DefaultErrorHandler());
identityTemplates = factory.newTemplates(new StreamSource(simpleTest.inputName));
identityTransformer = identityTemplates.newTransformer();
+ identityTransformer.setErrorListener(new DefaultErrorHandler());
defaultTransformer = factory.newTransformer();
+ defaultTransformer.setErrorListener(new DefaultErrorHandler());
}
catch (Throwable t)
{
@@ -535,6 +546,7 @@
// See what we have by default, from our testfile
outputTransformer = outputTemplates.newTransformer();
+ outputTransformer.setErrorListener(new DefaultErrorHandler());
try
{
// Inner try-catch
@@ -633,6 +645,7 @@
{ // Inner try-catch
// Simple set/getOutputProperty
outputTransformer = outputTemplates.newTransformer();
+ outputTransformer.setErrorListener(new DefaultErrorHandler());
String tmp = outputTransformer.getOutputProperty(OutputKeys.OMIT_XML_DECLARATION); // SPR SCUU4RXR6E
// SPR SCUU4R3JZ7 - throws npe
reporter.logTraceMsg(OutputKeys.OMIT_XML_DECLARATION + " is currently: " + tmp);
@@ -649,6 +662,7 @@
{ // Inner try-catch
// Try getting the whole properties block, so we can see what it thinks it has
outputTransformer = outputTemplates.newTransformer();
+ outputTransformer.setErrorListener(new DefaultErrorHandler());
Properties newOutProps = outputTransformer.getOutputProperties();
reporter.logHashtable(reporter.STATUSMSG, newOutProps,
"Another getOutputProperties()");
@@ -710,7 +724,9 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
identityTransformer = factory.newTransformer();
+ identityTransformer.setErrorListener(new DefaultErrorHandler());
outputTemplates = factory.newTemplates(new StreamSource(outputFormatTest.inputName));
}
catch (Throwable t)
@@ -756,7 +772,9 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
identityTransformer = factory.newTransformer();
+ identityTransformer.setErrorListener(new DefaultErrorHandler());
outputTemplates = factory.newTemplates(new StreamSource(outputFormatTest.inputName));
}
catch (Throwable t)
@@ -918,6 +936,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
}
catch (Throwable t)
{
@@ -929,6 +948,7 @@
try
{
Transformer transformer = factory.newTransformer(new StreamSource(simpleTest.inputName));
+ transformer.setErrorListener(new DefaultErrorHandler());
// Re-use the transformer multiple times on identity
transformer.transform(new StreamSource(simpleTest.xmlName),
new StreamResult(outNames.nextName()));
@@ -952,6 +972,7 @@
"transform(#3) identity into: " + outNames.currentName());
transformer = factory.newTransformer(new StreamSource(multiTest.inputName));
+ transformer.setErrorListener(new DefaultErrorHandler());
// Re-use the transformer multiple times on file with variable
transformer.transform(new StreamSource(multiTest.xmlName),
new StreamResult(outNames.nextName()));
@@ -967,6 +988,9 @@
new File(multiTest.goldName),
"transform(#2-a) var test into: " + outNames.currentName());
+ // Reset the transformer to its original state
+ transformer.reset();
+
transformer.transform(new StreamSource(multiTest.xmlName),
new StreamResult(outNames.nextName()));
fileChecker.check(reporter,
@@ -982,6 +1006,9 @@
new File(multi2Test.goldName),
"transform(#4-b) var test into: " + outNames.currentName());
+ // Reset the transformer to its original state
+ transformer.reset();
+
// Now re-use with original xml doc
transformer.transform(new StreamSource(multiTest.xmlName),
new StreamResult(outNames.nextName()));
@@ -1021,7 +1048,7 @@
{
factory = TransformerFactory.newInstance();
// Grab a stylesheet to use for this testcase
- factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
templates = factory.newTemplates(new StreamSource(simpleTest.inputName));
}
catch (Throwable t)
@@ -1069,6 +1096,7 @@
try
{
Transformer transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
// URIResolver should be null by default; try to set/get one
reporter.checkObject(transformer.getURIResolver(), null, "getURIResolver is null by default");
LoggingURIResolver myURIResolver = new LoggingURIResolver(reporter);
1.12 +10 -2 xml-xalan/test/java/src/org/apache/qetest/trax/TransformerFactoryAPITest.java
Index: TransformerFactoryAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/TransformerFactoryAPITest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TransformerFactoryAPITest.java 17 Feb 2004 17:30:09 -0000 1.11
+++ TransformerFactoryAPITest.java 3 Jun 2005 16:22:30 -0000 1.12
@@ -46,6 +46,8 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
+
import org.w3c.dom.Document;
//-------------------------------------------------------------------------
@@ -268,6 +270,7 @@
reporter.logStatusMsg("System property " + defaultPropName
+ " is: " + System.getProperty(defaultPropName));
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
Transformer identityTransformer = factory.newTransformer();
reporter.check((identityTransformer != null), true, "newTransformer() APICoverage");
@@ -305,6 +308,7 @@
reporter.logStatusMsg("System property " + defaultPropName
+ " is: " + System.getProperty(defaultPropName));
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
if (factory.getFeature(StreamSource.FEATURE))
{
Templates templates = factory.newTemplates(new StreamSource(testFileInfo.inputName));
@@ -339,6 +343,7 @@
reporter.logStatusMsg("System property " + defaultPropName
+ " is: " + System.getProperty(defaultPropName));
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
String media= null; // currently untested
String title = null; // currently untested
String charset = null; // currently untested
@@ -353,6 +358,7 @@
reporter.check((null != stylesheet), true, "getAssociatedStylesheet returns a non-null Source");
Transformer transformer = factory.newTransformer(stylesheet);
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.logCriticalMsg("SPR SCUU4RXTSQ occours in below line, even though check reports pass (missing linefeed)");
transformer.transform(new StreamSource(embeddedFileInfo.xmlName), new StreamResult(resultStream));
resultStream.close(); // just in case
@@ -387,6 +393,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
URIResolver URIRes = factory.getURIResolver();
reporter.logInfoMsg("factory.getURIResolver() default is: " + URIRes);
@@ -463,6 +470,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
1.12 +9 -2 xml-xalan/test/java/src/org/apache/qetest/trax/dom/DOMResultAPITest.java
Index: DOMResultAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/dom/DOMResultAPITest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMResultAPITest.java 17 Feb 2004 17:31:19 -0000 1.11
+++ DOMResultAPITest.java 3 Jun 2005 16:22:31 -0000 1.12
@@ -37,6 +37,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.apache.qetest.FileBasedTest;
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
@@ -206,6 +207,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
docBuilder = dfactory.newDocumentBuilder();
@@ -235,6 +237,7 @@
// Verify a 'blank' Result object gets filled up properly
DOMResult blankResult = new DOMResult();
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
transformer.transform(xmlSource, blankResult);
reporter.logTraceMsg("blankResult is now: " + blankResult);
Node blankNode = blankResult.getNode();
@@ -263,6 +266,7 @@
// Reuse the same result for multiple transforms
DOMResult reuseResult = new DOMResult(docBuilder.newDocument());
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
transformer.transform(xmlSource, reuseResult);
Node reuseNode = reuseResult.getNode();
serializeDOMAndCheck(reuseNode, testFileInfo.goldName, "transform into reuseable1 DOMResult");
@@ -270,6 +274,7 @@
// Get a new transformer just to avoid extra complexity
reporter.logTraceMsg("About to re-use DOMResult from previous transform, should throw");
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reusePass = true; // Next line should throw an exception
transformer.transform(xmlSource, reuseResult); // SPR SCUU4RJKG4 throws DOM006
reporter.checkFail("Re-using DOMResult should have thrown exception", "SCUU4RJKG4");
@@ -290,6 +295,7 @@
// Reuse the same result for multiple transforms, after resetting node
DOMResult reuseResult = new DOMResult(docBuilder.newDocument());
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
transformer.transform(xmlSource, reuseResult);
Node reuseNode = reuseResult.getNode();
serializeDOMAndCheck(reuseNode, testFileInfo.goldName, "transform into reuseable2 DOMResult");
@@ -297,6 +303,7 @@
// Get a new transformer just to avoid extra complexity
reporter.logTraceMsg("About to re-use DOMResult from previous transform after setNode()");
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reuseResult.setNode(docBuilder.newDocument());
transformer.transform(xmlSource, reuseResult);
reuseNode = reuseResult.getNode();
1.15 +14 -2 xml-xalan/test/java/src/org/apache/qetest/trax/dom/DOMSourceAPITest.java
Index: DOMSourceAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/dom/DOMSourceAPITest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DOMSourceAPITest.java 17 Feb 2004 17:31:19 -0000 1.14
+++ DOMSourceAPITest.java 3 Jun 2005 16:22:31 -0000 1.15
@@ -41,6 +41,7 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@@ -208,6 +209,7 @@
{
// Startup a factory, create some nodes/DOMs
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
docBuilder = dfactory.newDocumentBuilder();
@@ -259,6 +261,7 @@
templates = factory.newTemplates(xslDOM);
reporter.check((templates != null), true, "factory.newTemplates(DOMSource) is non-null");
transformerXSL = factory.newTransformer(xslDOM);
+ transformerXSL.setErrorListener(new DefaultErrorHandler());
reporter.check((transformerXSL != null), true, "factory.newTransformer(DOMSource) is non-null");
// A simple DOM-DOM-DOM transform
@@ -313,6 +316,7 @@
// Note that inputName, xmlName are already URL'd
xslDOM.setSystemId(impInclFileInfo.inputName);
transformerXSL = factory.newTransformer(xslDOM);
+ transformerXSL.setErrorListener(new DefaultErrorHandler());
DOMSource xmlDOM = new DOMSource(xmlImpInclNode);
// Do we really need to set SystemId on both XML and XSL?
xmlDOM.setSystemId(impInclFileInfo.xmlName);
@@ -344,6 +348,7 @@
}
DOMSource xslDOM = new DOMSource(xslImpInclNode);
transformerXSL = factory.newTransformer(xslDOM);
+ transformerXSL.setErrorListener(new DefaultErrorHandler());
DOMSource xmlDOM = new DOMSource(xmlImpInclNode);
DOMResult emptyResult = new DOMResult();
reporter.logStatusMsg("About to transform without systemID; probably throws exception");
@@ -382,6 +387,7 @@
{
// Startup a factory, create some nodes/DOMs
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setNamespaceAware(true);
docBuilder = dfactory.newDocumentBuilder();
@@ -403,6 +409,7 @@
DOMResult result1 = new DOMResult(docBuilder.newDocument());
DOMSource xslSource = new DOMSource(xslNode);
Transformer transformer1 = factory.newTransformer(xslSource);
+ transformer1.setErrorListener(new DefaultErrorHandler());
transformer1.transform(xmlSource1, result1);
Node node1 = result1.getNode();
serializeDOMAndCheck(node1, testFileInfo.goldName, "transform first time xslSource worked");
@@ -410,6 +417,7 @@
DOMSource xmlSource2 = new DOMSource(xmlNode);
DOMResult result2 = new DOMResult(docBuilder.newDocument());
Transformer transformer2 = factory.newTransformer(xslSource);
+ transformer2.setErrorListener(new DefaultErrorHandler());
transformer2.transform(xmlSource2, result2);
Node node2 = result2.getNode();
serializeDOMAndCheck(node2, testFileInfo.goldName, "transform second time xslSource worked");
@@ -417,6 +425,7 @@
// Re-use DOMSource for XML doc; with the same stylesheet
DOMResult result3 = new DOMResult(docBuilder.newDocument());
Transformer transformer3 = factory.newTransformer(xslSource);
+ transformer3.setErrorListener(new DefaultErrorHandler());
transformer3.transform(xmlSource2, result3);
Node node3 = result3.getNode();
serializeDOMAndCheck(node3, testFileInfo.goldName, "transform reusing both xsl/xml Sources");
@@ -433,6 +442,7 @@
DOMSource xmlSource = new DOMSource(xmlNode);
DOMSource xslSource = new DOMSource(xslNode);
Transformer transformer1 = factory.newTransformer(xslSource);
+ transformer1.setErrorListener(new DefaultErrorHandler());
DOMResult result1 = new DOMResult(docBuilder.newDocument());
transformer1.transform(xmlSource, result1);
Node node1 = result1.getNode();
@@ -444,6 +454,7 @@
xslSource.setNode(xslImpInclNode);
xslSource.setSystemId(impInclFileInfo.inputName);
Transformer transformer2 = factory.newTransformer(xslSource);
+ transformer2.setErrorListener(new DefaultErrorHandler());
DOMResult result2 = new DOMResult(docBuilder.newDocument());
transformer2.transform(xmlSource, result2);
Node node2 = result2.getNode();
@@ -478,6 +489,7 @@
{
// Use identity transformer to serialize
Transformer identityTransformer = factory.newTransformer();
+ identityTransformer.setErrorListener(new DefaultErrorHandler());
String outName = outNames.nextName();
FileOutputStream fos = new FileOutputStream(outName);
StreamResult streamResult = new StreamResult(fos);
1.11 +11 -2 xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXResultAPITest.java
Index: SAXResultAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXResultAPITest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SAXResultAPITest.java 17 Feb 2004 17:31:19 -0000 1.10
+++ SAXResultAPITest.java 3 Jun 2005 16:22:31 -0000 1.11
@@ -49,6 +49,7 @@
import org.apache.qetest.xsl.LoggingContentHandler;
import org.apache.qetest.xsl.LoggingLexicalHandler;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -179,6 +180,7 @@
TransformerFactory factory = null;
SAXTransformerFactory saxFactory = null;
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// ctor(Handler) with identity transformer, which is both
@@ -280,6 +282,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Process a simple stylesheet for use later
reporter.logTraceMsg("factory.newTemplates(new StreamSource(" + xslURI + "))");
@@ -312,6 +315,7 @@
// Just do a normal transform to this result
Transformer transformer = streamTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("transform(new StreamSource(" + xmlURI + "), saxResult)");
transformer.transform(new StreamSource(xmlURI), saxResult);
fos.close(); // must close ostreams we own
@@ -334,6 +338,7 @@
// Just do a normal transform to this result
Transformer transformer = streamTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("transform(..., nullsaxResult)");
transformer.transform(new StreamSource(xmlURI), saxResult);
reporter.checkFail("transform(..., nullsaxResult) should have thrown exception");
@@ -371,6 +376,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Process a simple stylesheet for use later
reporter.logTraceMsg("factory.newTemplates(new StreamSource(" + xslURI + "))");
@@ -415,6 +421,7 @@
// Just do a normal transform to this result
Transformer transformer = streamTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("transform(new StreamSource(" + xmlURI + "), loggingSaxResult)");
transformer.transform(new StreamSource(xmlURI), saxResult);
fos.close(); // must close ostreams we own
@@ -453,6 +460,7 @@
// Do an identityTransform to this result
Transformer identityTransformer = TransformerFactory.newInstance().newTransformer();
+ identityTransformer.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("identityTransform(new StreamSource(" + xmlURI + "), loggingSaxResult)");
identityTransformer.transform(new StreamSource(xmlURI), saxResult);
fos.close(); // must close ostreams we own
@@ -502,6 +510,7 @@
// Just do a normal transform to this result
Transformer transformer = streamTemplates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("transform(new DOMSource(" + xmlURI + "), loggingSaxResult)");
transformer.transform(new DOMSource(xmlNode), saxResult);
fos.close(); // must close ostreams we own
1.9 +9 -2 xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXSourceAPITest.java
Index: SAXSourceAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXSourceAPITest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXSourceAPITest.java 17 Feb 2004 17:31:19 -0000 1.8
+++ SAXSourceAPITest.java 3 Jun 2005 16:22:31 -0000 1.9
@@ -42,6 +42,7 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -278,6 +279,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
}
catch (Throwable t)
@@ -297,9 +299,11 @@
xslSAXSrc = new SAXSource(new InputSource(xslURI));
Transformer transformer1 = factory.newTransformer(xslSAXSrc);
+ transformer1.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer1 != null), true, "Create transformer from SAXSource(new InputSource(URL))");
Transformer transformer2 = templates.newTransformer();
+ transformer2.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer2 != null), true, "Create transformer from earlier templates");
reporter.logTraceMsg("Validate transform of SAXSource(XML) using above transformers");
@@ -327,6 +331,7 @@
Templates templatesStream = factory.newTemplates(xslSAXSrc);
reporter.check((templatesStream != null), true, "Create templates from SAXSource(FileInputStream())");
Transformer transformerStream = templatesStream.newTransformer();
+ transformerStream.setErrorListener(new DefaultErrorHandler());
reporter.check((transformerStream != null), true, "Create transformer from templates");
reporter.logTraceMsg("Validate transform of SAXSource(...new InputStream(" + testFileInfo.xmlName + " )) using above transformers");
@@ -360,9 +365,11 @@
xslSAXSrc = new SAXSource(new InputSource(xslImpInclURI));
Transformer transformer1 = factory.newTransformer(xslSAXSrc);
+ transformer1.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer1 != null), true, "Create transformer from SAXSource(new InputSource(" + xslImpInclURI + "))");
Transformer transformer2 = factory.newTransformer(xslSAXSrc);
+ transformer2.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer2 != null), true, "Create transformer from earlier templates");
reporter.logTraceMsg("Validate transform of SAXSource(" + xmlImpInclURI + ") using above transformers");
1.14 +14 -2 xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXTransformerFactoryAPITest.java
Index: SAXTransformerFactoryAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/SAXTransformerFactoryAPITest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SAXTransformerFactoryAPITest.java 17 Feb 2004 17:31:19 -0000 1.13
+++ SAXTransformerFactoryAPITest.java 3 Jun 2005 16:22:31 -0000 1.14
@@ -45,6 +45,7 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.apache.qetest.FileBasedTest;
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
@@ -206,6 +207,7 @@
reporter.logStatusMsg("SAXTFactoryTest001: newTransformerhandler() method which takes StreamSource as argument. ");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
XMLReader reader = getJAXPXMLReader();
@@ -248,6 +250,7 @@
reporter.logStatusMsg("SAXTFactoryTest002: This tests newTransformerhandler() method which takes SAXSource as argument. ");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
XMLReader reader = getJAXPXMLReader();
@@ -347,6 +350,7 @@
String tmpOutName = outNames.nextName();
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -448,6 +452,7 @@
reporter.logStatusMsg("SAXTFactoryTest006: This tests newTransformerhandler() method which takes DOMSource as argument. Here a relative URI is used in citiesinclude.xsl file. setSystemId is used for DOMSource. Here Constructor that takes systemId as argument is used for creating DOMSource. It should run well. ");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
@@ -499,6 +504,7 @@
reporter.logStatusMsg("SAXTFactoryTest007: This tests newTransformerhandler() method which takes DOMSource as argument. Here a relative URI is used in citiesinclude.xsl file. setSystemId is used for DOMSource. Here Constructor that takes systemId as argument is used for creating DOMSource. It should run well. ");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -556,6 +562,7 @@
reporter.logStatusMsg("SAXTFactoryTest008: Simple SAX: TemplatesHandler to FileOutputStream");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
@@ -602,6 +609,7 @@
reporter.logStatusMsg("SAXTFactoryTest009: Simple SAX with included stylesheet");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
XMLReader reader = getJAXPXMLReader();
@@ -652,6 +660,7 @@
reporter.logStatusMsg("SAXTFactoryTest010: The transformer will use a SAX parser as it's reader");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
@@ -701,6 +710,7 @@
reporter.logStatusMsg("SAXTFactoryTest011: The transformer will use a SAX parser as it's reader");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
// The transformer will use a SAX parser as it's reader.
@@ -758,6 +768,7 @@
reporter.logStatusMsg("SAXTFactoryTest012: The transformer will use a SAX parser as it's reader");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
// The transformer will use a SAX parser as it's reader.
@@ -811,6 +822,7 @@
reporter.logStatusMsg("SAXTFactoryTest013: The transformer will use a SAX parser as it's reader");
TransformerFactory tfactory = TransformerFactory.newInstance();
+ tfactory.setErrorListener(new DefaultErrorHandler());
try
{
// The transformer will use a SAX parser as it's reader.
1.11 +9 -2 xml-xalan/test/java/src/org/apache/qetest/trax/sax/TemplatesHandlerAPITest.java
Index: TemplatesHandlerAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/TemplatesHandlerAPITest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TemplatesHandlerAPITest.java 17 Feb 2004 17:31:19 -0000 1.10
+++ TemplatesHandlerAPITest.java 3 Jun 2005 16:22:31 -0000 1.11
@@ -47,6 +47,7 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.xml.sax.XMLReader;
//-------------------------------------------------------------------------
@@ -163,6 +164,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Basic construction
@@ -214,6 +216,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Validate a templatesHandler can create a valid stylesheet
@@ -232,6 +235,7 @@
reporter.check((xslOutProps != null), true, "getTemplates().getOutputProperties() returns non-null with valid stylesheet");
//@todo validate a specific output property
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "getTemplates().newTransformer() returns non-null with valid stylesheet");
// Validate that this transformer actually works
@@ -256,6 +260,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Validate a templatesHandler can create a stylesheet
@@ -275,6 +280,7 @@
reporter.check((xslOutProps != null), true, "getTemplates().getOutputProperties() returns non-null with impincl stylesheet");
//@todo validate a specific output property
transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "getTemplates().newTransformer() returns non-null with impincl stylesheet");
// Validate that this transformer actually works
@@ -299,6 +305,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Validate a templatesHandler with an incorrect
1.9 +13 -2 xml-xalan/test/java/src/org/apache/qetest/trax/sax/TransformerHandlerAPITest.java
Index: TransformerHandlerAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/TransformerHandlerAPITest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TransformerHandlerAPITest.java 17 Feb 2004 17:31:19 -0000 1.8
+++ TransformerHandlerAPITest.java 3 Jun 2005 16:22:31 -0000 1.9
@@ -43,6 +43,7 @@
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.QetestUtils;
import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.utils.DefaultErrorHandler;
//-------------------------------------------------------------------------
@@ -159,6 +160,7 @@
{
// Validate API's for an identity transformer
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Basic construction of identity transformer
@@ -167,6 +169,7 @@
// getTemplates API coverage - simple
Transformer transformer = tHandler.getTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "getTransformer() is non-null on new identity TransformerHandler");
// set/getSystemId API coverage
@@ -200,6 +203,7 @@
{
// Validate API's for a 'real' transformer, which is different code
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Basic construction of identity transformer
@@ -208,6 +212,7 @@
// getTemplates API coverage - simple
Transformer transformer = tHandler.getTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "realTransformer.getTransformer() is non-null");
// set/getSystemId API coverage
@@ -264,12 +269,14 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Validate an identity transformerHandler is valid
// and performs as an identity stylesheet
transformerHandler = saxFactory.newTransformerHandler();
transformer = transformerHandler.getTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "identity newTransformerHandler is non-null");
transformer.transform(new StreamSource(xmlURI), new StreamResult(outNames.nextName()));
int res = fileChecker.check(reporter,
@@ -289,12 +296,14 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Validate newTransformerHandler(Source) works
Source xslSource = new StreamSource(xslURI);
transformerHandler = saxFactory.newTransformerHandler(xslSource);
transformer = transformerHandler.getTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "newTransformerHandler(Source) is non-null");
transformer.transform(new StreamSource(xmlURI), new StreamResult(outNames.nextName()));
int res = fileChecker.check(reporter,
@@ -314,6 +323,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
// Validate newTransformerHandler(Templates) works
@@ -321,6 +331,7 @@
Templates otherTemplates = factory.newTemplates(xslSource);
transformerHandler = saxFactory.newTransformerHandler(otherTemplates);
transformer = transformerHandler.getTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
reporter.check((transformer != null), true, "newTransformerHandler(Templates) is non-null");
transformer.transform(new StreamSource(xmlURI), new StreamResult(outNames.nextName()));
int res = fileChecker.check(reporter,
1.6 +5 -2 xml-xalan/test/java/src/org/apache/qetest/trax/sax/TransformerHandlerTest.java
Index: TransformerHandlerTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/sax/TransformerHandlerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransformerHandlerTest.java 17 Feb 2004 17:31:19 -0000 1.5
+++ TransformerHandlerTest.java 3 Jun 2005 16:22:31 -0000 1.6
@@ -40,6 +40,7 @@
import org.apache.qetest.FileBasedTest;
import org.apache.qetest.Logger;
import org.apache.qetest.OutputNameManager;
+import org.apache.xml.utils.DefaultErrorHandler;
//-------------------------------------------------------------------------
@@ -117,6 +118,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
saxFactory = (SAXTransformerFactory)factory;
boolean gotExpectedException = false;
@@ -126,6 +128,7 @@
reporter.logInfoMsg("About to newTransformer(xslStr)");
reusedTransformer = saxFactory.newTransformer(
new StreamSource(new java.io.StringReader(xslStr)));
+ reusedTransformer.setErrorListener(new DefaultErrorHandler());
reporter.logInfoMsg("About to transform(xmlErrorStr, " + outNames.nextName() + ")");
reusedTransformer.transform(new StreamSource(new java.io.StringReader(xmlErrorStr)),
new StreamResult(outNames.currentName()));
1.10 +7 -2 xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamResultAPITest.java
Index: StreamResultAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamResultAPITest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StreamResultAPITest.java 17 Feb 2004 17:31:19 -0000 1.9
+++ StreamResultAPITest.java 3 Jun 2005 16:22:31 -0000 1.10
@@ -44,6 +44,7 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.apache.qetest.FileBasedTest;
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.Reporter;
@@ -202,6 +203,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Create re-useable sources
xslSource = new StreamSource(new FileInputStream(outputFileInfo.inputName));
reporter.logTraceMsg("Create stream sources, templates");
@@ -220,6 +222,7 @@
// Test some OutputStreams
// Simple FileOutputStream is tested in numerous other tests
Transformer transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Result result1 = new StreamResult(baos);
reporter.logTraceMsg("About to Transform into ByteArrayOutputStream");
@@ -258,6 +261,7 @@
{
// Test some Writers
Transformer transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
StringWriter sw = new StringWriter();
Result result1 = new StreamResult(sw);
reporter.logTraceMsg("About to Transform into StringWriter");
@@ -297,6 +301,7 @@
reporter.logTraceMsg("System.getProperty(user.dir) threw SecurityException");
}
Transformer transformer = templates.newTransformer();
+ transformer.setErrorListener(new DefaultErrorHandler());
StringWriter sw1 = new StringWriter();
Result result1 = new StreamResult(sw1);
reporter.logTraceMsg("About to Transform into StringWriter w/out systemId set");
1.11 +7 -2 xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamSourceAPITest.java
Index: StreamSourceAPITest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/stream/StreamSourceAPITest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StreamSourceAPITest.java 17 Feb 2004 17:31:19 -0000 1.10
+++ StreamSourceAPITest.java 3 Jun 2005 16:22:31 -0000 1.11
@@ -41,6 +41,7 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.utils.DefaultErrorHandler;
import org.apache.qetest.FileBasedTest;
import org.apache.qetest.OutputNameManager;
import org.apache.qetest.xsl.XSLTestfileInfo;
@@ -220,6 +221,7 @@
try
{
factory = TransformerFactory.newInstance();
+ factory.setErrorListener(new DefaultErrorHandler());
// Create URLs for the filenames
// What's the simplest way to do this?!? i.e. as a solution
// to the general problem of having a String denoting a
@@ -253,6 +255,7 @@
Result result1 = new StreamResult(fos1);
Templates templates1 = factory.newTemplates(xslSource1);
Transformer transformer1 = templates1.newTransformer();
+ transformer1.setErrorListener(new DefaultErrorHandler());
reporter.logTraceMsg("about to transform to streams after setSystemId");
transformer1.transform(xmlSource1, result1);
fos1.close(); // must close ostreams we own
@@ -281,6 +284,7 @@
reporter.logInfoMsg("Transform into " + outNames.currentName());
Templates templates2 = factory.newTemplates(xslSource2);
Transformer transformer2 = templates2.newTransformer();
+ transformer2.setErrorListener(new DefaultErrorHandler());
transformer2.transform(xmlSource2, result2);
fos2.close(); // must close ostreams we own
int result = fileChecker.check(reporter,
@@ -320,6 +324,7 @@
Templates templates3 = factory.newTemplates(xslSource3);
Transformer transformer3 = templates3.newTransformer();
+ transformer3.setErrorListener(new DefaultErrorHandler());
reporter.logStatusMsg("About to transform without systemID; probably throws exception");
transformer3.transform(xmlSource3, result3);
reporter.checkFail("The above transform should probably have thrown an exception; into " + outNames.currentName());
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org