curcuru 00/11/15 14:17:28
Modified: test/java/src/org/apache/qetest/trax TemplatesAPITest.java
TransformerAPITest.java
test/java/src/org/apache/qetest/trax/stream
StreamSourceAPITest.java
test/java/src/org/apache/qetest/xslwrapper TraxWrapper.java
Log:
Update from Features.STREAM to StreamSource.FEATURE, et.al.
Revision Changes Path
1.3 +16 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplatesAPITest.java 2000/11/10 01:57:32 1.2
+++ TemplatesAPITest.java 2000/11/15 22:17:27 1.3
@@ -199,6 +199,22 @@
+ processorClassname);
reporter.logInfoMsg(TRAX_PROCESSOR_XSLT + " property is: "
+ System.getProperty(TRAX_PROCESSOR_XSLT));
+ try
+ {
+ TransformerFactory tf = TransformerFactory.newInstance();
+ if (!(tf.getFeature(StreamSource.FEATURE)
+ && tf.getFeature(StreamResult.FEATURE)))
+ { // The rest of this test relies on Streams
+ reporter.logErrorMsg("Streams not supported! Some tests may
be invalid!");
+ }
+ }
+ catch (Throwable t)
+ {
+ reporter.checkFail(
+ "Problem creating factory; Some tests may be invalid!");
+ reporter.logThrowable(reporter.ERRORMSG, t,
+ "Problem creating factory; Some tests may
be invalid!");
+ }
return true;
}
1.5 +3 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransformerAPITest.java 2000/11/14 14:49:40 1.4
+++ TransformerAPITest.java 2000/11/15 22:17:27 1.5
@@ -228,9 +228,10 @@
try
{
TransformerFactory tf = TransformerFactory.newInstance();
- if (!tf.getFeature(Features.STREAM))
+ if (!(tf.getFeature(StreamSource.FEATURE)
+ && tf.getFeature(StreamResult.FEATURE)))
{ // The rest of this test relies on Streams only
- reporter.logErrorMsg("Features.STREAM not supported! Some
tests may be invalid!");
+ reporter.logErrorMsg("Streams not supported! Some tests may
be invalid!");
}
}
catch (Exception e)
1.2 +4 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamSourceAPITest.java 2000/11/14 19:56:26 1.1
+++ StreamSourceAPITest.java 2000/11/15 22:17:28 1.2
@@ -92,7 +92,7 @@
/**
* API Coverage test for the StreamSource class of TRAX..
* @author [EMAIL PROTECTED]
- * @version $Id: StreamSourceAPITest.java,v 1.1 2000/11/14 19:56:26 curcuru
Exp $
+ * @version $Id: StreamSourceAPITest.java,v 1.2 2000/11/15 22:17:28 curcuru
Exp $
*/
public class StreamSourceAPITest extends XSLProcessorTestBase
{
@@ -155,9 +155,10 @@
try
{
TransformerFactory tf = TransformerFactory.newInstance();
- if (!tf.getFeature(Features.STREAM))
+ if (!(tf.getFeature(StreamSource.FEATURE)
+ && tf.getFeature(StreamResult.FEATURE)))
{ // The rest of this test relies on Streams
- reporter.logErrorMsg("Features.STREAM not supported! Some
tests may be invalid!");
+ reporter.logErrorMsg("Streams not supported! Some tests may
be invalid!");
}
}
catch (Throwable t)
1.4 +5 -4
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java
Index: TraxWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraxWrapper.java 2000/11/10 20:55:54 1.3
+++ TraxWrapper.java 2000/11/15 22:17:28 1.4
@@ -97,7 +97,7 @@
* @todo share constants between TraxWrapper, SaxonWrapper
* @todo document how we perform various types of transforms
* @author Shane Curcuru
- * @version $Id: TraxWrapper.java,v 1.3 2000/11/10 20:55:54 sboag Exp $
+ * @version $Id: TraxWrapper.java,v 1.4 2000/11/15 22:17:28 curcuru Exp $
*/
public class TraxWrapper extends ProcessorWrapper
{
@@ -397,11 +397,12 @@
String xmlSource, String xslStylesheet, OutputStream
resultStream)
throws java.lang.Exception // Cover all exception cases
{
- if (!processor.getFeature(Features.DOM))
+ if (!(processor.getFeature(DOMSource.FEATURE)
+ && processor.getFeature(DOMResult.FEATURE)))
{
- // If DOMs are not supported, then bail
+ // If DOMs are not supported in either input (Sources)
+ // or output (Results), then bail
return ERROR;
-
}
long endTime = 0;
long startTime = System.currentTimeMillis();
