mkwan 2003/01/31 07:47:24
Modified: test/java/src/org/apache/qetest ConsoleLogger.java
DirFilter.java ExecTestlet.java FileBasedTest.java
FileDataletManager.java FilePatternFilter.java
FileTestlet.java FileTestletDriver.java
IncludeExcludeFilter.java
LinebyLineCheckService.java Reporter.java
SimpleFileCheckService.java TestletImpl.java
XMLFileLogger.java
test/java/src/org/apache/qetest/dtm QeDtmUtils.java
TestDTM.java TestDTMIter.java TestDTMIterator.java
TestDTMTrav.java TestDTMTraverser.java
TimeDTMIterDeep.java TimeDTMIterator.java
TimeDTMTravDeep.java TimeDTMTraverser.java
dtmWSStripper.java
test/java/src/org/apache/qetest/trax
EmbeddedStylesheetTest.java
ErrorListenerAPITest.java ErrorListenerTest.java
ExamplesTest.java LoggingErrorListener.java
LoggingURIResolver.java Minitest.java
OutputPropertiesTest.java ParameterTest.java
REPLACE_template_for_new_tests.java
SystemIdImpInclTest.java SystemIdTest.java
TemplatesAPITest.java TestMultiTypeThreads.java
TestThreads.java TransformerAPITest.java
TransformerFactoryAPITest.java URIResolverTest.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
test/java/src/org/apache/qetest/xalanj2 DTMDumpTest.java
FactoryFeatureTest.java
LoggingPrintTraceListener.java
LoggingTraceListener.java
LoggingTraceListenerEx.java
LoggingTransformState.java OutputSettingsTest.java
PrefixResolverAPITest.java ProgrammaticDOMTest.java
SerializedStylesheetTest.java
SmoketestOuttakes.java SystemIDResolverAPITest.java
TestXPathAPI.java TraceListenerTest.java
TransformStateAPITest.java
TransformStateDatalet.java TransformStateTest.java
TransformStateTestlet.java XalanDumper.java
test/java/src/org/apache/qetest/xsl BugzillaFileRules.java
BugzillaTestletDriver.java CmdlineTestlet.java
ConformanceDirRules.java ConformanceFileRules.java
ConformanceXSLFileRules.java
ErrorHandlerTestlet.java ExtensionTestlet.java
GoldFileRules.java LoggingContentHandler.java
LoggingEntityResolver.java
LoggingLexicalHandler.java
LoggingSAXErrorHandler.java MSXSLTestlet.java
PerfEverythingTestlet.java PerfTestlet.java
ResultScanner.java ResultsCompareTestlet.java
StylesheetDatalet.java
StylesheetDataletManager.java StylesheetDriver.java
StylesheetErrorTestlet.java StylesheetTestlet.java
StylesheetTestletDriver.java
StylesheetTestletLocalPaths.java
TestableExtension.java
ThreadedStylesheetDatalet.java
ThreadedStylesheetTestlet.java
ThreadedTestletDriver.java TraxDatalet.java
XHTComparator.java XHTComparatorXSLTC.java
XHTFileCheckService.java
XHTFileCheckServiceXSLTC.java
XSLProcessorTestBase.java XSLTestAntTask.java
XSLTestHarness.java XSLTestfileInfo.java
XalanCTestlet.java
test/java/src/org/apache/qetest/xsltc TimeXSLTCDom.java
test/java/src/org/apache/qetest/xslwrapper
TransformWrapper.java TransformWrapperFactory.java
TraxDOMWrapper.java TraxFileWrapper.java
TraxLocalPathWrapper.java TraxSAXWrapper.java
TraxStreamWrapper.java TraxSystemId3Wrapper.java
TraxSystemIdWrapper.java TraxWrapperUtils.java
XalanProcessWrapper.java XsltcMainWrapper.java
Log:
Patch from Sarah Mcnamara ([EMAIL PROTECTED]) to clean up
unused imports.
Revision Changes Path
1.8 +2 -3
xml-xalan/test/java/src/org/apache/qetest/ConsoleLogger.java
Index: ConsoleLogger.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/ConsoleLogger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConsoleLogger.java 27 Jan 2003 18:32:33 -0000 1.7
+++ ConsoleLogger.java 31 Jan 2003 15:47:15 -0000 1.8
@@ -63,9 +63,8 @@
package org.apache.qetest;
import java.io.PrintStream;
-import java.io.StringWriter;
import java.io.PrintWriter;
-
+import java.io.StringWriter;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
1.4 +1 -2 xml-xalan/test/java/src/org/apache/qetest/DirFilter.java
Index: DirFilter.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/DirFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirFilter.java 27 Jan 2003 18:32:33 -0000 1.3
+++ DirFilter.java 31 Jan 2003 15:47:15 -0000 1.4
@@ -56,7 +56,6 @@
*/
package org.apache.qetest;
-import java.io.FilenameFilter;
import java.io.File;
/**
1.6 +1 -4
xml-xalan/test/java/src/org/apache/qetest/ExecTestlet.java
Index: ExecTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/ExecTestlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExecTestlet.java 27 Jan 2003 18:32:33 -0000 1.5
+++ ExecTestlet.java 31 Jan 2003 15:47:15 -0000 1.6
@@ -59,10 +59,7 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.lang.reflect.Method;
import java.util.Hashtable;
1.5 +0 -4
xml-xalan/test/java/src/org/apache/qetest/FileBasedTest.java
Index: FileBasedTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileBasedTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileBasedTest.java 27 Jan 2003 18:32:33 -0000 1.4
+++ FileBasedTest.java 31 Jan 2003 15:47:15 -0000 1.5
@@ -64,12 +64,8 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
-
import java.util.Enumeration;
import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.Vector;
//-------------------------------------------------------------------------
1.3 +1 -2
xml-xalan/test/java/src/org/apache/qetest/FileDataletManager.java
Index: FileDataletManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileDataletManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileDataletManager.java 27 Jan 2003 18:32:34 -0000 1.2
+++ FileDataletManager.java 31 Jan 2003 15:47:15 -0000 1.3
@@ -62,7 +62,6 @@
import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.Vector;
/**
1.3 +1 -2
xml-xalan/test/java/src/org/apache/qetest/FilePatternFilter.java
Index: FilePatternFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FilePatternFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilePatternFilter.java 27 Jan 2003 18:32:34 -0000 1.2
+++ FilePatternFilter.java 31 Jan 2003 15:47:15 -0000 1.3
@@ -56,7 +56,6 @@
*/
package org.apache.qetest;
-import java.io.FilenameFilter;
import java.io.File;
/**
1.4 +1 -2
xml-xalan/test/java/src/org/apache/qetest/FileTestlet.java
Index: FileTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileTestlet.java 27 Jan 2003 18:32:34 -0000 1.3
+++ FileTestlet.java 31 Jan 2003 15:47:15 -0000 1.4
@@ -58,7 +58,6 @@
package org.apache.qetest;
import java.io.File;
-import java.util.Hashtable;
/**
* Testlet superclass for testing URI or file based resources.
1.7 +1 -4
xml-xalan/test/java/src/org/apache/qetest/FileTestletDriver.java
Index: FileTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/FileTestletDriver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileTestletDriver.java 27 Jan 2003 18:32:35 -0000 1.6
+++ FileTestletDriver.java 31 Jan 2003 15:47:15 -0000 1.7
@@ -57,14 +57,11 @@
package org.apache.qetest;
-///import org.apache.qetest.xsl.XSLProcessorTestBase;
-
import java.io.File;
import java.io.FilenameFilter;
import java.lang.reflect.Constructor;
import java.util.Enumeration;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.Vector;
/**
1.3 +2 -3
xml-xalan/test/java/src/org/apache/qetest/IncludeExcludeFilter.java
Index: IncludeExcludeFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/IncludeExcludeFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncludeExcludeFilter.java 27 Jan 2003 18:32:35 -0000 1.2
+++ IncludeExcludeFilter.java 31 Jan 2003 15:47:15 -0000 1.3
@@ -56,9 +56,8 @@
*/
package org.apache.qetest;
-import java.io.FilenameFilter;
import java.io.File;
-
+import java.io.FilenameFilter;
import java.util.Hashtable;
import java.util.StringTokenizer;
1.5 +3 -3
xml-xalan/test/java/src/org/apache/qetest/LinebyLineCheckService.java
Index: LinebyLineCheckService.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/LinebyLineCheckService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinebyLineCheckService.java 27 Jan 2003 18:32:35 -0000 1.4
+++ LinebyLineCheckService.java 31 Jan 2003 15:47:15 -0000 1.5
@@ -58,9 +58,9 @@
package org.apache.qetest;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.util.Properties;
/**
1.14 +2 -5 xml-xalan/test/java/src/org/apache/qetest/Reporter.java
Index: Reporter.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/Reporter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Reporter.java 27 Jan 2003 18:32:35 -0000 1.13
+++ Reporter.java 31 Jan 2003 15:47:15 -0000 1.14
@@ -66,12 +66,9 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.StringWriter;
-
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-
+import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
1.8 +2 -2
xml-xalan/test/java/src/org/apache/qetest/SimpleFileCheckService.java
Index: SimpleFileCheckService.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/SimpleFileCheckService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleFileCheckService.java 27 Jan 2003 18:32:35 -0000 1.7
+++ SimpleFileCheckService.java 31 Jan 2003 15:47:15 -0000 1.8
@@ -58,8 +58,8 @@
package org.apache.qetest;
import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.File;
+import java.io.FileReader;
import java.util.Properties;
/**
1.3 +2 -2
xml-xalan/test/java/src/org/apache/qetest/TestletImpl.java
Index: TestletImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/TestletImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestletImpl.java 27 Jan 2003 18:32:36 -0000 1.2
+++ TestletImpl.java 31 Jan 2003 15:47:15 -0000 1.3
@@ -62,7 +62,7 @@
*/
package org.apache.qetest;
-import java.lang.reflect.Constructor;
+
/**
* Simple implementation of a testlet, a sort of mini-test.
1.13 +2 -3
xml-xalan/test/java/src/org/apache/qetest/XMLFileLogger.java
Index: XMLFileLogger.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/XMLFileLogger.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLFileLogger.java 27 Jan 2003 18:32:36 -0000 1.12
+++ XMLFileLogger.java 31 Jan 2003 15:47:15 -0000 1.13
@@ -62,13 +62,12 @@
*/
package org.apache.qetest;
-import java.io.File;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-
import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
1.6 +8 -15
xml-xalan/test/java/src/org/apache/qetest/dtm/QeDtmUtils.java
Index: QeDtmUtils.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/QeDtmUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- QeDtmUtils.java 27 Jan 2003 18:32:40 -0000 1.5
+++ QeDtmUtils.java 31 Jan 2003 15:47:16 -0000 1.6
@@ -58,25 +58,18 @@
package org.apache.qetest.dtm;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// java classes
-import java.io.File;
-import java.io.StringReader;
import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Properties;
+import java.io.StringReader;
-// Needed SAX, DOM, JAXP, Xalan classes
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.apache.qetest.Reporter;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.objects.XMLStringFactoryImpl;
/**
1.7 +9 -12
xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTM.java
Index: TestDTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTM.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestDTM.java 27 Jan 2003 18:32:40 -0000 1.6
+++ TestDTM.java 31 Jan 2003 15:47:16 -0000 1.7
@@ -56,24 +56,21 @@
*/
package org.apache.qetest.dtm;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// java classes
import java.io.File;
-import java.io.StringReader;
import java.io.FileOutputStream;
+import java.io.StringReader;
import java.util.Properties;
-// Needed SAX, DOM, JAXP, Xalan classes
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.LinebyLineCheckService;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.objects.XMLStringFactoryImpl;
/**
1.9 +11 -12
xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMIter.java
Index: TestDTMIter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMIter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestDTMIter.java 27 Jan 2003 18:32:40 -0000 1.8
+++ TestDTMIter.java 31 Jan 2003 15:47:17 -0000 1.9
@@ -59,24 +59,23 @@
*/
package org.apache.qetest.dtm;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// java classes
import java.io.File;
-import java.io.StringReader;
import java.io.FileOutputStream;
+import java.io.StringReader;
import java.util.Properties;
-// Needed SAX, DOM, JAXP, Xalan classes
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.LinebyLineCheckService;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.objects.XMLStringFactoryImpl;
//-------------------------------------------------------------------------
1.8 +6 -5
xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMIterator.java
Index: TestDTMIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMIterator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestDTMIterator.java 27 Jan 2003 18:32:41 -0000 1.7
+++ TestDTMIterator.java 31 Jan 2003 15:47:17 -0000 1.8
@@ -57,15 +57,16 @@
package org.apache.qetest.dtm;
import java.io.StringReader;
+
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.objects.XMLStringFactoryImpl;
-
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
/**
1.5 +10 -12
xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMTrav.java
Index: TestDTMTrav.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMTrav.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDTMTrav.java 27 Jan 2003 18:32:41 -0000 1.4
+++ TestDTMTrav.java 31 Jan 2003 15:47:17 -0000 1.5
@@ -59,24 +59,22 @@
*/
package org.apache.qetest.dtm;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// java classes
import java.io.File;
-import java.io.StringReader;
import java.io.FileOutputStream;
+import java.io.StringReader;
import java.util.Properties;
-// Needed SAX, DOM, JAXP, Xalan classes
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.objects.XMLStringFactoryImpl;
//-------------------------------------------------------------------------
1.9 +6 -7
xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMTraverser.java
Index: TestDTMTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TestDTMTraverser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestDTMTraverser.java 27 Jan 2003 18:32:41 -0000 1.8
+++ TestDTMTraverser.java 31 Jan 2003 15:47:17 -0000 1.9
@@ -57,17 +57,16 @@
package org.apache.qetest.dtm;
import java.io.StringReader;
+
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.objects.XMLStringFactoryImpl;
-
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-
-import org.apache.qetest.dtm.dtmWSStripper;
/**
1.5 +5 -10
xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMIterDeep.java
Index: TimeDTMIterDeep.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMIterDeep.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TimeDTMIterDeep.java 27 Jan 2003 18:32:41 -0000 1.4
+++ TimeDTMIterDeep.java 31 Jan 2003 15:47:17 -0000 1.5
@@ -56,20 +56,15 @@
*/
package org.apache.qetest.dtm;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-import org.apache.qetest.dtm.*;
-import org.apache.xml.dtm.*;
-
-// java classes
import java.io.File;
import java.io.FileOutputStream;
import java.util.Properties;
-// Needed SAX, DOM, JAXP, Xalan classes
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
public class TimeDTMIterDeep extends FileBasedTest
1.3 +2 -13
xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMIterator.java
Index: TimeDTMIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TimeDTMIterator.java 27 Jan 2003 18:32:41 -0000 1.2
+++ TimeDTMIterator.java 31 Jan 2003 15:47:17 -0000 1.3
@@ -56,19 +56,8 @@
*/
package org.apache.qetest.dtm;
-import java.io.StringReader;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.xpath.objects.XMLStringFactoryImpl;
-
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-
-import org.apache.qetest.dtm.QeDtmUtils;
-import org.apache.qetest.dtm.dtmWSStripper;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
public class TimeDTMIterator
1.4 +5 -10
xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTravDeep.java
Index: TimeDTMTravDeep.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTravDeep.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimeDTMTravDeep.java 27 Jan 2003 18:32:41 -0000 1.3
+++ TimeDTMTravDeep.java 31 Jan 2003 15:47:17 -0000 1.4
@@ -56,20 +56,15 @@
*/
package org.apache.qetest.dtm;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-import org.apache.qetest.dtm.*;
-import org.apache.xml.dtm.*;
-
-// java classes
import java.io.File;
import java.io.FileOutputStream;
import java.util.Properties;
-// Needed SAX, DOM, JAXP, Xalan classes
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
public class TimeDTMTravDeep extends FileBasedTest
1.4 +2 -13
xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTraverser.java
Index: TimeDTMTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/TimeDTMTraverser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimeDTMTraverser.java 27 Jan 2003 18:32:41 -0000 1.3
+++ TimeDTMTraverser.java 31 Jan 2003 15:47:17 -0000 1.4
@@ -56,19 +56,8 @@
*/
package org.apache.qetest.dtm;
-import java.io.StringReader;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.xpath.objects.XMLStringFactoryImpl;
-
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-
-import org.apache.qetest.dtm.*;
-import org.apache.qetest.dtm.dtmWSStripper;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
/**
1.3 +2 -1
xml-xalan/test/java/src/org/apache/qetest/dtm/dtmWSStripper.java
Index: dtmWSStripper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/dtm/dtmWSStripper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dtmWSStripper.java 27 Jan 2003 18:32:41 -0000 1.2
+++ dtmWSStripper.java 31 Jan 2003 15:47:17 -0000 1.3
@@ -57,7 +57,8 @@
package org.apache.qetest.dtm;
-import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMWSFilter;
/**
* Impl of DTMWSFilter
*
1.5 +14 -30
xml-xalan/test/java/src/org/apache/qetest/trax/EmbeddedStylesheetTest.java
Index: EmbeddedStylesheetTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/EmbeddedStylesheetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbeddedStylesheetTest.java 27 Jan 2003 18:32:42 -0000 1.4
+++ EmbeddedStylesheetTest.java 31 Jan 2003 15:47:17 -0000 1.5
@@ -62,38 +62,22 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-// 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
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
import java.util.Properties;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.4 +3 -11
xml-xalan/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java
Index: ErrorListenerAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorListenerAPITest.java 27 Jan 2003 18:32:42 -0000 1.3
+++ ErrorListenerAPITest.java 31 Jan 2003 15:47:17 -0000 1.4
@@ -62,20 +62,12 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
-// java classes
-import java.io.File;
-import java.util.Properties;
+import org.apache.qetest.FileBasedTest;
//-------------------------------------------------------------------------
1.8 +20 -16
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ErrorListenerTest.java 27 Jan 2003 18:32:42 -0000 1.7
+++ ErrorListenerTest.java 31 Jan 2003 15:47:17 -0000 1.8
@@ -62,28 +62,32 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.LoggingSAXErrorHandler;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.16 +38 -45
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ExamplesTest.java 27 Jan 2003 18:32:42 -0000 1.15
+++ ExamplesTest.java 31 Jan 2003 15:47:17 -0000 1.16
@@ -62,58 +62,51 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Properties;
-// Import all relevant TRAX packages
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Use Xalan's own serializers for SAX ContentHandler output
-import org.apache.xalan.serialize.SerializerFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.apache.xalan.serialize.Serializer;
+import org.apache.xalan.serialize.SerializerFactory;
import org.apache.xalan.templates.OutputProperties;
-
-// Needed SAX, DOM, JAXP classes
-// Needed SAX classes
+import org.w3c.dom.Node;
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.XMLReader;
import org.xml.sax.XMLFilter;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ext.DeclHandler;
-
-// Needed DOM classes
-import org.w3c.dom.Node;
-
-// Needed JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import java.io.BufferedInputStream; // dml
-// java classes
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-// import java.io.FileReader; @DEM - changes for better encoding support
-import java.io.InputStreamReader; //@DEM
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-
-import java.util.Properties;
+import org.xml.sax.XMLReader;
//-------------------------------------------------------------------------
1.5 +4 -3
xml-xalan/test/java/src/org/apache/qetest/trax/LoggingErrorListener.java
Index: LoggingErrorListener.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/LoggingErrorListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggingErrorListener.java 27 Jan 2003 18:32:42 -0000 1.4
+++ LoggingErrorListener.java 31 Jan 2003 15:47:17 -0000 1.5
@@ -62,10 +62,11 @@
*/
package org.apache.qetest.trax;
-import org.apache.qetest.*;
-
import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
+
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
/**
* Cheap-o ErrorListener for use by API tests.
1.6 +6 -8
xml-xalan/test/java/src/org/apache/qetest/trax/LoggingURIResolver.java
Index: LoggingURIResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/LoggingURIResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoggingURIResolver.java 27 Jan 2003 18:32:42 -0000 1.5
+++ LoggingURIResolver.java 31 Jan 2003 15:47:17 -0000 1.6
@@ -62,19 +62,17 @@
*/
package org.apache.qetest.trax;
-import org.apache.qetest.*;
+import java.util.Hashtable;
+
import javax.xml.transform.Source;
-import javax.xml.transform.URIResolver;
import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource;
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
import org.apache.xml.utils.SystemIDResolver;
-
-import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-import java.util.Hashtable;
//-------------------------------------------------------------------------
/**
1.6 +16 -22
xml-xalan/test/java/src/org/apache/qetest/trax/Minitest.java
Index: Minitest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/Minitest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Minitest.java 27 Jan 2003 18:32:43 -0000 1.5
+++ Minitest.java 31 Jan 2003 15:47:17 -0000 1.6
@@ -57,33 +57,27 @@
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-import org.apache.qetest.xslwrapper.TransformWrapperHelper;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-// java classes
import java.io.File;
import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.util.Vector;
+
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.apache.qetest.xslwrapper.TransformWrapper;
+import org.apache.qetest.xslwrapper.TransformWrapperFactory;
+import org.apache.qetest.xslwrapper.TransformWrapperHelper;
/**
* Minitest - developer check-in test for Xalan-J 2.x.
1.5 +18 -18
xml-xalan/test/java/src/org/apache/qetest/trax/OutputPropertiesTest.java
Index: OutputPropertiesTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/OutputPropertiesTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OutputPropertiesTest.java 27 Jan 2003 18:32:43 -0000 1.4
+++ OutputPropertiesTest.java 31 Jan 2003 15:47:17 -0000 1.5
@@ -62,28 +62,28 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-// java classes
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.Enumeration;
import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.w3c.dom.Document;
//-------------------------------------------------------------------------
1.6 +15 -15
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ParameterTest.java 27 Jan 2003 18:32:43 -0000 1.5
+++ ParameterTest.java 31 Jan 2003 15:47:17 -0000 1.6
@@ -62,25 +62,25 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStreamReader;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.Properties;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.4 +5 -14
xml-xalan/test/java/src/org/apache/qetest/trax/REPLACE_template_for_new_tests.java
Index: REPLACE_template_for_new_tests.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/REPLACE_template_for_new_tests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- REPLACE_template_for_new_tests.java 27 Jan 2003 18:32:43 -0000
1.3
+++ REPLACE_template_for_new_tests.java 31 Jan 2003 15:47:17 -0000
1.4
@@ -62,21 +62,12 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.File;
import java.util.Properties;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.12 +27 -28
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SystemIdImpInclTest.java 27 Jan 2003 18:32:43 -0000 1.11
+++ SystemIdImpInclTest.java 31 Jan 2003 15:47:17 -0000 1.12
@@ -62,40 +62,39 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-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;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-// import java.io.FileReader; //@DEM - changes for better encoding
support
-import java.io.InputStreamReader; //@DEM
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.7 +15 -14
xml-xalan/test/java/src/org/apache/qetest/trax/SystemIdTest.java
Index: SystemIdTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/SystemIdTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SystemIdTest.java 27 Jan 2003 18:32:43 -0000 1.6
+++ SystemIdTest.java 31 Jan 2003 15:47:17 -0000 1.7
@@ -62,21 +62,22 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.File;
import java.util.Properties;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.11 +12 -31
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TemplatesAPITest.java 27 Jan 2003 18:32:43 -0000 1.10
+++ TemplatesAPITest.java 31 Jan 2003 15:47:17 -0000 1.11
@@ -62,39 +62,20 @@
*/
package org.apache.qetest.trax;
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.stream.*; // We assume Features.STREAM for
some tests
-
-// Needed SAX classes
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.Parser;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.XMLReader;
-
-// Needed DOM classes
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-// javax JAXP classes for parser pluggability
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-// java classes
import java.io.File;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringWriter;
import java.util.Properties;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.8 +18 -30
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestMultiTypeThreads.java 27 Jan 2003 18:32:43 -0000 1.7
+++ TestMultiTypeThreads.java 31 Jan 2003 15:47:17 -0000 1.8
@@ -62,47 +62,35 @@
*/
package org.apache.qetest.trax;
-import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Reader;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.OutputStream;
-
+import java.io.FileWriter;
+import java.io.PrintWriter;
import java.util.Properties;
-import java.util.StringTokenizer;
-
-// Needed SAX classes
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-// Needed DOM classes
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-// For optional URI/URLs instead of string filenames
-import java.net.URL;
-import java.net.MalformedURLException;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-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;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// HACK: Use Xalan's Serializers - should be changed
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.SAXException;
//-------------------------------------------------------------------------
1.6 +9 -21
xml-xalan/test/java/src/org/apache/qetest/trax/TestThreads.java
Index: TestThreads.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/TestThreads.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestThreads.java 27 Jan 2003 18:32:43 -0000 1.5
+++ TestThreads.java 31 Jan 2003 15:47:17 -0000 1.6
@@ -62,32 +62,20 @@
*/
package org.apache.qetest.trax;
-import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Reader;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.OutputStream;
-
+import java.io.FileWriter;
+import java.io.PrintWriter;
import java.util.Properties;
-import java.util.StringTokenizer;
-
-// Needed SAX classes
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-// For optional URI/URLs instead of string filenames
-import java.net.URL;
-import java.net.MalformedURLException;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.stream.*; // We assume Features.STREAM for
some tests
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
//-------------------------------------------------------------------------
/**
1.19 +20 -23
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TransformerAPITest.java 27 Jan 2003 18:32:43 -0000 1.18
+++ TransformerAPITest.java 31 Jan 2003 15:47:17 -0000 1.19
@@ -57,33 +57,30 @@
package org.apache.qetest.trax;
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.stream.*; // We assume Features.STREAM for
some tests
-
-// javax JAXP classes for parser pluggability
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-// Needed SAX classes
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.Parser;
-
-// Needed DOM classes
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-// java classes
import java.io.File;
import java.io.FileOutputStream;
import java.util.Enumeration;
-import java.util.Properties;
import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.TestletImpl;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.10 +19 -15
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TransformerFactoryAPITest.java 27 Jan 2003 18:32:44 -0000 1.9
+++ TransformerFactoryAPITest.java 31 Jan 2003 15:47:17 -0000 1.10
@@ -62,25 +62,29 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.stream.*;
-import javax.xml.transform.dom.DOMSource;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.w3c.dom.Document;
-
-// java classes
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.8 +13 -21
xml-xalan/test/java/src/org/apache/qetest/trax/URIResolverTest.java
Index: URIResolverTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/trax/URIResolverTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- URIResolverTest.java 27 Jan 2003 18:32:44 -0000 1.7
+++ URIResolverTest.java 31 Jan 2003 15:47:18 -0000 1.8
@@ -62,28 +62,20 @@
*/
package org.apache.qetest.trax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.SAXParserFactory;
-
-// Needed SAX, DOM, JAXP classes
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.w3c.dom.Node;
-
-// java classes
import java.io.File;
-import java.io.FilenameFilter;
import java.util.Properties;
+
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.10 +15 -16
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMResultAPITest.java 27 Jan 2003 18:32:45 -0000 1.9
+++ DOMResultAPITest.java 31 Jan 2003 15:47:18 -0000 1.10
@@ -62,26 +62,25 @@
*/
package org.apache.qetest.trax.dom;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
-// Needed SAX, DOM, JAXP classes
-import org.xml.sax.InputSource;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Properties;
+import org.xml.sax.InputSource;
//-------------------------------------------------------------------------
1.12 +15 -16
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMSourceAPITest.java 27 Jan 2003 18:32:45 -0000 1.11
+++ DOMSourceAPITest.java 31 Jan 2003 15:47:18 -0000 1.12
@@ -62,26 +62,25 @@
*/
package org.apache.qetest.trax.dom;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
-// Needed SAX, DOM, JAXP classes
-import org.xml.sax.InputSource;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Properties;
+import org.xml.sax.InputSource;
//-------------------------------------------------------------------------
1.9 +26 -23
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXResultAPITest.java 27 Jan 2003 18:32:45 -0000 1.8
+++ SAXResultAPITest.java 31 Jan 2003 15:47:19 -0000 1.9
@@ -62,32 +62,35 @@
*/
package org.apache.qetest.trax.sax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.DocumentBuilder; // for testCase3
-import javax.xml.parsers.DocumentBuilderFactory; // for testCase3
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.LoggingContentHandler;
+import org.apache.qetest.xsl.LoggingLexicalHandler;
+import org.apache.qetest.xsl.XSLTestfileInfo;
+import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
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
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.7 +15 -21
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SAXSourceAPITest.java 27 Jan 2003 18:32:45 -0000 1.6
+++ SAXSourceAPITest.java 31 Jan 2003 15:47:19 -0000 1.7
@@ -62,32 +62,26 @@
*/
package org.apache.qetest.trax.sax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Properties;
-// 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.*;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.stream.StreamResult;
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.11 +22 -21
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SAXTransformerFactoryAPITest.java 27 Jan 2003 18:32:45 -0000 1.10
+++ SAXTransformerFactoryAPITest.java 31 Jan 2003 15:47:19 -0000 1.11
@@ -62,36 +62,37 @@
*/
package org.apache.qetest.trax.sax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-import org.apache.qetest.trax.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.trax.LoggingErrorListener;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
-
-// java classes
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.9 +20 -22
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TemplatesHandlerAPITest.java 27 Jan 2003 18:32:45 -0000 1.8
+++ TemplatesHandlerAPITest.java 31 Jan 2003 15:47:19 -0000 1.9
@@ -62,32 +62,30 @@
*/
package org.apache.qetest.trax.sax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Properties;
-// 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.*;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// Needed SAX, DOM, JAXP classes
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.7 +18 -24
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TransformerHandlerAPITest.java 27 Jan 2003 18:32:45 -0000 1.6
+++ TransformerHandlerAPITest.java 31 Jan 2003 15:47:19 -0000 1.7
@@ -62,31 +62,25 @@
*/
package org.apache.qetest.trax.sax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
-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
import java.io.File;
-import java.io.FileOutputStream;
import java.util.Properties;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.4 +15 -24
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformerHandlerTest.java 27 Jan 2003 18:32:45 -0000 1.3
+++ TransformerHandlerTest.java 31 Jan 2003 15:47:19 -0000 1.4
@@ -62,31 +62,22 @@
*/
package org.apache.qetest.trax.sax;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.*;
-
-// Needed SAX, DOM, JAXP classes
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
-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
import java.io.File;
-import java.io.FileOutputStream;
import java.util.Properties;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
//-------------------------------------------------------------------------
1.8 +16 -20
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StreamResultAPITest.java 27 Jan 2003 18:32:46 -0000 1.7
+++ StreamResultAPITest.java 31 Jan 2003 15:47:19 -0000 1.8
@@ -62,35 +62,31 @@
*/
package org.apache.qetest.trax.stream;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.trax.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.ByteArrayOutputStream;
import java.io.CharArrayWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintStream;
-import java.io.Writer;
import java.io.StringWriter;
-import java.net.URL;
+import java.io.Writer;
import java.util.Properties;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.Reporter;
+import org.apache.qetest.xsl.XHTFileCheckService;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.9 +13 -17
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StreamSourceAPITest.java 27 Jan 2003 18:32:46 -0000 1.8
+++ StreamSourceAPITest.java 31 Jan 2003 15:47:19 -0000 1.9
@@ -62,30 +62,26 @@
*/
package org.apache.qetest.trax.stream;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.trax.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
-import java.net.URL;
import java.util.Properties;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.4 +14 -25
xml-xalan/test/java/src/org/apache/qetest/xalanj2/DTMDumpTest.java
Index: DTMDumpTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/DTMDumpTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DTMDumpTest.java 27 Jan 2003 18:32:46 -0000 1.3
+++ DTMDumpTest.java 31 Jan 2003 15:47:19 -0000 1.4
@@ -62,34 +62,23 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
-// Relevant Xalan-J 2.x classes
-import org.apache.xalan.processor.TransformerFactoryImpl;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.TraxDatalet;
import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.apache.xml.dtm.ref.DTMNodeProxy;
import org.apache.xpath.NodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNumber;
-
-// Needed SAX, DOM, JAXP classes
-import org.w3c.dom.*;
+import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
-
-// java classes
-import java.io.File;
-import java.util.Properties;
-import java.util.Vector;
//-------------------------------------------------------------------------
1.4 +11 -17
xml-xalan/test/java/src/org/apache/qetest/xalanj2/FactoryFeatureTest.java
Index: FactoryFeatureTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/FactoryFeatureTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FactoryFeatureTest.java 27 Jan 2003 18:32:46 -0000 1.3
+++ FactoryFeatureTest.java 31 Jan 2003 15:47:19 -0000 1.4
@@ -62,25 +62,19 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Relevant Xalan-J 2.x classes
-import org.apache.xalan.processor.TransformerFactoryImpl;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.File;
import java.util.Properties;
import java.util.Vector;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.TraxDatalet;
+import org.apache.xalan.processor.TransformerFactoryImpl;
//-------------------------------------------------------------------------
1.3 +10 -16
xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingPrintTraceListener.java
Index: LoggingPrintTraceListener.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingPrintTraceListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingPrintTraceListener.java 27 Jan 2003 18:32:46 -0000 1.2
+++ LoggingPrintTraceListener.java 31 Jan 2003 15:47:19 -0000 1.3
@@ -61,25 +61,19 @@
*
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.*;
-
-import java.io.IOException;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.apache.xalan.trace.PrintTraceListener;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TracerEvent;
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.Constants;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.utils.QName;
+import org.apache.xalan.trace.GenerateEvent;
+import org.apache.xalan.trace.PrintTraceListener;
+import org.apache.xalan.trace.SelectionEvent;
+import org.apache.xalan.trace.TracerEvent;
import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.XPath;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
/**
* Logging TraceListener interface.
1.7 +10 -15
xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingTraceListener.java
Index: LoggingTraceListener.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingTraceListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoggingTraceListener.java 27 Jan 2003 18:32:46 -0000 1.6
+++ LoggingTraceListener.java 31 Jan 2003 15:47:19 -0000 1.7
@@ -61,26 +61,21 @@
*
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.*;
-
-import java.io.IOException;
import java.util.Hashtable;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.apache.xalan.trace.TraceListener;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TracerEvent;
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.Constants;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.utils.QName;
+import org.apache.xalan.trace.GenerateEvent;
+import org.apache.xalan.trace.SelectionEvent;
+import org.apache.xalan.trace.TraceListener;
+import org.apache.xalan.trace.TracerEvent;
import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.XPath;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
/**
* Logging TraceListener interface.
1.3 +6 -19
xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingTraceListenerEx.java
Index: LoggingTraceListenerEx.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingTraceListenerEx.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingTraceListenerEx.java 27 Jan 2003 18:32:46 -0000 1.2
+++ LoggingTraceListenerEx.java 31 Jan 2003 15:47:19 -0000 1.3
@@ -61,28 +61,15 @@
*
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.*;
-
-import java.io.IOException;
import java.util.Hashtable;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.apache.xalan.trace.TraceListener;
-import org.apache.xalan.trace.TraceListenerEx;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.EndSelectionEvent;
-import org.apache.xalan.trace.TracerEvent;
-import org.apache.xalan.templates.ElemTemplate;
+import org.apache.qetest.Logger;
import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.Constants;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.utils.QName;
+import org.apache.xalan.trace.EndSelectionEvent;
+import org.apache.xalan.trace.TraceListenerEx;
import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.XPath;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
/**
* Logging TraceListenerEx interface.
1.3 +10 -13
xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingTransformState.java
Index: LoggingTransformState.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/LoggingTransformState.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingTransformState.java 27 Jan 2003 18:32:46 -0000 1.2
+++ LoggingTransformState.java 31 Jan 2003 15:47:19 -0000 1.3
@@ -62,23 +62,20 @@
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.*;
-import java.io.IOException;
+import java.lang.reflect.Method;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.transformer.TransformerClient;
+import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformState;
+import org.apache.xalan.transformer.TransformerClient;
import org.apache.xpath.XPath;
import org.w3c.dom.Node;
-
-import java.lang.reflect.Method;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
/**
1.4 +14 -21
xml-xalan/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java
Index: OutputSettingsTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OutputSettingsTest.java 27 Jan 2003 18:32:46 -0000 1.3
+++ OutputSettingsTest.java 31 Jan 2003 15:47:19 -0000 1.4
@@ -62,28 +62,21 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-
-// Needed SAX, DOM, JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-// java classes
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.Enumeration;
import java.util.Properties;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.5 +6 -12
xml-xalan/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java
Index: PrefixResolverAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PrefixResolverAPITest.java 27 Jan 2003 18:32:46 -0000 1.4
+++ PrefixResolverAPITest.java 31 Jan 2003 15:47:19 -0000 1.5
@@ -56,25 +56,19 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.StringReader;
+import java.util.Properties;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.PrefixResolverDefault;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Attr;
+import org.apache.qetest.FileBasedTest;
+import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.PrefixResolverDefault;
import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-
-import java.io.StringReader;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.5 +14 -14
xml-xalan/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java
Index: ProgrammaticDOMTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProgrammaticDOMTest.java 27 Jan 2003 18:32:46 -0000 1.4
+++ ProgrammaticDOMTest.java 31 Jan 2003 15:47:19 -0000 1.5
@@ -62,28 +62,28 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
-// Needed SAX, DOM, JAXP classes
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-
-// java classes
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.5 +13 -10
xml-xalan/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java
Index: SerializedStylesheetTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SerializedStylesheetTest.java 27 Jan 2003 18:32:46 -0000 1.4
+++ SerializedStylesheetTest.java 31 Jan 2003 15:47:19 -0000 1.5
@@ -62,21 +62,24 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.stream.*;
-
-// java classes
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Properties;
+
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.xsl.XSLTestfileInfo;
//-------------------------------------------------------------------------
1.8 +38 -36
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SmoketestOuttakes.java 27 Jan 2003 18:32:46 -0000 1.7
+++ SmoketestOuttakes.java 31 Jan 2003 15:47:19 -0000 1.8
@@ -62,48 +62,50 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.trax.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-// Use Xalan's own serializers for SAX ContentHandler output
-import org.apache.xalan.serialize.SerializerFactory;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.trax.LoggingErrorListener;
+import org.apache.qetest.trax.LoggingURIResolver;
+import org.apache.qetest.xsl.LoggingSAXErrorHandler;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.apache.xalan.serialize.Serializer;
+import org.apache.xalan.serialize.SerializerFactory;
import org.apache.xalan.templates.OutputProperties;
-
-// 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.XMLReader;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ext.DeclHandler;
-
-// Needed DOM classes
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
-// java classes
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.IOException;
-import java.util.Properties;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
//-------------------------------------------------------------------------
1.4 +2 -6
xml-xalan/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java
Index: SystemIDResolverAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SystemIDResolverAPITest.java 27 Jan 2003 18:32:46 -0000 1.3
+++ SystemIDResolverAPITest.java 31 Jan 2003 15:47:19 -0000 1.4
@@ -56,12 +56,8 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
+import org.apache.qetest.FileBasedTest;
import org.apache.xml.utils.SystemIDResolver;
-import java.util.Properties;
/**
* Functionality/system/integration tests for SystemIDResolver.
1.9 +12 -19
xml-xalan/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java
Index: TestXPathAPI.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestXPathAPI.java 27 Jan 2003 18:32:46 -0000 1.8
+++ TestXPathAPI.java 31 Jan 2003 15:47:19 -0000 1.9
@@ -63,40 +63,33 @@
*/
package org.apache.qetest.xalanj2;
-// import common testing framework stuff
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// java classes
import java.io.File;
import java.io.FileInputStream;
import java.util.Properties;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.XSLTestfileInfo;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMManager;
import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.XPathAPI;
-
+import org.apache.xpath.objects.XObject;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.traversal.NodeIterator;
-import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
-
-// JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
/**
* Basic functionality test of the public XPathAPI methods.
1.8 +11 -17
xml-xalan/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java
Index: TraceListenerTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TraceListenerTest.java 27 Jan 2003 18:32:46 -0000 1.7
+++ TraceListenerTest.java 31 Jan 2003 15:47:19 -0000 1.8
@@ -62,27 +62,21 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-import org.apache.qetest.trax.LoggingErrorListener;
+import java.io.File;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.xsl.TraxDatalet;
import org.apache.xalan.trace.TraceListener;
-import org.apache.xalan.trace.TraceListenerEx;
import org.apache.xalan.trace.TraceManager;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.XalanProperties;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
-import java.io.File;
-import java.util.Properties;
//-------------------------------------------------------------------------
1.8 +17 -24
xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateAPITest.java
Index: TransformStateAPITest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateAPITest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransformStateAPITest.java 27 Jan 2003 18:32:46 -0000 1.7
+++ TransformStateAPITest.java 31 Jan 2003 15:47:19 -0000 1.8
@@ -62,40 +62,33 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Properties;
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
-// Needed Xalan-J 2.x specific classes
-import org.apache.xalan.templates.ElemLiteralResult;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
+import org.apache.qetest.OutputNameManager;
+import org.apache.qetest.Reporter;
+import org.apache.qetest.XMLFileLogger;
+import org.apache.qetest.xsl.TraxDatalet;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformState;
import org.apache.xalan.transformer.TransformerClient;
-import org.apache.xpath.XPath;
-import org.apache.xml.utils.QName;
-
-// Needed SAX, DOM, JAXP classes
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-
-// java classes
-import java.io.File;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.lang.reflect.Method;
//-------------------------------------------------------------------------
1.3 +3 -4
xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateDatalet.java
Index: TransformStateDatalet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateDatalet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransformStateDatalet.java 27 Jan 2003 18:32:46 -0000 1.2
+++ TransformStateDatalet.java 31 Jan 2003 15:47:19 -0000 1.3
@@ -62,11 +62,10 @@
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.Datalet;
-
import java.util.Hashtable;
import java.util.Properties;
-import java.util.StringTokenizer;
+
+import org.apache.qetest.Datalet;
/**
* Datalet for holding ExpectedTransformState objects.
1.4 +4 -12
xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java
Index: TransformStateTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformStateTest.java 27 Jan 2003 18:32:46 -0000 1.3
+++ TransformStateTest.java 31 Jan 2003 15:47:19 -0000 1.4
@@ -62,20 +62,12 @@
*/
package org.apache.qetest.xalanj2;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xsl.*;
-
-// Import all relevant TRAX packages
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-
-// Needed SAX, DOM, JAXP classes
-
-// java classes
import java.io.File;
import java.util.Properties;
import java.util.Vector;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
//-------------------------------------------------------------------------
1.3 +12 -19
xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateTestlet.java
Index: TransformStateTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/TransformStateTestlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransformStateTestlet.java 27 Jan 2003 18:32:46 -0000 1.2
+++ TransformStateTestlet.java 31 Jan 2003 15:47:19 -0000 1.3
@@ -62,36 +62,29 @@
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.*;
+import java.util.Hashtable;
-import javax.xml.transform.*;
-import javax.xml.transform.stream.*;
-import javax.xml.transform.sax.*;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-// Needed Xalan-J 2.x specific classes
-import org.apache.xalan.templates.ElemLiteralResult;
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.TestletImpl;
+import org.apache.qetest.XMLFileLogger;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformState;
import org.apache.xalan.transformer.TransformerClient;
-import org.apache.xpath.XPath;
-import org.apache.xml.utils.QName;
-
-// Needed SAX, DOM, JAXP classes
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Hashtable;
/**
* Testlet for testing TransformState of a stylesheet.
1.7 +11 -18
xml-xalan/test/java/src/org/apache/qetest/xalanj2/XalanDumper.java
Index: XalanDumper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xalanj2/XalanDumper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanDumper.java 27 Jan 2003 18:32:46 -0000 1.6
+++ XalanDumper.java 31 Jan 2003 15:47:19 -0000 1.7
@@ -56,31 +56,24 @@
*/
package org.apache.qetest.xalanj2;
-import org.apache.qetest.*;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.Properties;
import javax.xml.transform.Transformer;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TracerEvent;
+
+import org.apache.xalan.templates.ElemLiteralResult;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.Constants;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xml.utils.QName;
import org.apache.xpath.XPath;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Properties;
-import java.lang.reflect.Method;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Static utility for dumping info about common Xalan objects.
1.4 +2 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/BugzillaFileRules.java
Index: BugzillaFileRules.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/BugzillaFileRules.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BugzillaFileRules.java 27 Jan 2003 18:32:50 -0000 1.3
+++ BugzillaFileRules.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -56,9 +56,8 @@
*/
package org.apache.qetest.xsl;
-import java.io.FilenameFilter;
import java.io.File;
-
+import java.io.FilenameFilter;
import java.util.Hashtable;
import java.util.StringTokenizer;
1.6 +6 -11
xml-xalan/test/java/src/org/apache/qetest/xsl/BugzillaTestletDriver.java
Index: BugzillaTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/BugzillaTestletDriver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BugzillaTestletDriver.java 27 Jan 2003 18:32:50 -0000 1.5
+++ BugzillaTestletDriver.java 31 Jan 2003 15:47:21 -0000 1.6
@@ -62,23 +62,18 @@
*/
package org.apache.qetest.xsl;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-// java classes
-import java.io.BufferedReader;
import java.io.File;
import java.io.FilenameFilter;
-import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.Testlet;
//-------------------------------------------------------------------------
1.4 +6 -13
xml-xalan/test/java/src/org/apache/qetest/xsl/CmdlineTestlet.java
Index: CmdlineTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/CmdlineTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CmdlineTestlet.java 27 Jan 2003 18:32:50 -0000 1.3
+++ CmdlineTestlet.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -62,22 +62,15 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.CheckService;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.Logger;
-import org.apache.qetest.QetestFactory;
-import org.apache.qetest.QetestUtils;
-import org.apache.qetest.TestletImpl;
-import org.apache.qetest.ThreadedStreamReader;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.Hashtable;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
+import org.apache.qetest.ThreadedStreamReader;
+import org.apache.qetest.xslwrapper.TransformWrapper;
/**
* Testlet for conformance testing of xsl stylesheet files using
1.4 +2 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceDirRules.java
Index: ConformanceDirRules.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceDirRules.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConformanceDirRules.java 27 Jan 2003 18:32:50 -0000 1.3
+++ ConformanceDirRules.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -56,9 +56,8 @@
*/
package org.apache.qetest.xsl;
-import java.io.FilenameFilter;
import java.io.File;
-
+import java.io.FilenameFilter;
import java.util.Hashtable;
import java.util.StringTokenizer;
1.3 +2 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceFileRules.java
Index: ConformanceFileRules.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceFileRules.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConformanceFileRules.java 27 Jan 2003 18:32:50 -0000 1.2
+++ ConformanceFileRules.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -56,9 +56,8 @@
*/
package org.apache.qetest.xsl;
-import java.io.FilenameFilter;
import java.io.File;
-
+import java.io.FilenameFilter;
import java.util.Hashtable;
import java.util.StringTokenizer;
1.3 +2 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceXSLFileRules.java
Index: ConformanceXSLFileRules.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ConformanceXSLFileRules.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConformanceXSLFileRules.java 27 Jan 2003 18:32:50 -0000 1.2
+++ ConformanceXSLFileRules.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -56,9 +56,8 @@
*/
package org.apache.qetest.xsl;
-import java.io.FilenameFilter;
import java.io.File;
-
+import java.io.FilenameFilter;
import java.util.Hashtable;
import java.util.StringTokenizer;
1.4 +6 -17
xml-xalan/test/java/src/org/apache/qetest/xsl/ErrorHandlerTestlet.java
Index: ErrorHandlerTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ErrorHandlerTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorHandlerTestlet.java 27 Jan 2003 18:32:50 -0000 1.3
+++ ErrorHandlerTestlet.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -57,29 +57,18 @@
package org.apache.qetest.xsl;
-import org.apache.qetest.CheckService;
+import java.lang.reflect.Constructor;
+
+import javax.xml.transform.ErrorListener;
+
import org.apache.qetest.Datalet;
import org.apache.qetest.Logger;
import org.apache.qetest.LoggingHandler;
import org.apache.qetest.QetestUtils;
-import org.apache.qetest.TestletImpl;
import org.apache.qetest.trax.LoggingErrorListener;
import org.apache.qetest.xslwrapper.TransformWrapper;
import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-import org.apache.qetest.xslwrapper.TraxWrapperUtils; // semi-HACK: should
make this more generic
-
-import javax.xml.transform.ErrorListener;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.lang.reflect.Constructor;
+import org.apache.qetest.xslwrapper.TraxWrapperUtils;
/**
* Testlet for testing of xsl stylesheets using a custom
1.4 +4 -16
xml-xalan/test/java/src/org/apache/qetest/xsl/ExtensionTestlet.java
Index: ExtensionTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ExtensionTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtensionTestlet.java 27 Jan 2003 18:32:50 -0000 1.3
+++ ExtensionTestlet.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -62,23 +62,11 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.CheckService;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.Logger;
-import org.apache.qetest.QetestUtils;
-import org.apache.qetest.TestletImpl;
-import org.apache.qetest.xsl.StylesheetDatalet;
-import org.apache.qetest.xsl.StylesheetTestlet;
-import org.apache.qetest.xsl.XHTFileCheckService;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.lang.reflect.Method;
-import java.util.Hashtable;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
/**
* Testlet for testing xsl stylesheet extensions.
1.3 +1 -4
xml-xalan/test/java/src/org/apache/qetest/xsl/GoldFileRules.java
Index: GoldFileRules.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/GoldFileRules.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GoldFileRules.java 27 Jan 2003 18:32:50 -0000 1.2
+++ GoldFileRules.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -56,11 +56,8 @@
*/
package org.apache.qetest.xsl;
-import java.io.FilenameFilter;
import java.io.File;
-
import java.util.Hashtable;
-import java.util.StringTokenizer;
/**
* Simple file filter; returns *.xsl non-dir files that start with the
directory name.
1.4 +3 -6
xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingContentHandler.java
Index: LoggingContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingContentHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoggingContentHandler.java 27 Jan 2003 18:32:50 -0000 1.3
+++ LoggingContentHandler.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -62,13 +62,10 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-import java.io.IOException;
-
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.3 +2 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingEntityResolver.java
Index: LoggingEntityResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingEntityResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingEntityResolver.java 27 Jan 2003 18:32:50 -0000 1.2
+++ LoggingEntityResolver.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -62,10 +62,9 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-
import java.io.IOException;
+import org.apache.qetest.Reporter;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.4 +2 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingLexicalHandler.java
Index: LoggingLexicalHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingLexicalHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoggingLexicalHandler.java 27 Jan 2003 18:32:50 -0000 1.3
+++ LoggingLexicalHandler.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -62,9 +62,8 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.LoggingHandler;
import org.apache.qetest.Logger;
-
+import org.apache.qetest.LoggingHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
1.4 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingSAXErrorHandler.java
Index: LoggingSAXErrorHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/LoggingSAXErrorHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoggingSAXErrorHandler.java 27 Jan 2003 18:32:50 -0000 1.3
+++ LoggingSAXErrorHandler.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -62,8 +62,8 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-
+import org.apache.qetest.Logger;
+import org.apache.qetest.LoggingHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
1.3 +4 -15
xml-xalan/test/java/src/org/apache/qetest/xsl/MSXSLTestlet.java
Index: MSXSLTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/MSXSLTestlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MSXSLTestlet.java 27 Jan 2003 18:32:50 -0000 1.2
+++ MSXSLTestlet.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -57,22 +57,11 @@
package org.apache.qetest.xsl;
-import org.apache.qetest.CheckService;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.Logger;
-import org.apache.qetest.QetestFactory;
-import org.apache.qetest.QetestUtils;
-import org.apache.qetest.TestletImpl;
-import org.apache.qetest.ThreadedStreamReader;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.Hashtable;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
/**
* Testlet for conformance testing of xsl stylesheet files using
1.8 +8 -5
xml-xalan/test/java/src/org/apache/qetest/xsl/PerfEverythingTestlet.java
Index: PerfEverythingTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/PerfEverythingTestlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PerfEverythingTestlet.java 27 Jan 2003 18:32:50 -0000 1.7
+++ PerfEverythingTestlet.java 31 Jan 2003 15:47:21 -0000 1.8
@@ -61,14 +61,17 @@
*
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Hashtable;
+
+import org.apache.qetest.CheckService;
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
+import org.apache.qetest.TestletImpl;
+import org.apache.qetest.xslwrapper.TransformWrapper;
+import org.apache.qetest.xslwrapper.TransformWrapperFactory;
/**
* Testlet to capture specific timing performance data.
1.8 +6 -6
xml-xalan/test/java/src/org/apache/qetest/xsl/PerfTestlet.java
Index: PerfTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/PerfTestlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PerfTestlet.java 27 Jan 2003 18:32:50 -0000 1.7
+++ PerfTestlet.java 31 Jan 2003 15:47:21 -0000 1.8
@@ -57,15 +57,15 @@
package org.apache.qetest.xsl;
+import java.io.File;
+import java.io.FileInputStream;
+import java.text.DecimalFormat;
+import java.util.Hashtable;
+
import org.apache.qetest.Datalet;
import org.apache.qetest.Logger;
import org.apache.qetest.xslwrapper.TransformWrapper;
import org.apache.qetest.xslwrapper.TransformWrapperHelper;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Hashtable;
-import java.text.DecimalFormat;
/**
* Testlet to capture specific timing performance data.
1.4 +5 -4
xml-xalan/test/java/src/org/apache/qetest/xsl/ResultScanner.java
Index: ResultScanner.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ResultScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResultScanner.java 27 Jan 2003 18:32:50 -0000 1.3
+++ ResultScanner.java 31 Jan 2003 15:47:21 -0000 1.4
@@ -57,16 +57,17 @@
package org.apache.qetest.xsl;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
+import java.io.FilenameFilter;
import java.io.PrintWriter;
+
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
/**
* Scans a directory tree of result.xml and assorted files
1.3 +4 -10
xml-xalan/test/java/src/org/apache/qetest/xsl/ResultsCompareTestlet.java
Index: ResultsCompareTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ResultsCompareTestlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResultsCompareTestlet.java 27 Jan 2003 18:32:50 -0000 1.2
+++ ResultsCompareTestlet.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -62,19 +62,13 @@
*/
package org.apache.qetest.xsl;
+import java.io.File;
+import java.util.Hashtable;
+
import org.apache.qetest.CheckService;
import org.apache.qetest.Datalet;
import org.apache.qetest.Logger;
-import org.apache.qetest.QetestUtils;
-import org.apache.qetest.TestletImpl;
import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Hashtable;
/**
* Testlet for just comparing results of test runs.
1.7 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetDatalet.java
Index: StylesheetDatalet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetDatalet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StylesheetDatalet.java 27 Jan 2003 18:32:50 -0000 1.6
+++ StylesheetDatalet.java 31 Jan 2003 15:47:21 -0000 1.7
@@ -62,11 +62,11 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.Datalet;
-
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
+
+import org.apache.qetest.Datalet;
/**
* Datalet for conformance testing of xsl stylesheet files.
1.6 +3 -6
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetDataletManager.java
Index: StylesheetDataletManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetDataletManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StylesheetDataletManager.java 27 Jan 2003 18:32:50 -0000 1.5
+++ StylesheetDataletManager.java 31 Jan 2003 15:47:21 -0000 1.6
@@ -57,17 +57,14 @@
package org.apache.qetest.xsl;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-
-// java classes
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.apache.qetest.Logger;
/**
* Simple services for getting lists of StylesheetDatalets.
1.3 +4 -14
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetDriver.java
Index: StylesheetDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetDriver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StylesheetDriver.java 27 Jan 2003 18:32:50 -0000 1.2
+++ StylesheetDriver.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -57,22 +57,12 @@
package org.apache.qetest.xsl;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-// java classes
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FilenameFilter;
-import java.io.FileReader;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.apache.qetest.Logger;
+import org.apache.qetest.xslwrapper.TransformWrapperFactory;
/**
* Test driver for running a single XSLT test.
1.5 +4 -14
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetErrorTestlet.java
Index: StylesheetErrorTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetErrorTestlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StylesheetErrorTestlet.java 27 Jan 2003 18:32:51 -0000 1.4
+++ StylesheetErrorTestlet.java 31 Jan 2003 15:47:21 -0000 1.5
@@ -57,23 +57,13 @@
package org.apache.qetest.xsl;
-import org.apache.qetest.CheckService;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.Logger;
-import org.apache.qetest.QetestUtils;
-import org.apache.qetest.TestletImpl;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.Logger;
/**
* Testlet for testing of xsl stylesheets with expected errors.
1.12 +4 -7
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestlet.java
Index: StylesheetTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StylesheetTestlet.java 27 Jan 2003 18:32:51 -0000 1.11
+++ StylesheetTestlet.java 31 Jan 2003 15:47:21 -0000 1.12
@@ -62,6 +62,9 @@
*/
package org.apache.qetest.xsl;
+import java.io.File;
+import java.util.Hashtable;
+
import org.apache.qetest.CheckService;
import org.apache.qetest.Datalet;
import org.apache.qetest.Logger;
@@ -70,12 +73,6 @@
import org.apache.qetest.TestletImpl;
import org.apache.qetest.xslwrapper.TransformWrapper;
import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Hashtable;
/**
* Testlet for conformance testing of xsl stylesheet files.
1.11 +8 -9
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestletDriver.java
Index: StylesheetTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestletDriver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StylesheetTestletDriver.java 27 Jan 2003 18:32:51 -0000 1.10
+++ StylesheetTestletDriver.java 31 Jan 2003 15:47:21 -0000 1.11
@@ -57,22 +57,21 @@
package org.apache.qetest.xsl;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-// java classes
-import java.io.BufferedReader;
import java.io.File;
import java.io.FilenameFilter;
-import java.io.FileReader;
-import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.Testlet;
+import org.apache.qetest.xslwrapper.TransformWrapperFactory;
/**
* Test driver for XSLT stylesheet Testlets.
1.3 +6 -8
xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestletLocalPaths.java
Index: StylesheetTestletLocalPaths.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestletLocalPaths.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StylesheetTestletLocalPaths.java 27 Jan 2003 18:32:51 -0000 1.2
+++ StylesheetTestletLocalPaths.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -62,19 +62,17 @@
*/
package org.apache.qetest.xsl;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Hashtable;
+
import org.apache.qetest.CheckService;
import org.apache.qetest.Datalet;
import org.apache.qetest.Logger;
-import org.apache.qetest.QetestUtils;
import org.apache.qetest.TestletImpl;
import org.apache.qetest.xslwrapper.TransformWrapper;
import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Hashtable;
/**
* Testlet for conformance testing of xsl stylesheet files.
1.3 +1 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/TestableExtension.java
Index: TestableExtension.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/TestableExtension.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestableExtension.java 27 Jan 2003 18:32:51 -0000 1.2
+++ TestableExtension.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -62,8 +62,6 @@
*/
package org.apache.qetest.xsl;
import org.apache.qetest.Logger;
-import org.apache.qetest.CheckService;
-import org.apache.qetest.xsl.StylesheetDatalet;
/**
1.3 +4 -7
xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedStylesheetDatalet.java
Index: ThreadedStylesheetDatalet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedStylesheetDatalet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ThreadedStylesheetDatalet.java 27 Jan 2003 18:32:51 -0000 1.2
+++ ThreadedStylesheetDatalet.java 31 Jan 2003 15:47:21 -0000 1.3
@@ -62,14 +62,11 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-import javax.xml.transform.Templates;
-
import java.util.Hashtable;
import java.util.Properties;
-import java.util.StringTokenizer;
+
+import org.apache.qetest.Datalet;
+import org.apache.qetest.xslwrapper.TransformWrapper;
/**
* Datalet for conformance testing of xsl stylesheet files.
1.6 +3 -8
xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedStylesheetTestlet.java
Index: ThreadedStylesheetTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedStylesheetTestlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ThreadedStylesheetTestlet.java 27 Jan 2003 18:32:51 -0000 1.5
+++ ThreadedStylesheetTestlet.java 31 Jan 2003 15:47:21 -0000 1.6
@@ -62,19 +62,14 @@
*/
package org.apache.qetest.xsl;
+import java.io.File;
+
import org.apache.qetest.CheckService;
import org.apache.qetest.Datalet;
import org.apache.qetest.Logger;
-import org.apache.qetest.QetestUtils;
import org.apache.qetest.TestletImpl;
import org.apache.qetest.xslwrapper.TransformWrapper;
import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Hashtable;
/**
* Testlet for basic thread testing of xsl stylesheet files.
1.6 +7 -16
xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedTestletDriver.java
Index: ThreadedTestletDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedTestletDriver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ThreadedTestletDriver.java 27 Jan 2003 18:32:51 -0000 1.5
+++ ThreadedTestletDriver.java 31 Jan 2003 15:47:22 -0000 1.6
@@ -62,23 +62,14 @@
*/
package org.apache.qetest.xsl;
-// Support for test reporting and harness classes
-import org.apache.qetest.*;
-import org.apache.qetest.xslwrapper.TransformWrapper;
-import org.apache.qetest.xslwrapper.TransformWrapperFactory;
-
-// java classes
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.FileReader;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
-import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.apache.qetest.Logger;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.Reporter;
+import org.apache.qetest.xslwrapper.TransformWrapper;
+import org.apache.qetest.xslwrapper.TransformWrapperFactory;
//-------------------------------------------------------------------------
1.3 +6 -8
xml-xalan/test/java/src/org/apache/qetest/xsl/TraxDatalet.java
Index: TraxDatalet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/TraxDatalet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TraxDatalet.java 27 Jan 2003 18:32:51 -0000 1.2
+++ TraxDatalet.java 31 Jan 2003 15:47:22 -0000 1.3
@@ -62,17 +62,15 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.QetestUtils;
+import java.io.StringReader;
+import java.util.Hashtable;
+import java.util.Properties;
import javax.xml.transform.Source;
-import javax.xml.transform.Result;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.StringReader;
-import java.util.Hashtable;
-import java.util.Properties;
+import org.apache.qetest.Datalet;
+import org.apache.qetest.QetestUtils;
/**
* Datalet for holding TrAX-like Sources and Results.
1.12 +9 -20
xml-xalan/test/java/src/org/apache/qetest/xsl/XHTComparator.java
Index: XHTComparator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTComparator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XHTComparator.java 27 Jan 2003 18:32:52 -0000 1.11
+++ XHTComparator.java 31 Jan 2003 15:47:22 -0000 1.12
@@ -57,38 +57,27 @@
package org.apache.qetest.xsl;
-import org.apache.qetest.Logger; // Only for PASS_RESULT, etc.
-import org.apache.qetest.QetestUtils;
-
-import java.io.PrintWriter;
-import java.io.File;
-import java.io.FileReader;
import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.PrintWriter;
import java.net.URL;
import java.util.Properties;
-import java.util.StringTokenizer;
-// DOM imports
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.qetest.QetestUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
import org.w3c.dom.Text;
-
-// Needed JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-// SAX2 imports
+import org.w3c.tidy.Tidy;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-
-
-// Tidy from w3c for parsing HTML
-import org.w3c.tidy.Tidy;
/**
* Uses an XML/HTML/Text diff comparator to check or diff two files.
1.7 +2 -29
xml-xalan/test/java/src/org/apache/qetest/xsl/XHTComparatorXSLTC.java
Index: XHTComparatorXSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTComparatorXSLTC.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XHTComparatorXSLTC.java 27 Jan 2003 18:32:52 -0000 1.6
+++ XHTComparatorXSLTC.java 31 Jan 2003 15:47:22 -0000 1.7
@@ -57,39 +57,12 @@
package org.apache.qetest.xsl;
-import org.apache.qetest.Logger; // Only for PASS_RESULT, etc.
-import org.apache.qetest.QetestUtils;
-
import java.io.PrintWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.BufferedReader;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
import java.util.Vector;
-import java.util.Properties;
-import java.util.StringTokenizer;
-// DOM imports
import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Text;
-
-// Needed JAXP classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-// SAX2 imports
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+import org.w3c.dom.Node;
/**
* Defines XSLTC's XML/HTML/Text diff comparator to check or diff two files.
1.15 +6 -5
xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java
Index: XHTFileCheckService.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XHTFileCheckService.java 27 Jan 2003 18:32:52 -0000 1.14
+++ XHTFileCheckService.java 31 Jan 2003 15:47:22 -0000 1.15
@@ -62,16 +62,17 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
+
+import org.apache.qetest.CheckService;
+import org.apache.qetest.ConsoleLogger;
+import org.apache.qetest.Logger;
+import org.apache.qetest.XMLFileLogger;
/**
* Uses an XML/HTML/Text diff comparator to check or diff two files.
1.3 +1 -10
xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckServiceXSLTC.java
Index: XHTFileCheckServiceXSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckServiceXSLTC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XHTFileCheckServiceXSLTC.java 27 Jan 2003 18:32:53 -0000 1.2
+++ XHTFileCheckServiceXSLTC.java 31 Jan 2003 15:47:22 -0000 1.3
@@ -62,16 +62,7 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
/**
* Uses XSLTC's XML/HTML/Text diff comparator to check or diff two files.
1.21 +2 -10
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLProcessorTestBase.java
Index: XSLProcessorTestBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLProcessorTestBase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XSLProcessorTestBase.java 27 Jan 2003 18:32:53 -0000 1.20
+++ XSLProcessorTestBase.java 31 Jan 2003 15:47:22 -0000 1.21
@@ -62,15 +62,7 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Vector;
+import org.apache.qetest.FileBasedTest;
/**
1.7 +15 -17
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java
Index: XSLTestAntTask.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTestAntTask.java 27 Jan 2003 18:32:53 -0000 1.6
+++ XSLTestAntTask.java 31 Jan 2003 15:47:22 -0000 1.7
@@ -56,31 +56,29 @@
*/
package org.apache.qetest.xsl;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
+
import org.apache.qetest.FileBasedTest;
import org.apache.qetest.Logger;
-import org.apache.qetest.QetestUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.ExecuteJava;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.PumpStreamHandler;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Environment;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.taskdefs.Execute;
-import org.apache.tools.ant.taskdefs.ExecuteJava;
-import org.apache.tools.ant.taskdefs.LogStreamHandler;
-import org.apache.tools.ant.taskdefs.PumpStreamHandler;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
/**
* Execute an instance of an org.apache.qetest.xsl.XSLProcessorTestBase.
1.9 +6 -6
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestHarness.java
Index: XSLTestHarness.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestHarness.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSLTestHarness.java 27 Jan 2003 18:32:53 -0000 1.8
+++ XSLTestHarness.java 31 Jan 2003 15:47:22 -0000 1.9
@@ -61,17 +61,17 @@
*
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.*;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
+
+import org.apache.qetest.FileBasedTest;
+import org.apache.qetest.Logger;
+import org.apache.qetest.QetestUtils;
+import org.apache.qetest.Reporter;
//-------------------------------------------------------------------------
1.3 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestfileInfo.java
Index: XSLTestfileInfo.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestfileInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTestfileInfo.java 27 Jan 2003 18:32:53 -0000 1.2
+++ XSLTestfileInfo.java 31 Jan 2003 15:47:22 -0000 1.3
@@ -62,10 +62,10 @@
*/
package org.apache.qetest.xsl;
-import org.apache.qetest.TestfileInfo;
-
import java.util.Properties;
import java.util.StringTokenizer;
+
+import org.apache.qetest.TestfileInfo;
/**
* Simple data-holding class specifying info about one 'testfile'.
1.4 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/XalanCTestlet.java
Index: XalanCTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XalanCTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanCTestlet.java 27 Jan 2003 18:32:53 -0000 1.3
+++ XalanCTestlet.java 31 Jan 2003 15:47:22 -0000 1.4
@@ -57,9 +57,9 @@
package org.apache.qetest.xsl;
-import org.apache.qetest.Datalet;
-import org.apache.qetest.Logger;
import java.io.File;
+
+import org.apache.qetest.Datalet;
/**
* Testlet for conformance testing of xsl stylesheet files using
1.3 +18 -31
xml-xalan/test/java/src/org/apache/qetest/xsltc/TimeXSLTCDom.java
Index: TimeXSLTCDom.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsltc/TimeXSLTCDom.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TimeXSLTCDom.java 27 Jan 2003 18:33:07 -0000 1.2
+++ TimeXSLTCDom.java 31 Jan 2003 15:47:24 -0000 1.3
@@ -57,44 +57,31 @@
package org.apache.qetest.xsltc;
-import java.io.StringReader;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
-import java.net.MalformedURLException;
-
-import org.apache.xalan.xsltc.runtime.DefaultSAXOutputHandler;
-import org.apache.xalan.xsltc.runtime.TextOutput;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.DOM;
-
-
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.SAXParser;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Document;
-
+import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.NodeIterator;
+import org.apache.xalan.xsltc.Translet;
+import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.dom.DTDMonitor;
-
-
import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.dom.DOMImpl;
import org.apache.xalan.xsltc.dom.Axis;
-import org.apache.xalan.xsltc.NodeIterator;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
+import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.dom.DTDMonitor;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.DefaultSAXOutputHandler;
+import org.apache.xalan.xsltc.runtime.TextOutput;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
public class TimeXSLTCDom
1.5 +3 -2
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TransformWrapper.java
Index: TransformWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TransformWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransformWrapper.java 27 Jan 2003 18:33:07 -0000 1.4
+++ TransformWrapper.java 31 Jan 2003 15:47:24 -0000 1.5
@@ -56,9 +56,10 @@
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.Configurable;
import java.util.Hashtable;
import java.util.Properties;
+
+import org.apache.qetest.Configurable;
/**
* Helper interface to wrapper various XSLT processors for testing.
1.5 +3 -5
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TransformWrapperFactory.java
Index: TransformWrapperFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TransformWrapperFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TransformWrapperFactory.java 27 Jan 2003 18:33:07 -0000 1.4
+++ TransformWrapperFactory.java 31 Jan 2003 15:47:24 -0000 1.5
@@ -56,12 +56,10 @@
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
-
import java.io.InputStream;
-import java.io.IOException;
-
import java.util.Properties;
+
+import org.apache.qetest.QetestUtils;
/**
* Factory static class for creating TransformWrappers.
1.7 +6 -8
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraxDOMWrapper.java 27 Jan 2003 18:33:08 -0000 1.6
+++ TraxDOMWrapper.java 31 Jan 2003 15:47:24 -0000 1.7
@@ -55,27 +55,25 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
+import java.util.Hashtable;
+import java.util.Properties;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
+import org.apache.qetest.QetestUtils;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-
-import java.util.Hashtable;
-import java.util.Properties;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.6 +6 -8
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TraxFileWrapper.java 27 Jan 2003 18:33:08 -0000 1.5
+++ TraxFileWrapper.java 31 Jan 2003 15:47:24 -0000 1.6
@@ -55,19 +55,17 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Properties;
+import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-
-import java.io.File;
-import java.util.Hashtable;
-import java.util.Properties;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraxLocalPathWrapper.java 27 Jan 2003 18:33:08 -0000 1.3
+++ TraxLocalPathWrapper.java 31 Jan 2003 15:47:24 -0000 1.4
@@ -56,16 +56,16 @@
*/
package org.apache.qetest.xslwrapper;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-
-import java.util.Hashtable;
-import java.util.Properties;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.8 +9 -18
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TraxSAXWrapper.java 27 Jan 2003 18:33:08 -0000 1.7
+++ TraxSAXWrapper.java 31 Jan 2003 15:47:24 -0000 1.8
@@ -55,36 +55,27 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.util.Hashtable;
+import java.util.Properties;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TemplatesHandler;
import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
-import org.xml.sax.InputSource;
+
+import org.apache.qetest.QetestUtils;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-import java.util.Hashtable;
-import java.util.Properties;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.7 +11 -12
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraxStreamWrapper.java 27 Jan 2003 18:33:08 -0000 1.6
+++ TraxStreamWrapper.java 31 Jan 2003 15:47:24 -0000 1.7
@@ -55,24 +55,23 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
-
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-
import java.util.Hashtable;
import java.util.Properties;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.qetest.QetestUtils;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.3 +4 -8
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxSystemId3Wrapper.java
Index: TraxSystemId3Wrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxSystemId3Wrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TraxSystemId3Wrapper.java 27 Jan 2003 18:33:08 -0000 1.2
+++ TraxSystemId3Wrapper.java 31 Jan 2003 15:47:24 -0000 1.3
@@ -55,18 +55,14 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
+import java.util.Properties;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import java.util.Hashtable;
-import java.util.Properties;
+import org.apache.qetest.QetestUtils;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.5 +6 -6
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraxSystemIdWrapper.java 27 Jan 2003 18:33:08 -0000 1.4
+++ TraxSystemIdWrapper.java 31 Jan 2003 15:47:24 -0000 1.5
@@ -55,18 +55,18 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
+import java.util.Hashtable;
+import java.util.Properties;
+import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import java.util.Hashtable;
-import java.util.Properties;
+import org.apache.qetest.QetestUtils;
/**
* Implementation of TransformWrapper that uses the TrAX API and
1.8 +6 -6
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxWrapperUtils.java
Index: TraxWrapperUtils.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/TraxWrapperUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TraxWrapperUtils.java 27 Jan 2003 18:33:08 -0000 1.7
+++ TraxWrapperUtils.java 31 Jan 2003 15:47:24 -0000 1.8
@@ -56,15 +56,15 @@
*/
package org.apache.qetest.xslwrapper;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.URIResolver;
-import javax.xml.transform.ErrorListener;
-
import java.lang.reflect.Field;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
/**
* Cheap-o utilities for Trax*Wrapper implementations.
1.4 +3 -5
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/XalanProcessWrapper.java
Index: XalanProcessWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/XalanProcessWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanProcessWrapper.java 27 Jan 2003 18:33:08 -0000 1.3
+++ XalanProcessWrapper.java 31 Jan 2003 15:47:24 -0000 1.4
@@ -55,14 +55,12 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
-
-import org.apache.xalan.xslt.Process;
-
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.apache.qetest.QetestUtils;
/**
* Implementation of TransformWrapper that calls Xalan's default
1.6 +4 -6
xml-xalan/test/java/src/org/apache/qetest/xslwrapper/XsltcMainWrapper.java
Index: XsltcMainWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xslwrapper/XsltcMainWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XsltcMainWrapper.java 27 Jan 2003 18:33:08 -0000 1.5
+++ XsltcMainWrapper.java 31 Jan 2003 15:47:24 -0000 1.6
@@ -55,17 +55,15 @@
* <http://www.apache.org/>.
*/
package org.apache.qetest.xslwrapper;
-import org.apache.qetest.QetestUtils;
-
-import org.apache.xalan.xsltc.cmdline.Compile;
-import org.apache.xalan.xsltc.cmdline.Transform;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.util.Hashtable;
import java.util.Properties;
+
+import org.apache.xalan.xsltc.cmdline.Compile;
+import org.apache.xalan.xsltc.cmdline.Transform;
/**
* Implementation of TransformWrapper that uses the command line
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
