You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@apache.org on 2001/10/25 23:06:12 UTC
cvs commit: xml-xalan/test/java/src/org/apache/qetest/xslwrapper TraxSAXWrapper.java
curcuru 01/10/25 14:06:12
Modified: test/java/src/org/apache/qetest/trax ExamplesTest.java
SystemIdImpInclTest.java TestMultiTypeThreads.java
test/java/src/org/apache/qetest/trax/sax
SAXSourceAPITest.java
SAXTransformerFactoryAPITest.java
TemplatesHandlerAPITest.java
test/java/src/org/apache/qetest/xalanj2
SmoketestOuttakes.java
test/java/src/org/apache/qetest/xslwrapper
TraxSAXWrapper.java
Log:
Update various SAX-related tests to use generic JAXP calls to get XMLReaders
Revision Changes Path
1.11 +25 -6 xml-xalan/test/java/src/org/apache/qetest/trax/ExamplesTest.java
Index: ExamplesTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/ExamplesTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExamplesTest.java 2001/10/09 18:36:26 1.10
+++ ExamplesTest.java 2001/10/25 21:06:11 1.11
@@ -67,6 +67,8 @@
import org.apache.qetest.xsl.*;
// Import all relevant TRAX packages
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.*;
import javax.xml.transform.dom.*;
import javax.xml.transform.sax.*;
@@ -83,7 +85,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.Parser;
import org.xml.sax.helpers.ParserAdapter;
-import org.xml.sax.helpers.XMLReaderFactory;
import org.xml.sax.XMLReader;
import org.xml.sax.XMLFilter;
import org.xml.sax.ContentHandler;
@@ -133,7 +134,7 @@
* for each case - these should be updated as time permits.</p>
* @author shane_curcuru@lotus.com
* @author scott_boag@lotus.com
- * @version $Id: ExamplesTest.java,v 1.10 2001/10/09 18:36:26 curcuru Exp $
+ * @version $Id: ExamplesTest.java,v 1.11 2001/10/25 21:06:11 curcuru Exp $
*/
public class ExamplesTest extends XSLProcessorTestBase
{
@@ -573,7 +574,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
- if( reader==null ) reader = XMLReaderFactory.createXMLReader();
+ if( reader==null ) reader = getJAXPXMLReader();
reader.setContentHandler(handler);
// It's a good idea for the parser to send lexical events.
@@ -671,7 +672,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
- if( reader==null ) reader = XMLReaderFactory.createXMLReader();
+ if( reader==null ) reader = getJAXPXMLReader();
// Set the result handling to be a serialization to the file output stream.
Serializer serializer = SerializerFactory.getSerializer
@@ -759,7 +760,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
- if( reader==null ) reader = XMLReaderFactory.createXMLReader();
+ if( reader==null ) reader = getJAXPXMLReader();
reporter.logTraceMsg("newXMLFilter(new StreamSource(" + QetestUtils.filenameToURL(xslID_1));
XMLFilter filter1 = stf.newXMLFilter(new StreamSource(QetestUtils.filenameToURL(xslID_1)));
@@ -1095,7 +1096,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
- if( reader==null ) reader= XMLReaderFactory.createXMLReader();
+ if( reader==null ) reader= getJAXPXMLReader();
reader.setContentHandler(handler);
reader.setProperty("http://xml.org/sax/properties/lexical-handler",
handler);
@@ -1178,6 +1179,24 @@
reporter.logThrowable(reporter.ERRORMSG, t, "exampleAsSerializer threw");
}
}
+
+
+ /**
+ * Worker method to get an XMLReader.
+ *
+ * Not the most efficient of methods, but makes the code simpler.
+ *
+ * @return a new XMLReader for use, with setNamespaceAware(true)
+ */
+ protected XMLReader getJAXPXMLReader()
+ throws Exception
+ {
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ SAXParser saxParser = factory.newSAXParser();
+ return saxParser.getXMLReader();
+ }
/**
1.8 +13 -6 xml-xalan/test/java/src/org/apache/qetest/trax/SystemIdImpInclTest.java
Index: SystemIdImpInclTest.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/SystemIdImpInclTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SystemIdImpInclTest.java 2001/06/29 14:51:34 1.7
+++ SystemIdImpInclTest.java 2001/10/25 21:06:11 1.8
@@ -73,14 +73,15 @@
import javax.xml.transform.stream.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
// Needed SAX, DOM, JAXP classes
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
import org.w3c.dom.Node;
// java classes
@@ -107,7 +108,7 @@
* (which will require network resources available).
*
* @author shane_curcuru@lotus.com
- * @version $Id: SystemIdImpInclTest.java,v 1.7 2001/06/29 14:51:34 curcuru Exp $
+ * @version $Id: SystemIdImpInclTest.java,v 1.8 2001/10/25 21:06:11 curcuru Exp $
*/
public class SystemIdImpInclTest extends XSLProcessorTestBase
{
@@ -542,7 +543,11 @@
// Verify basic transforms with with various systemId
// and a SAXSource(XMLReader, InputSource(various))
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory spfactory = SAXParserFactory.newInstance();
+ spfactory.setNamespaceAware(true);
+ SAXParser saxParser = spfactory.newSAXParser();
+ XMLReader reader = saxParser.getXMLReader();
// level0: one level up, with a character stream
xslInpSrc = new InputSource(new FileReader(testFileInfo.inputName));
xslSource = new SAXSource(reader, xslInpSrc);
@@ -555,7 +560,8 @@
"SAXSource(reader, inpSrc(charS)).systemId(level0: one up)");
// level1: same systemId as actual file, with a systemId
- reader = XMLReaderFactory.createXMLReader();
+ saxParser = spfactory.newSAXParser();
+ reader = saxParser.getXMLReader();
xslInpSrc = new InputSource(testFileInfo.inputName);
xslSource = new SAXSource(reader, xslInpSrc);
@@ -567,7 +573,8 @@
"SAXSource(reader, inpSrc(str)).systemId(level1: same level)");
// level2: one level down, with a byte stream
- reader = XMLReaderFactory.createXMLReader();
+ saxParser = spfactory.newSAXParser();
+ reader = saxParser.getXMLReader();
xslInpSrc = new InputSource(new FileInputStream(testFileInfo.inputName));
xslSource = new SAXSource(reader, xslInpSrc);
1.6 +6 -10 xml-xalan/test/java/src/org/apache/qetest/trax/TestMultiTypeThreads.java
Index: TestMultiTypeThreads.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/TestMultiTypeThreads.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestMultiTypeThreads.java 2001/06/13 01:20:11 1.5
+++ TestMultiTypeThreads.java 2001/10/25 21:06:11 1.6
@@ -95,13 +95,14 @@
import javax.xml.transform.stream.*; // We assume Features.STREAM for some tests
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
// HACK: Use Xalan's Serializers - should be changed
import org.xml.sax.XMLReader;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.XMLReaderFactory;
//-------------------------------------------------------------------------
@@ -980,16 +981,11 @@
// Create a reader and set it's ContentHandler to be the
// transformer.
- XMLReader reader = null;
+ SAXParserFactory spfactory = SAXParserFactory.newInstance();
+ spfactory.setNamespaceAware(true);
+ SAXParser jaxpParser = spfactory.newSAXParser();
+ XMLReader reader = jaxpParser.getXMLReader();
- // Use JAXP1.1 ( if possible )
- javax.xml.parsers.SAXParserFactory spfactory = javax.xml.parsers.SAXParserFactory.newInstance();
- spfactory.setNamespaceAware(true);
- javax.xml.parsers.SAXParser jaxpParser = spfactory.newSAXParser();
- reader = jaxpParser.getXMLReader();
-
- if (reader == null)
- reader = XMLReaderFactory.createXMLReader();
reader.setContentHandler(handler);
reader.setProperty("http://xml.org/sax/properties/lexical-handler", handler);
1.4 +11 -6 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SAXSourceAPITest.java 2001/03/22 19:57:14 1.3
+++ SAXSourceAPITest.java 2001/10/25 21:06:11 1.4
@@ -67,6 +67,7 @@
import org.apache.qetest.xsl.*;
// Import all relevant TRAX packages
+import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.*;
import javax.xml.transform.dom.*;
@@ -78,8 +79,6 @@
import org.xml.sax.XMLReader;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
import org.w3c.dom.Node;
// java classes
@@ -95,7 +94,7 @@
/**
* API Coverage test for the SAXSource class of TRAX.
* @author shane_curcuru@lotus.com
- * @version $Id: SAXSourceAPITest.java,v 1.3 2001/03/22 19:57:14 curcuru Exp $
+ * @version $Id: SAXSourceAPITest.java,v 1.4 2001/10/25 21:06:11 curcuru Exp $
*/
public class SAXSourceAPITest extends XSLProcessorTestBase
{
@@ -229,8 +228,12 @@
reporter.check(saxSrcReaderID2.getSystemId(), NONSENSE_SYSTEMID, "SAXSource(reader, new InputSource(sysId)) has SystemId: " + saxSrcReaderID2.getSystemId());
// ctor(XMLReader, InputSource)
- reporter.logTraceMsg("SAX way:reader = XMLReaderFactory.createXMLReader()");
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ reporter.logTraceMsg("SAX way:reader = SAXParser.getXMLReader()");
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ SAXParser saxParser = factory.newSAXParser();
+ XMLReader reader = saxParser.getXMLReader();
SAXSource saxSrcReaderID = new SAXSource(reader, srcWithID);
reporter.checkObject(saxSrcReaderID.getInputSource(), srcWithID, "SAXSource(reader, new InputSource(sysId)) has InputSource: " + saxSrcReaderID.getInputSource());
reporter.checkObject(saxSrcReaderID.getXMLReader(), reader, "SAXSource(reader, new InputSource(sysId)) has XMLReader: " + saxSrcReaderID.getXMLReader());
@@ -279,7 +282,9 @@
// API Coverage set/getXMLReader
reporter.checkObject(wackySAX.getXMLReader(), null, "wackySAX still does not have an XMLReader");
- XMLReader wackyReader = XMLReaderFactory.createXMLReader();
+ // Be sure to use the JAXP methods only!
+ saxParser = factory.newSAXParser();
+ XMLReader wackyReader = saxParser.getXMLReader();
wackySAX.setXMLReader(wackyReader);
reporter.checkObject(wackySAX.getXMLReader(), wackyReader, "set/getXMLReader API coverage");
wackySAX.setXMLReader(null);
1.7 +35 -15 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SAXTransformerFactoryAPITest.java 2001/03/22 19:57:14 1.6
+++ SAXTransformerFactoryAPITest.java 2001/10/25 21:06:11 1.7
@@ -75,6 +75,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
// Needed SAX, DOM, JAXP classes
import org.w3c.dom.Document;
@@ -83,7 +85,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
// java classes
import java.io.File;
@@ -98,7 +99,7 @@
* API Coverage test for SAXTransformerFactory.
* @author Krishna.Meduri@eng.sun.com
* @author shane_curcuru@lotus.com
- * @version $Id: SAXTransformerFactoryAPITest.java,v 1.6 2001/03/22 19:57:14 curcuru Exp $
+ * @version $Id: SAXTransformerFactoryAPITest.java,v 1.7 2001/10/25 21:06:11 curcuru Exp $
*/
public class SAXTransformerFactoryAPITest extends XSLProcessorTestBase
{
@@ -243,7 +244,7 @@
TransformerFactory tfactory = TransformerFactory.newInstance();
try
{
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
SAXTransformerFactory saxTFactory = (SAXTransformerFactory)tfactory;
TransformerHandler handler = saxTFactory.newTransformerHandler(
@@ -288,7 +289,7 @@
TransformerFactory tfactory = TransformerFactory.newInstance();
try
{
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
InputSource is = new InputSource(new FileInputStream(xslName));
@@ -353,7 +354,7 @@
Result result = new StreamResult(fos);
handler.setResult(result);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(handler);
// Log what output is about to be created
@@ -409,7 +410,7 @@
Result result = new StreamResult(fos);
handler.setResult(result);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(handler);
// Log what output is about to be created
@@ -460,7 +461,7 @@
Result result = new StreamResult(fos);
handler.setResult(result);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(handler);
// Log what output is about to be created
@@ -513,7 +514,7 @@
Result result = new StreamResult(fos);
handler.setResult(result);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(handler);
// Log what output is about to be created
@@ -558,7 +559,7 @@
Node node = (Node) document;
DOMSource domSource = new DOMSource(node);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
//For xml file.
@@ -611,7 +612,7 @@
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(thandler);
reporter.logTraceMsg("reader.parse(" + QetestUtils.filenameToURL(xslName) + ")");
reader.parse(QetestUtils.filenameToURL(xslName));
@@ -656,7 +657,7 @@
TransformerFactory tfactory = TransformerFactory.newInstance();
try
{
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
// String testDirPath = System.getProperty("Tests_Dir"); // @todo update systemId
@@ -710,7 +711,7 @@
{
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
// The transformer will use a SAX parser as it's reader.
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
// Set the result handling to be a serialization to the file output stream.
FileOutputStream fos = new FileOutputStream(outNames.nextName());
Result realResult = new StreamResult(fos);
@@ -771,7 +772,7 @@
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
XMLFilter filter = saxTFactory.newXMLFilter(domSource);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
// Set the result handling to be a serialization to the file output stream.
FileOutputStream fos = new FileOutputStream(outNames.nextName());
Result realResult = new StreamResult(fos);
@@ -828,7 +829,7 @@
reporter.logTraceMsg("newXMLFilter(..." + xslName + ")");
XMLFilter filter = saxTFactory.newXMLFilter(saxSource);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
// Set the result handling to be a serialization to the file output stream.
FileOutputStream fos = new FileOutputStream(outNames.nextName());
Result realResult = new StreamResult(fos);
@@ -874,7 +875,7 @@
try
{
// The transformer will use a SAX parser as it's reader.
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
// String testDirPath = System.getProperty("Tests_Dir"); // @todo update systemId
@@ -916,6 +917,25 @@
reporter.logThrowable(reporter.ERRORMSG, t, "SAXTFactoryTest013 threw");
}
}// end of SAXTFactoryTest013()
+
+
+ /**
+ * Worker method to get an XMLReader.
+ *
+ * Not the most efficient of methods, but makes the code simpler.
+ *
+ * @return a new XMLReader for use, with setNamespaceAware(true)
+ */
+ protected XMLReader getJAXPXMLReader()
+ throws Exception
+ {
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ SAXParser saxParser = factory.newSAXParser();
+ return saxParser.getXMLReader();
+ }
+
/**
* Convenience method to print out usage information - update if needed.
1.6 +24 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TemplatesHandlerAPITest.java 2001/03/22 19:57:15 1.5
+++ TemplatesHandlerAPITest.java 2001/10/25 21:06:11 1.6
@@ -67,6 +67,8 @@
import org.apache.qetest.xsl.*;
// Import all relevant TRAX packages
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.*;
import javax.xml.transform.dom.*;
import javax.xml.transform.sax.*;
@@ -80,8 +82,6 @@
import org.xml.sax.XMLReader;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
import org.w3c.dom.Node;
// java classes
@@ -94,7 +94,7 @@
/**
* API Coverage test for the TemplatesHandler class of TRAX.
* @author shane_curcuru@lotus.com
- * @version $Id: TemplatesHandlerAPITest.java,v 1.5 2001/03/22 19:57:15 curcuru Exp $
+ * @version $Id: TemplatesHandlerAPITest.java,v 1.6 2001/10/25 21:06:11 curcuru Exp $
*/
public class TemplatesHandlerAPITest extends XSLProcessorTestBase
{
@@ -259,7 +259,7 @@
// Validate a templatesHandler can create a valid stylesheet
templatesHandler = saxFactory.newTemplatesHandler();
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(templatesHandler);
// Parse the stylesheet, which means we should be able to getTemplates()
@@ -302,7 +302,7 @@
// with imports/includes, with the default systemId
templatesHandler = saxFactory.newTemplatesHandler();
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(templatesHandler);
// Parse the stylesheet, which means we should be able to getTemplates()
@@ -348,7 +348,7 @@
// Set the base systemId for the handler to a bogus one
templatesHandler.setSystemId(NONSENSE_SYSTEMID);
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ XMLReader reader = getJAXPXMLReader();
reader.setContentHandler(templatesHandler);
// Parse the stylesheet, which should throw some
@@ -385,6 +385,24 @@
reporter.testCaseClose();
return true;
+ }
+
+
+ /**
+ * Worker method to get an XMLReader.
+ *
+ * Not the most efficient of methods, but makes the code simpler.
+ *
+ * @return a new XMLReader for use, with setNamespaceAware(true)
+ */
+ protected XMLReader getJAXPXMLReader()
+ throws Exception
+ {
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ SAXParser saxParser = factory.newSAXParser();
+ return saxParser.getXMLReader();
}
1.3 +22 -6 xml-xalan/test/java/src/org/apache/qetest/xalanj2/SmoketestOuttakes.java
Index: SmoketestOuttakes.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/SmoketestOuttakes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SmoketestOuttakes.java 2001/10/09 14:02:37 1.2
+++ SmoketestOuttakes.java 2001/10/25 21:06:12 1.3
@@ -68,6 +68,7 @@
import org.apache.qetest.xsl.*;
// Import all relevant TRAX packages
+import javax.xml.parsers.*;
import javax.xml.transform.*;
import javax.xml.transform.dom.*;
import javax.xml.transform.sax.*;
@@ -78,14 +79,11 @@
import org.apache.xalan.serialize.Serializer;
import org.apache.xalan.templates.OutputProperties;
-// Needed SAX, DOM, JAXP classes
-import javax.xml.parsers.*;
// Needed SAX classes
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.Parser;
import org.xml.sax.helpers.ParserAdapter;
-import org.xml.sax.helpers.XMLReaderFactory;
import org.xml.sax.XMLReader;
import org.xml.sax.XMLFilter;
import org.xml.sax.ContentHandler;
@@ -120,7 +118,7 @@
* due to recent changes you have made).
*
* @author shane_curcuru@lotus.com
- * @version $Id: SmoketestOuttakes.java,v 1.2 2001/10/09 14:02:37 curcuru Exp $
+ * @version $Id: SmoketestOuttakes.java,v 1.3 2001/10/25 21:06:12 curcuru Exp $
*/
public class SmoketestOuttakes extends XSLProcessorTestBase
{
@@ -237,7 +235,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
- if( reader==null ) reader = XMLReaderFactory.createXMLReader();
+ if( reader==null ) reader = getJAXPXMLReader();
reader.setContentHandler(handler);
// It's a good idea for the parser to send lexical events.
@@ -344,7 +342,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
- if( reader==null ) reader= XMLReaderFactory.createXMLReader();
+ if( reader==null ) reader= getJAXPXMLReader();
reader.setContentHandler(handler);
reader.setProperty("http://xml.org/sax/properties/lexical-handler",
handler);
@@ -606,6 +604,24 @@
reporter.testCaseClose();
return true;
+ }
+
+
+ /**
+ * Worker method to get an XMLReader.
+ *
+ * Not the most efficient of methods, but makes the code simpler.
+ *
+ * @return a new XMLReader for use, with setNamespaceAware(true)
+ */
+ protected XMLReader getJAXPXMLReader()
+ throws Exception
+ {
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ SAXParser saxParser = factory.newSAXParser();
+ return saxParser.getXMLReader();
}
1.4 +25 -6 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraxSAXWrapper.java 2001/06/25 14:35:23 1.3
+++ TraxSAXWrapper.java 2001/10/25 21:06:12 1.4
@@ -57,6 +57,7 @@
package org.apache.qetest.xslwrapper;
import org.apache.qetest.QetestUtils;
+import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
@@ -75,7 +76,6 @@
import org.xml.sax.XMLReader;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -99,7 +99,7 @@
* our getProcessorInfo() method.</p>
*
* @author Shane Curcuru
- * @version $Id: TraxSAXWrapper.java,v 1.3 2001/06/25 14:35:23 curcuru Exp $
+ * @version $Id: TraxSAXWrapper.java,v 1.4 2001/10/25 21:06:12 curcuru Exp $
*/
public class TraxSAXWrapper extends TransformWrapperHelper
{
@@ -239,7 +239,8 @@
TemplatesHandler templatesHandler = saxFactory.newTemplatesHandler();
// Create an XMLReader and set its ContentHandler.
- XMLReader xslReader = XMLReaderFactory.createXMLReader();
+ // Be sure to use the JAXP methods only!
+ XMLReader xslReader = getJAXPXMLReader();
xslReader.setContentHandler(templatesHandler);
// Timed: read/build Templates from StreamSource
@@ -262,7 +263,7 @@
applyParameters(stylesheetHandler.getTransformer());
// Use a new XMLReader to parse the XML document
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = getJAXPXMLReader();
xmlReader.setContentHandler(stylesheetHandler);
// Set the ContentHandler to also function as LexicalHandler,
@@ -370,7 +371,7 @@
TemplatesHandler templatesHandler = saxFactory.newTemplatesHandler();
// Create an XMLReader and set its ContentHandler.
- XMLReader xslReader = XMLReaderFactory.createXMLReader();
+ XMLReader xslReader = getJAXPXMLReader();
xslReader.setContentHandler(templatesHandler);
// Timed: read/build Templates from StreamSource
@@ -441,7 +442,7 @@
applyParameters(stylesheetHandler.getTransformer());
// Use a new XMLReader to parse the XML document
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = getJAXPXMLReader();
xmlReader.setContentHandler(stylesheetHandler);
// Set the ContentHandler to also function as LexicalHandler,
@@ -622,5 +623,23 @@
{
if (null == factory)
newProcessor(newProcessorOpts);
+ }
+
+
+ /**
+ * Worker method to get an XMLReader.
+ *
+ * Not the most efficient of methods, but makes the code simpler.
+ *
+ * @return a new XMLReader for use, with setNamespaceAware(true)
+ */
+ protected XMLReader getJAXPXMLReader()
+ throws Exception
+ {
+ // Be sure to use the JAXP methods only!
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ SAXParser saxParser = factory.newSAXParser();
+ return saxParser.getXMLReader();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org