unico 2003/12/20 15:32:07
Modified: src/test/org/apache/cocoon/components/source SourceResolverAdapter.java src/test/org/apache/cocoon AbstractCompositeTestCase.java src/test/org/apache/cocoon/acting AbstractActionTestCase.java Log: migration to fortress Revision Changes Path 1.10 +2 -3 cocoon-2.2/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java Index: SourceResolverAdapter.java =================================================================== RCS file: /home/cvs/cocoon-2.2/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SourceResolverAdapter.java 15 Oct 2003 20:54:43 -0000 1.9 +++ SourceResolverAdapter.java 20 Dec 2003 23:32:06 -0000 1.10 @@ -55,7 +55,6 @@ import java.net.MalformedURLException; import java.util.Map; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.cocoon.environment.SourceResolver; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceException; @@ -69,7 +68,7 @@ { private org.apache.excalibur.source.SourceResolver resolver; - public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver resolver, ComponentManager manager) { + public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver resolver) { this.resolver = resolver; } 1.11 +56 -93 cocoon-2.2/src/test/org/apache/cocoon/AbstractCompositeTestCase.java Index: AbstractCompositeTestCase.java =================================================================== RCS file: /home/cvs/cocoon-2.2/src/test/org/apache/cocoon/AbstractCompositeTestCase.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- AbstractCompositeTestCase.java 8 Dec 2003 10:23:46 -0000 1.10 +++ AbstractCompositeTestCase.java 20 Dec 2003 23:32:06 -0000 1.11 @@ -52,8 +52,8 @@ package org.apache.cocoon; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.util.HashMap; import java.util.Map; @@ -62,11 +62,9 @@ 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.acting.Action; import org.apache.cocoon.components.source.SourceResolverAdapter; import org.apache.cocoon.environment.ObjectModelHelper; @@ -75,8 +73,8 @@ import org.apache.cocoon.environment.mock.MockRequest; import org.apache.cocoon.environment.mock.MockResponse; import org.apache.cocoon.generation.Generator; -import org.apache.cocoon.transformation.Transformer; import org.apache.cocoon.serialization.Serializer; +import org.apache.cocoon.transformation.Transformer; import org.apache.cocoon.xml.WhitespaceFilter; import org.apache.cocoon.xml.dom.DOMBuilder; import org.apache.cocoon.xml.dom.DOMStreamer; @@ -95,7 +93,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Leicester</a> * @version CVS $Id$ */ -public abstract class AbstractCompositeTestCase extends ExcaliburTestCase +public abstract class AbstractCompositeTestCase extends FortressTestCase { public final static Parameters EMPTY_PARAMS = Parameters.EMPTY_PARAMETERS; @@ -104,7 +102,7 @@ private MockContext context = new MockContext(); private MockRedirector redirector = new MockRedirector(); private HashMap objectmodel = new HashMap(); - + /** * Create a new composite test case. * @@ -158,27 +156,23 @@ */ public final Map act(String type, String source, Parameters parameters) { - ComponentSelector selector = null; Action action = null; SourceResolver resolver = null; Map result = null; try { - selector = (ComponentSelector) this.manager.lookup(Action.ROLE + - "Selector"); - assertNotNull("Test lookup of action selector", selector); - - resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE); + + resolver = (SourceResolver) lookup(SourceResolver.ROLE); assertNotNull("Test lookup of source resolver", resolver); assertNotNull("Test if action name is not null", type); - action = (Action) selector.select(type); + action = (Action) lookup(Action.ROLE + "/" + type); assertNotNull("Test lookup of action", action); - result = action.act(redirector, new SourceResolverAdapter(resolver, this.manager), + result = action.act(redirector, new SourceResolverAdapter(resolver), objectmodel, source, parameters); - } catch (ComponentException ce) { + } catch (ServiceException ce) { getLogger().error("Could not retrieve generator", ce); fail("Could not retrieve generator: " + ce.toString()); } catch (Exception e) { @@ -186,10 +180,9 @@ fail("Could not execute test: " + e); } finally { if (action != null) { - selector.release(action); + release(action); } - this.manager.release(selector); - this.manager.release(resolver); + release(resolver); } return result; } @@ -203,29 +196,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(); @@ -237,7 +226,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) { @@ -245,11 +234,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; @@ -265,32 +253,26 @@ */ public final Document transform(String type, String source, Parameters parameters, Document input) { - ComponentSelector selector = null; Transformer transformer = null; SourceResolver resolver = null; SAXParser parser = null; Source inputsource = null; - assertNotNull("Test for component manager", this.manager); - 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(); @@ -303,7 +285,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()); @@ -318,20 +300,18 @@ pe.printStackTrace(); fail("Could not execute test:"+pe.toString()); } finally { - if (transformer!=null) - selector.release(transformer); - - if (selector!=null) - this.manager.release(selector); - - if (inputsource!=null) + if (transformer!=null) { + release(transformer); + } + if (inputsource!=null) { resolver.release(inputsource); - - if (resolver!=null) - this.manager.release(resolver); - - if (parser!=null) - this.manager.release((Component) parser); + } + if (resolver!=null) { + release(resolver); + } + if (parser!=null) { + release(parser); + } } return document; @@ -349,25 +329,19 @@ public final byte[] serialize(String type, Parameters parameters, Document input) { - ComponentSelector selector = null; Serializer serializer = null; SourceResolver resolver = null; Source inputsource = null; - assertNotNull("Test for component manager", this.manager); - ByteArrayOutputStream document = null; try { - selector = (ComponentSelector) this.manager.lookup(Serializer.ROLE+ - "Selector"); - assertNotNull("Test lookup of serializer selector", selector); - resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE); + resolver = (SourceResolver) lookup(SourceResolver.ROLE); assertNotNull("Test lookup of source resolver", resolver); assertNotNull("Test if serializer name is not null", type); - serializer = (Serializer) selector.select(type); + serializer = (Serializer) lookup(Serializer.ROLE + "/" + type); assertNotNull("Test lookup of serializer", serializer); document = new ByteArrayOutputStream(); @@ -377,7 +351,7 @@ DOMStreamer streamer = new DOMStreamer(serializer); streamer.stream(input); - } catch (ComponentException ce) { + } catch (ServiceException ce) { getLogger().error("Could not retrieve serializer", ce); ce.printStackTrace(); fail("Could not retrieve serializer:"+ce.toString()); @@ -389,19 +363,13 @@ fail("Could not execute test:"+ioe.toString()); } finally { if (serializer!=null) { - selector.release(serializer); + release(serializer); } - - if (selector!=null) { - this.manager.release(selector); - } - if (inputsource!=null) { resolver.release(inputsource); } - if (resolver!=null) { - this.manager.release(resolver); + release(resolver); } } @@ -428,21 +396,17 @@ SAXParser parser = null; Source assertionsource = null; - assertNotNull("Test for component manager", this.manager); - 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", - source); + assertNotNull("Test if assertion document is not null",source); assertionsource = resolver.resolveURI(source); - assertNotNull("Test lookup of assertion source", - assertionsource); + assertNotNull("Test lookup of assertion source",assertionsource); assertTrue("Test if source exist", assertionsource.exists()); DOMBuilder builder = new DOMBuilder(); @@ -456,7 +420,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) { @@ -466,8 +430,8 @@ if (resolver != null) { resolver.release(assertionsource); } - this.manager.release(resolver); - this.manager.release((Component) parser); + release(resolver); + release(parser); } return assertiondocument; @@ -486,15 +450,13 @@ SAXParser parser = null; Source assertionsource = null; - assertNotNull("Test for component manager", this.manager); - byte[] 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", source); @@ -517,7 +479,7 @@ i++; } - } catch (ComponentException ce) { + } catch (ServiceException ce) { getLogger().error("Could not retrieve generator", ce); fail("Could not retrieve generator: "+ce.toString()); } catch (Exception e) { @@ -527,8 +489,8 @@ if (resolver!=null) { resolver.release(assertionsource); } - this.manager.release(resolver); - this.manager.release((Component) parser); + release(resolver); + release(parser); } return assertiondocument; @@ -630,4 +592,5 @@ } } + } 1.3 +12 -18 cocoon-2.2/src/test/org/apache/cocoon/acting/AbstractActionTestCase.java Index: AbstractActionTestCase.java =================================================================== RCS file: /home/cvs/cocoon-2.2/src/test/org/apache/cocoon/acting/AbstractActionTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractActionTestCase.java 10 Jul 2003 00:25:25 -0000 1.2 +++ AbstractActionTestCase.java 20 Dec 2003 23:32:07 -0000 1.3 @@ -54,10 +54,9 @@ import java.util.HashMap; import java.util.Map; -import org.apache.avalon.excalibur.testcase.ExcaliburTestCase; -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.environment.ObjectModelHelper; import org.apache.cocoon.environment.mock.MockContext; @@ -72,7 +71,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Stephan Michels</a> * @version CVS $Id$ */ -public abstract class AbstractActionTestCase extends ExcaliburTestCase +public abstract class AbstractActionTestCase extends FortressTestCase { private MockRequest request = new MockRequest(); private MockResponse response = new MockResponse(); @@ -124,38 +123,33 @@ */ public final Map act(String type, String source, Parameters parameters) { - ComponentSelector selector = null; Action action = null; SourceResolver resolver = null; Map result = null; try { - selector = (ComponentSelector) this.manager.lookup(Action.ROLE + - "Selector"); - assertNotNull("Test lookup of action selector", selector); - resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE); + resolver = (SourceResolver) lookup(SourceResolver.ROLE); assertNotNull("Test lookup of source resolver", resolver); assertNotNull("Test if action name is not null", type); - action = (Action) selector.select(type); + action = (Action) lookup(Action.ROLE + "/" + type); assertNotNull("Test lookup of action", action); - result = action.act(redirector, new SourceResolverAdapter(resolver, this.manager), + result = action.act(redirector, new SourceResolverAdapter(resolver), objectmodel, source, parameters); - } catch (ComponentException ce) { - getLogger().error("Could not retrieve generator", ce); - fail("Could not retrieve generator: " + ce.toString()); + } catch (ServiceException ce) { + getLogger().error("Could not retrieve action", ce); + fail("Could not retrieve action: " + ce.toString()); } catch (Exception e) { getLogger().error("Could not execute test", e); fail("Could not execute test: " + e); } finally { if (action != null) { - selector.release(action); + release(action); } - this.manager.release(selector); - this.manager.release(resolver); + release(resolver); } return result; }