bloritsch 2003/03/12 07:02:17
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 PauseGenerator.java
src/test/org/apache/cocoon/transformation
AbstractTransformerTestCase.java
src/test/org/apache/cocoon/util/test NetUtilsTestCase.java
Log:
many compilation fixes, as well as re-implementing my change to make cornerstone
unnecessary
Revision Changes Path
1.2 +1 -1
cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java
Index: ResolverImplTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +2 -5
cocoon-2.1/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
Index: SourceResolverAdapter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/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 11 Mar 2003 21:44:49 -0000 1.2
+++ SourceResolverAdapter.java 12 Mar 2003 15:02:12 -0000 1.3
@@ -58,14 +58,11 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.impl.AvalonToCocoonSource;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.ProcessingException;
-
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.xml.sax.SAXParser;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.2 +3 -1
cocoon-2.1/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java
Index: CommandLineContextTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandLineContextTestCase.java 9 Mar 2003 00:10:40 -0000 1.1
+++ CommandLineContextTestCase.java 12 Mar 2003 15:02:14 -0000 1.2
@@ -218,8 +218,10 @@
String name = tests[0];
String expected = tests[1];
+ /* NEVER USED!
String message = "Test " +
"'" + name + "'" + ", " + "'" + expected + "'";
+ */
commandlineContext.setAttribute(name, expected);
1.2 +1 -4
cocoon-2.1/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java
Index: AbstractGeneratorTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractGeneratorTestCase.java 9 Mar 2003 00:10:40 -0000 1.1
+++ AbstractGeneratorTestCase.java 12 Mar 2003 15:02:17 -0000 1.2
@@ -260,9 +260,6 @@
} catch (IOException ioe) {
getLogger().error("Could not execute test", ioe);
fail("Could not execute test:"+ioe.toString());
-/* } catch (SourceException se) {
- getLogger().error("Could not retrieve sources", se);
- fail("Could not retrieve sources:"+se.toString());*/
} catch (ProcessingException pe) {
getLogger().error("Could not execute test", pe);
pe.printStackTrace();
1.2 +2 -2
cocoon-2.1/src/test/org/apache/cocoon/generation/PauseGenerator.java
Index: PauseGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/generation/PauseGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PauseGenerator.java 9 Mar 2003 00:10:40 -0000 1.1
+++ PauseGenerator.java 12 Mar 2003 15:02:17 -0000 1.2
@@ -48,7 +48,7 @@
Software Foundation, please see <http://www.apache.org/>.
*/
-package org.apache.cocoon.transformation.helpers;
+package org.apache.cocoon.generation;
import java.io.IOException;
1.2 +6 -15
cocoon-2.1/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java
Index: AbstractTransformerTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTransformerTestCase.java 9 Mar 2003 00:10:41 -0000 1.1
+++ AbstractTransformerTestCase.java 12 Mar 2003 15:02:17 -0000 1.2
@@ -55,28 +55,21 @@
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.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.transformation.Transformer;
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.custommonkey.xmlunit.XMLUnit;
-
import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -237,7 +230,8 @@
(test.assertiontype>=EQUAL) &&
(test.assertiontype<=NOTIDENTICAL));
- NodeList childs =
assertiondocument.getDocumentElement().getChildNodes();
+ // NEVER USED!
+ //NodeList childs =
assertiondocument.getDocumentElement().getChildNodes();
switch (test.assertiontype) {
case EQUAL :
@@ -289,9 +283,6 @@
} catch (IOException ioe) {
getLogger().error("Could not execute test", ioe);
fail("Could not execute test:"+ioe.toString());
-/* } catch (SourceException se) {
- getLogger().error("Could not retrieve sources", se);
- fail("Could not retrieve sources:"+se.toString()); */
} catch (ProcessingException pe) {
getLogger().error("Could not execute test", pe);
pe.printStackTrace();
1.2 +1 -1
cocoon-2.1/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java
Index: NetUtilsTestCase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/util/test/NetUtilsTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
