vgritsenko 2003/03/17 17:33:39
Modified: src/test/org/apache/cocoon/generation
AbstractGeneratorTestCase.java
FileGeneratorTestCase.xtest
Log:
Fix file generator test
Revision Changes Path
1.3 +16 -28
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractGeneratorTestCase.java 12 Mar 2003 15:02:17 -0000 1.2
+++ AbstractGeneratorTestCase.java 18 Mar 2003 01:33:38 -0000 1.3
@@ -51,7 +51,6 @@
package org.apache.cocoon.generation;
-import java.io.IOException;
import java.util.Enumeration;
import java.util.Map;
import java.util.Vector;
@@ -61,7 +60,6 @@
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.components.source.SourceResolverAdapter;
import org.apache.cocoon.xml.WhitespaceFilter;
import org.apache.cocoon.xml.dom.DOMBuilder;
@@ -70,10 +68,7 @@
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;
-import org.xml.sax.ext.LexicalHandler;
/**
* Testcase for generator components. It tests the generator
@@ -106,7 +101,6 @@
*/
public AbstractGeneratorTestCase(String name) {
super(name);
-
}
/**
@@ -146,7 +140,7 @@
Source assertionsource = null;
try {
- selector = (ComponentSelector) this.manager.lookup(Generator.ROLE+
+ selector = (ComponentSelector) this.manager.lookup(Generator.ROLE +
"Selector");
assertNotNull("Test lookup of generator selector", selector);
@@ -199,12 +193,12 @@
if ((test.assertiontype==EQUAL) ||
(test.assertiontype==NOTEQUAL)) {
parser.parse(new InputSource(assertionsource.getInputStream()),
- (ContentHandler) new WhitespaceFilter(builder),
- (LexicalHandler) builder);
+ new WhitespaceFilter(builder),
+ builder);
} else {
parser.parse(new InputSource(assertionsource.getInputStream()),
- (ContentHandler) builder,
- (LexicalHandler) builder);
+ builder,
+ builder);
}
Document assertiondocument = builder.getDocument();
@@ -250,27 +244,21 @@
resolver.release(assertionsource);
assertionsource = null;
}
-
} catch (ComponentException ce) {
getLogger().error("Could not retrieve generator", ce);
- fail("Could not retrieve generator:"+ce.toString());
- } catch (SAXException saxe) {
- getLogger().error("Could not execute test", saxe);
- fail("Could not execute test:"+saxe.toString());
- } catch (IOException ioe) {
- getLogger().error("Could not execute test", ioe);
- fail("Could not execute test:"+ioe.toString());
- } catch (ProcessingException pe) {
- getLogger().error("Could not execute test", pe);
- pe.printStackTrace();
- fail("Could not execute test:"+pe.toString());
+ fail("Could not retrieve generator: " + ce.toString());
+ } catch (Exception e) {
+ getLogger().error("Could not execute test", e);
+ fail("Could not execute test: " + e);
} finally {
- if (generator!=null) {
+ if (generator != null) {
selector.release(generator);
}
this.manager.release(selector);
this.manager.release(resolver);
- resolver.release(assertionsource);
+ if (resolver != null) {
+ resolver.release(assertionsource);
+ }
this.manager.release((Component) parser);
}
}
@@ -302,7 +290,7 @@
*/
public final void assertXMLEqual(Diff diff, boolean assertion,
String msg) {
- assertEquals(msg+", "+diff.toString(), assertion, diff.similar());
+ assertEquals(msg + ", " + diff.toString(), assertion, diff.similar());
}
/**
@@ -322,7 +310,7 @@
*/
public final void assertXMLIdentical(Diff diff, boolean assertion,
String msg) {
- assertEquals(msg+", "+diff.toString(), assertion, diff.identical());
+ assertEquals(msg + ", " + diff.toString(), assertion, diff.identical());
}
/**
1.2 +11 -4
cocoon-2.1/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
Index: FileGeneratorTestCase.xtest
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileGeneratorTestCase.xtest 9 Mar 2003 00:10:40 -0000 1.1
+++ FileGeneratorTestCase.xtest 18 Mar 2003 01:33:38 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
+
<testcase>
<annotation>
Test Cases: FileGenerator
@@ -10,7 +11,7 @@
</factories>
<targets>
<file id="root">
- <filename>cocoon-filegenerator.log</filename>
+ <filename>cocoon-filegenerator-test.log</filename>
<format type="extended">
%7.7{priority} %5.5{time} [%8.8{category}] (%{context}):
%{message}\n%{throwable}
</format>
@@ -20,6 +21,14 @@
<category name="test" log-level="DEBUG">
<log-target id-ref="root"/>
</category>
+ <!-- Uncomment for ComponentManager and RoleManager debug
+ <category name="cm" log-level="DEBUG">
+ <log-target id-ref="root"/>
+ </category>
+ <category name="rm" log-level="DEBUG">
+ <log-target id-ref="root"/>
+ </category>
+ -->
</categories>
</logkit>
@@ -54,13 +63,11 @@
<source-factories>
<component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
+ <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory"
name="*"/>
</source-factories>
- <source-resolver class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<generators>
<component-instance class="org.apache.cocoon.generation.FileGenerator"
name="file"/>
</generators>
</components>
-
</testcase>
