bloritsch 2003/03/03 11:32:32
Modified: src/test/org/apache/cocoon/components/resolver/test
ResolverImplTestCase.java
src/test/org/apache/cocoon/components/source
SourceResolverAdapter.java
src/test/org/apache/cocoon/environment/commandline/test
CommandLineContextTestCase.java
src/test/org/apache/cocoon/generation
AbstractGeneratorTestCase.java
FileGeneratorTestCase.java
src/test/org/apache/cocoon/transformation
AbstractTransformerTestCase.java
src/test/org/apache/cocoon/util/test NetUtilsTestCase.java
Log:
fix compile errors in testing framework
Revision Changes Path
1.8 +4 -14
xml-cocoon2/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java
Index: ResolverImplTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResolverImplTestCase.java 31 Jan 2003 22:55:07 -0000 1.7
+++ ResolverImplTestCase.java 3 Mar 2003 19:32:32 -0000 1.8
@@ -50,32 +50,22 @@
*/
package org.apache.cocoon.components.resolver.test;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.HashMap;
import java.util.Properties;
-import junit.framework.TestCase;
+
import junit.swingui.TestRunner;
-import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
+
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.excalibur.xml.EntityResolver;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.resolver.ResolverImpl;
import org.apache.cocoon.environment.commandline.CommandlineContext;
import org.apache.cocoon.util.IOUtils;
+import org.apache.excalibur.xml.EntityResolver;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* A test case for components/resolver/ResolverImpl
1.3 +30 -1
xml-cocoon2/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
Index: SourceResolverAdapter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceResolverAdapter.java 31 Jan 2003 22:55:07 -0000 1.2
+++ SourceResolverAdapter.java 3 Mar 2003 19:32:32 -0000 1.3
@@ -147,7 +147,36 @@
throws SAXException, IOException, ProcessingException {
SAXParser parser = null;
- Source assertionsource = null;
+ org.apache.excalibur.source.Source assertionsource = null;
+
+ try {
+ parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+
+ parser.parse(new InputSource(source.getInputStream()), handler);
+ } catch (ComponentException ce) {
+ throw new ProcessingException("Couldn't xmlize source", ce);
+ } catch (org.apache.excalibur.source.SourceException se) {
+ throw new ProcessingException("Couldn't xmlize source", se);
+ } finally {
+ this.manager.release((Component) parser);
+ }
+ }
+
+ /**
+ * Generates SAX events from the given source
+ * <b>NOTE</b> : if the implementation can produce lexical events, care should
be taken
+ * that <code>handler</code> can actually
+ * directly implement the LexicalHandler interface!
+ * @param source the data
+ * @throws ProcessingException if no suitable converter is found
+ */
+ public void toSAX( org.apache.excalibur.source.Source source,
+ String mimeType,
+ ContentHandler handler )
+ throws SAXException, IOException, ProcessingException {
+
+ SAXParser parser = null;
+ org.apache.excalibur.source.Source assertionsource = null;
try {
parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
1.6 +2 -15
xml-cocoon2/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java
Index: CommandLineContextTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommandLineContextTestCase.java 31 Jan 2003 22:55:07 -0000 1.5
+++ CommandLineContextTestCase.java 3 Mar 2003 19:32:32 -0000 1.6
@@ -49,28 +49,15 @@
*/
package org.apache.cocoon.environment.commandline.test;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
-import java.util.HashMap;
import junit.framework.TestCase;
import junit.swingui.TestRunner;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.ConsoleLogger;
-
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.commandline.*;
-
-import org.apache.log.Hierarchy;
-import org.apache.log.LogTarget;
-import org.apache.log.Logger;
+import org.apache.cocoon.environment.commandline.CommandlineContext;
import org.apache.log.Priority;
-import org.apache.log.format.PatternFormatter;
-import org.apache.log.output.io.StreamTarget;
/**
* A simple test case for CommandLineContext.
1.3 +6 -14
xml-cocoon2/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java
Index: AbstractGeneratorTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractGeneratorTestCase.java 31 Jan 2003 22:55:07 -0000 1.2
+++ AbstractGeneratorTestCase.java 3 Mar 2003 19:32:32 -0000 1.3
@@ -56,28 +56,20 @@
import java.util.Map;
import java.util.Vector;
-import org.apache.excalibur.xml.sax.SAXParser;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceResolver;
-
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.components.source.SourceResolverAdapter;
import org.apache.cocoon.xml.WhitespaceFilter;
import org.apache.cocoon.xml.dom.DOMBuilder;
-
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.xml.sax.SAXParser;
import org.custommonkey.xmlunit.Diff;
-
import org.w3c.dom.Document;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -268,9 +260,9 @@
} catch (IOException ioe) {
getLogger().error("Could not execute test", ioe);
fail("Could not execute test:"+ioe.toString());
- } catch (SourceException se) {
+/* } catch (SourceException se) {
getLogger().error("Could not retrieve sources", se);
- fail("Could not retrieve sources:"+se.toString());
+ fail("Could not retrieve sources:"+se.toString());*/
} catch (ProcessingException pe) {
getLogger().error("Could not execute test", pe);
pe.printStackTrace();
1.3 +0 -2
xml-cocoon2/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.java
Index: FileGeneratorTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileGeneratorTestCase.java 31 Jan 2003 22:55:07 -0000 1.2
+++ FileGeneratorTestCase.java 3 Mar 2003 19:32:32 -0000 1.3
@@ -51,8 +51,6 @@
package org.apache.cocoon.generation;
-import java.io.InputStream;
-import java.io.IOException;
import java.util.HashMap;
import org.apache.avalon.framework.parameters.Parameters;
1.3 +3 -4
xml-cocoon2/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java
Index: AbstractTransformerTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTransformerTestCase.java 31 Jan 2003 22:55:07 -0000 1.2
+++ AbstractTransformerTestCase.java 3 Mar 2003 19:32:32 -0000 1.3
@@ -57,7 +57,6 @@
import org.apache.excalibur.xml.sax.SAXParser;
import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
@@ -290,9 +289,9 @@
} catch (IOException ioe) {
getLogger().error("Could not execute test", ioe);
fail("Could not execute test:"+ioe.toString());
- } catch (SourceException se) {
+/* } catch (SourceException se) {
getLogger().error("Could not retrieve sources", se);
- fail("Could not retrieve sources:"+se.toString());
+ fail("Could not retrieve sources:"+se.toString()); */
} catch (ProcessingException pe) {
getLogger().error("Could not execute test", pe);
pe.printStackTrace();
1.5 +2 -2
xml-cocoon2/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java
Index: NetUtilsTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetUtilsTestCase.java 31 Jan 2003 22:55:08 -0000 1.4
+++ NetUtilsTestCase.java 3 Mar 2003 19:32:32 -0000 1.5
@@ -50,9 +50,9 @@
*/
package org.apache.cocoon.util.test;
-import java.io.File;
import java.util.HashMap;
import java.util.Map;
+
import junit.framework.TestCase;
import org.apache.cocoon.util.NetUtils;
