You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/21 00:37:05 UTC
cvs commit: cocoon-2.2/src/test/org/apache/cocoon/transformation AbstractTransformerTestCase.java
unico 2003/12/20 15:37:05
Modified: src/test/org/apache/cocoon/generation
AbstractGeneratorTestCase.java
src/test/org/apache/cocoon/transformation
AbstractTransformerTestCase.java
Log:
migration to fortress
Revision Changes Path
1.8 +17 -24 cocoon-2.2/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java
Index: AbstractGeneratorTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractGeneratorTestCase.java 4 Aug 2003 03:06:30 -0000 1.7
+++ AbstractGeneratorTestCase.java 20 Dec 2003 23:37:05 -0000 1.8
@@ -54,11 +54,9 @@
import java.util.HashMap;
import java.util.Map;
-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.fortress.testcase.FortressTestCase;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.components.source.SourceResolverAdapter;
import org.apache.cocoon.xml.WhitespaceFilter;
import org.apache.cocoon.xml.dom.DOMBuilder;
@@ -76,7 +74,7 @@
* @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
* @version CVS $Id$
*/
-public abstract class AbstractGeneratorTestCase extends ExcaliburTestCase
+public abstract class AbstractGeneratorTestCase extends FortressTestCase
{
private HashMap objectmodel = new HashMap();
@@ -102,29 +100,25 @@
*/
public final Document generate(String type, String source, Parameters parameters) {
- ComponentSelector selector = null;
Generator generator = null;
SourceResolver resolver = null;
SAXParser parser = null;
Document document = null;
try {
- selector = (ComponentSelector) this.manager.lookup(Generator.ROLE +
- "Selector");
- assertNotNull("Test lookup of generator selector", selector);
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if generator name is not null", type);
- generator = (Generator) selector.select(type);
+ generator = (Generator) lookup(Generator.ROLE + "/" + type);
assertNotNull("Test lookup of generator", generator);
- generator.setup(new SourceResolverAdapter(resolver, this.manager),
+ generator.setup(new SourceResolverAdapter(resolver),
objectmodel, source, parameters);
DOMBuilder builder = new DOMBuilder();
@@ -136,7 +130,7 @@
assertNotNull("Test for generator document", document);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
getLogger().error("Could not retrieve generator", ce);
fail("Could not retrieve generator: " + ce.toString());
} catch (Exception e) {
@@ -144,11 +138,10 @@
fail("Could not execute test: " + e);
} finally {
if (generator != null) {
- selector.release(generator);
+ release(generator);
}
- this.manager.release(selector);
- this.manager.release(resolver);
- this.manager.release((Component) parser);
+ release(resolver);
+ release(parser);
}
return document;
@@ -162,10 +155,10 @@
Document assertiondocument = null;
try {
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if assertion document is not null",
@@ -185,7 +178,7 @@
assertiondocument = builder.getDocument();
assertNotNull("Test if assertion document exists", assertiondocument);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
getLogger().error("Could not retrieve generator", ce);
fail("Could not retrieve generator: " + ce.toString());
} catch (Exception e) {
@@ -195,8 +188,8 @@
if (resolver != null) {
resolver.release(assertionsource);
}
- this.manager.release(resolver);
- this.manager.release((Component) parser);
+ release(resolver);
+ release(parser);
}
return assertiondocument;
1.9 +19 -28 cocoon-2.2/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java
Index: AbstractTransformerTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/test/org/apache/cocoon/transformation/AbstractTransformerTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTransformerTestCase.java 15 Oct 2003 20:54:43 -0000 1.8
+++ AbstractTransformerTestCase.java 20 Dec 2003 23:37:05 -0000 1.9
@@ -51,19 +51,17 @@
package org.apache.cocoon.transformation;
import java.io.IOException;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
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.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.fortress.testcase.FortressTestCase;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceResolverAdapter;
import org.apache.cocoon.xml.WhitespaceFilter;
@@ -84,7 +82,7 @@
* @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
* @version CVS $Id$
*/
-public abstract class AbstractTransformerTestCase extends ExcaliburTestCase
+public abstract class AbstractTransformerTestCase extends FortressTestCase
{
private HashMap objectmodel = new HashMap();
@@ -111,7 +109,6 @@
*/
public final Document transform(String type, String source, Parameters parameters, Document input) {
- ComponentSelector selector = null;
Transformer transformer = null;
SourceResolver resolver = null;
SAXParser parser = null;
@@ -119,22 +116,19 @@
Document document = null;
try {
- selector = (ComponentSelector) this.manager.lookup(Transformer.ROLE+
- "Selector");
- assertNotNull("Test lookup of transformer selector", selector);
-
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+
+ resolver = (SourceResolver) lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if transformer name is not null", type);
- transformer = (Transformer) selector.select(type);
+ transformer = (Transformer) lookup(Transformer.ROLE + "/" + type);
assertNotNull("Test lookup of transformer", transformer);
- transformer.setup(new SourceResolverAdapter(resolver, this.manager),
+ transformer.setup(new SourceResolverAdapter(resolver),
objectmodel, source, parameters);
DOMBuilder builder = new DOMBuilder();
@@ -147,7 +141,7 @@
document = builder.getDocument();
assertNotNull("Test for transformer document", document);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
getLogger().error("Could not retrieve transformer", ce);
ce.printStackTrace();
fail("Could not retrieve transformer:"+ce.toString());
@@ -163,19 +157,16 @@
fail("Could not execute test:"+pe.toString());
} finally {
if (transformer!=null)
- selector.release(transformer);
-
- if (selector!=null)
- this.manager.release(selector);
+ release(transformer);
if (inputsource!=null)
resolver.release(inputsource);
if (resolver!=null)
- this.manager.release(resolver);
+ release(resolver);
if (parser!=null)
- this.manager.release((Component) parser);
+ release(parser);
}
return document;
@@ -214,10 +205,10 @@
Document assertiondocument = null;
try {
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if assertion document is not null",
@@ -237,7 +228,7 @@
assertiondocument = builder.getDocument();
assertNotNull("Test if assertion document exists", assertiondocument);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
getLogger().error("Could not retrieve generator", ce);
fail("Could not retrieve generator: " + ce.toString());
} catch (Exception e) {
@@ -247,8 +238,8 @@
if (resolver != null) {
resolver.release(assertionsource);
}
- this.manager.release(resolver);
- this.manager.release((Component) parser);
+ release(resolver);
+ release(parser);
}
return assertiondocument;