Author: cziegeler
Date: Sun Oct 24 04:21:26 2004
New Revision: 55426
Modified:
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
Log:
Make test cases work again - simplify ContainerTestCase
Modified:
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
==============================================================================
---
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
(original)
+++
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
Sun Oct 24 04:21:26 2004
@@ -17,23 +17,14 @@
package org.apache.cocoon.core.container;
import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import junit.framework.TestResult;
-import org.apache.avalon.excalibur.logger.DefaultLoggerManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.ConsoleLogger;
@@ -42,7 +33,7 @@
import org.apache.avalon.framework.service.ServiceManager;
/**
- * JUnit TestCase for Avalon Components.
+ * JUnit TestCase for Cocoon Components.
* <p>
* This class extends the JUnit TestCase class to setup an environment which
* makes it possible to easily test Avalon Components. The following methods
@@ -79,39 +70,6 @@
* ]]>
* </annotation>
*
- * <logkit log-level="INFO">
- * <factories>
- * <factory type="stream"
class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
- * <factory type="file"
class="org.apache.avalon.excalibur.logger.factory.FileTargetFactory"/>
- * </factories>
- *
- * <targets>
- * <stream id="console">
- * <stream>System.out</stream>
- * <format type="avalon">
- * %7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%30.30{category}] (%{context}): %{message}\n%{throwable}
- * </format>
- * </stream>
- * <file id="log-file">
- * <filename>TEST-{full test class name}.log</filename>
- * <format type="avalon">
- * %7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%30.30{category}] (%{context}): %{message}\n%{throwable}
- * </format>
- * </file>
- * </targets>
- *
- * <categories>
- * <category name="test" log-level="INFO">
- * <log-target id-ref="console"/>
- * <log-target id-ref="log-file"/>
- * </category>
- * <category name="jdbc" log-level="INFO">
- * <log-target id-ref="console"/>
- * <log-target id-ref="log-file"/>
- * </category>
- * </categories>
- * </logkit>
- *
* <context>
* <entry name="foo" value="bar"/>
* <entry name="baz" class="my.context.Class"/>
@@ -154,46 +112,6 @@
* <code>title</code> element, naming the test, and a <code>para</code>
* element which is used to describe the test.</dd>
*
- * <dt>logkit</dt>
- * <dd>Configures the logger used by the test cases and the components used
- * by the tests. The <code>logkit</code> element takes two optional
- * attributes:
- * <dl>
- * <dt>logger</dt><dd>Uses to name the logger which is used to bootstrap
- * the LogKit logger. (Defaults to <code>"lm"</code>)</dd>
- * <dt>log-level</dt><dd>Because the logger used by the LogKit must be
- * created before the Log Kit Manager is initialized, it must be fully
- * configured before the <code>logkit</code> element is parsed. This
- * attribute allows the Log Kit's log priority to be set. This log
- * level will also become the default for the Role Manager, Component
- * Manager, and all components if they do not have <code>category</code>
- * elements declated in the <code>logkit</code> element.
- * (Defaults to "INFO")</dd>
- * </dl>
- * The loggers used by test cases and components can be easily configured
- * from within this file. The default test configuration, shown above,
- * includes a "test" category. This category is used to configure the
- * default logger for all test cases. If it is set to "DEBUG", then all
- * test debug logging will be enabled. To enalble debug logging for a
- * single test case, a child category must be defined for the
- * "testCheckTotals" test case as follows:
- * <pre>
- * <categories>
- * <category name="test" log-level="INFO">
- * <log-target id-ref="console"/>
- * <log-target id-ref="log-file"/>
- *
- * <category name="testCheckTotals" log-level="DEBUG">
- * <log-target id-ref="console"/>
- * <log-target id-ref="log-file"/>
- * </category>
- * </category>
- * </categories>
- * </pre>
- * For general information on how to configure the LogKit Manager, please
- * refer to the Log Kit documentation.
- * </dd>
- *
* <dt>context</dt>
* <dd>Allows context properties to be set in the context passed to any
* Contextualizable components.</dd>
@@ -220,50 +138,33 @@
*/
public class ContainerTestCase extends TestCase {
- ///Format of default formatter
- private static final String FORMAT =
- "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%30.30{category}] (%{context}): %{message}\n%{throwable}";
-
- //The default logger
- private Logger m_logger;
- private CocoonServiceManager m_manager;
- private LoggerManager m_logKitManager;
- private static HashMap m_tests = new HashMap();
-
- protected ServiceManager manager;
+ /** The default logger */
+ private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
+
+ /** The service manager to use */
+ private ServiceManager manager;
public ContainerTestCase( final String name ) {
super( name );
-
- ArrayList methodList = (ArrayList)ContainerTestCase.m_tests.get(
getClass() );
-
- if( null == methodList )
- {
- Method[] methods = getClass().getMethods();
- methodList = new ArrayList( methods.length );
-
- for( int i = 0; i < methods.length; i++ )
- {
- String methodName = methods[ i ].getName();
- if( methodName.startsWith( "test" ) &&
- ( Modifier.isPublic( methods[ i ].getModifiers() ) ) &&
- ( methods[ i ].getReturnType().equals( Void.TYPE ) ) &&
- ( methods[ i ].getParameterTypes().length == 0 ) )
- {
- methodList.add( methodName );
- }
- }
-
- ContainerTestCase.m_tests.put( getClass(), methodList );
- }
}
/** Return the logger */
- protected Logger getLogger()
- {
- return m_logger;
+ protected Logger getLogger() {
+ return logger;
}
+ /** Return the service manager */
+ protected ServiceManager getManager() {
+ return this.manager;
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ this.prepare();
+ }
/**
* Initializes the ComponentLocator
*
@@ -271,18 +172,14 @@
* all '.' replaced by '/' and loaded as a resource via classpath
*/
protected void prepare()
- throws Exception
- {
+ throws Exception {
final String resourceName = getClass().getName().replace( '.', '/' ) +
".xtest";
URL resource = getClass().getClassLoader().getResource( resourceName );
- if( resource != null )
- {
+ if( resource != null ) {
getLogger().debug( "Loading resource " + resourceName );
prepare( resource.openStream() );
- }
- else
- {
+ } else {
getLogger().debug( "Resource not found " + resourceName );
}
}
@@ -299,142 +196,44 @@
* to the member variable m_logPriority.
*/
protected final void prepare( final InputStream testconf )
- throws Exception
- {
- getLogger().debug( "ExcaliburTestCase.initialize" );
+ throws Exception {
+ if ( getLogger().isDebugEnabled() ) {
+ getLogger().debug( "ContainerTestCase.initialize" );
+ }
final DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
final Configuration conf = builder.build( testconf );
String annotation = conf.getChild( "annotation" ).getValue( null );
- if( ( null != annotation ) && !( "".equals( annotation ) ) )
- {
- m_logger.info( annotation );
+ if( ( null != annotation ) && !( "".equals( annotation ) ) ) {
+ this.logger.info( annotation );
}
- Context context = setupContext( conf.getChild( "context" ) );
+ Context context = this.setupContext( conf.getChild( "context" ) );
setupManagers( conf.getChild( "components" ),
conf.getChild( "roles" ),
- conf.getChild( "logkit" ),
+ conf.getChild( "logging" ),
context );
- manager = m_manager;
-
- setCurrentLogger( "prepare" );
}
- /**
- * Disposes the <code>ComponentLocator</code>
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
*/
- final private void done()
- {
- if( null != m_manager )
- {
- m_manager.dispose();
- }
-
- m_manager = null;
+ protected void tearDown() throws Exception {
+ this.done();
+ super.tearDown();
}
/**
- * Exctract the base class name of a class.
+ * Disposes the <code>ComponentLocator</code>
*/
- private String getBaseClassName( Class clazz )
- {
- String name = clazz.getName();
- int pos = name.lastIndexOf( '.' );
- if( pos >= 0 )
- {
- name = name.substring( pos + 1 );
+ final private void done() {
+ if( manager != null ) {
+ ContainerUtil.dispose(manager);
+ manager = null;
}
- return name;
- }
-
- /**
- * Override <code>run</code> so that we can have code that is run once.
- */
- final public void run( TestResult result )
- {
- ArrayList methodList = (ArrayList)ContainerTestCase.m_tests.get(
getClass() );
-
- if( null == methodList || methodList.isEmpty() )
- {
- return; // The test was already run! NOTE: this is a hack.
- }
-
- // Set the logger for the initialization phase.
- setCurrentLogger( getBaseClassName( getClass() ) );
-
- try
- {
- if( this instanceof Initializable )
- {
- ( (Initializable)this ).initialize();
- }
-
- prepare();
-
- Iterator tests = methodList.iterator();
-
- while( tests.hasNext() )
- {
- String methodName = (String)tests.next();
- setName( methodName );
- setCurrentLogger( methodName );
-
- if( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "" );
- getLogger().debug(
"========================================" );
- getLogger().debug( " begin test: " + methodName );
- getLogger().debug(
"========================================" );
- }
-
- super.run( result );
-
- if( getLogger().isDebugEnabled() )
- {
- getLogger().debug(
"========================================" );
- getLogger().debug( " end test: " + methodName );
- getLogger().debug(
"========================================" );
- getLogger().debug( "" );
- }
- }
-
- }
- catch( Exception e )
- {
- System.out.println( e );
- e.printStackTrace();
- result.addError( this, e );
- }
- finally
- {
- done();
-
- if( this instanceof Disposable )
- {
- try
- {
- ( (Disposable)this ).dispose();
- }
- catch( Exception e )
- {
- result.addFailure( this, new AssertionFailedError(
"Disposal Error" ) );
- }
- }
- }
-
- methodList.clear();
- ContainerTestCase.m_tests.put( getClass(), methodList );
- }
-
- /**
- * Sets the logger which will be returned by getLogger and
getLogEnabledLogger
- */
- final private void setCurrentLogger( String name ) {
- m_logger = m_logKitManager.getLoggerForCategory( "test." + name );;
}
/**
@@ -445,75 +244,72 @@
* to put additional objects into the context programmatically.
*/
final private Context setupContext( final Configuration conf )
- throws Exception
- {
- //FIXME(GP): This method should setup the Context object according to
the
- // configuration spec. not yet completed
+ throws Exception {
final DefaultContext context = new DefaultContext();
final Configuration[] confs = conf.getChildren( "entry" );
- for( int i = 0; i < confs.length; i++ )
- {
+ for( int i = 0; i < confs.length; i++ ) {
final String key = confs[ i ].getAttribute( "name" );
final String value = confs[ i ].getAttribute( "value", null );
- if( value == null )
- {
+ if( value == null ) {
String clazz = confs[ i ].getAttribute( "class" );
Object obj = getClass().getClassLoader().loadClass( clazz
).newInstance();
context.put( key, obj );
- if( getLogger().isInfoEnabled() )
- getLogger().info( "ExcaliburTestCase: added an instance of
class " + clazz + " to context entry " + key );
- }
- else
- {
+ if( getLogger().isInfoEnabled() ) {
+ getLogger().info( "ContainerTestCase: added an instance of
class " + clazz + " to context entry " + key );
+ }
+ } else {
context.put( key, value );
- if( getLogger().isInfoEnabled() )
- getLogger().info( "ExcaliburTestCase: added value \"" +
value + "\" to context entry " + key );
+ if( getLogger().isInfoEnabled() ) {
+ getLogger().info( "ContainerTestCase: added value \"" +
value + "\" to context entry " + key );
+ }
}
}
addContext( context );
- return ( context );
+ return context ;
}
/**
* This method may be overwritten by subclasses to put additional objects
* into the context programmatically.
*/
- protected void addContext( DefaultContext context )
- {
+ protected void addContext( DefaultContext context ) {
}
final private void setupManagers( final Configuration confCM,
final Configuration confRM,
- final Configuration confLM,
+ final Configuration loggingConf,
final Context context )
- throws Exception
- {
- // Setup the log manager. Get the logger name and log level from
attributes
- // in the <logkit> node
- String lmLoggerName = confLM.getAttribute( "logger", "lm" );
- String lmLogLevel = confLM.getAttribute( "log-level", "INFO" );
- DefaultLoggerManager logKitManager = new DefaultLoggerManager();
- logKitManager.enableLogging( new ConsoleLogger() );
- logKitManager.contextualize( context );
- logKitManager.configure( confLM );
- m_logKitManager = logKitManager;
+ throws Exception {
+ // Get the log level from attributes
+ String lmLogLevel = loggingConf.getAttribute( "log-level", "DEBUG" );
+ int level = ConsoleLogger.LEVEL_DEBUG;
+ if ( lmLogLevel.equalsIgnoreCase("INFO") ) {
+ level = ConsoleLogger.LEVEL_INFO;
+ } else if ( lmLogLevel.equalsIgnoreCase("DISABLED") ) {
+ level = ConsoleLogger.LEVEL_DISABLED;
+ } else if ( lmLogLevel.equalsIgnoreCase("WARN") ) {
+ level = ConsoleLogger.LEVEL_WARN;
+ } else if ( lmLogLevel.equalsIgnoreCase("ERROR") ) {
+ level = ConsoleLogger.LEVEL_ERROR;
+ } else if ( lmLogLevel.equalsIgnoreCase("FATAL") ) {
+ level = ConsoleLogger.LEVEL_FATAL;
+ }
+ this.logger = new ConsoleLogger(level);
// Setup the RoleManager
- String rmLoggerName = confRM.getAttribute( "logger", "rm" );
RoleManager roleManager = new RoleManager();
- roleManager.enableLogging( logKitManager.getLoggerForCategory(
rmLoggerName ) );
+ roleManager.enableLogging( this.getLogger() );
roleManager.configure( confRM );
// Set up the ComponentLocator
- String cmLoggerName = confCM.getAttribute( "logger", "cm" );
CocoonServiceManager ecManager = new CocoonServiceManager(null, null);
- ecManager.enableLogging( logKitManager.getLoggerForCategory(
cmLoggerName ) );
- ecManager.setLoggerManager( logKitManager );
+ ecManager.enableLogging( this.getLogger() );
ecManager.contextualize( context );
ecManager.setRoleManager( roleManager );
+ ecManager.setLoggerManager( new DefaultLoggerManager(this.logger));
ecManager.configure( confCM );
ecManager.initialize();
- m_manager = ecManager;
+ this.manager = ecManager;
}
protected final Object lookup( final String key )
@@ -524,5 +320,25 @@
protected final void release( final Object object ) {
manager.release( object );
}
+
+ protected static class DefaultLoggerManager implements LoggerManager {
+
+ private Logger logger;
+
+ public DefaultLoggerManager(Logger logger) {
+ this.logger = logger;
+ }
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.excalibur.logger.LoggerManager#getDefaultLogger()
+ */
+ public Logger getDefaultLogger() {
+ return this.logger;
+ }
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.excalibur.logger.LoggerManager#getLoggerForCategory(java.lang.String)
+ */
+ public Logger getLoggerForCategory(String arg0) {
+ return this.logger;
+ }
+}
}
-
Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Sun Oct 24 04:21:26 2004
@@ -113,7 +113,8 @@
context.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectmodel);
}
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
objectmodel.clear();
request.reset();
@@ -143,11 +144,11 @@
Map result = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Matcher.ROLE +
+ selector = (ServiceSelector) this.lookup(Matcher.ROLE +
"Selector");
assertNotNull("Test lookup of matcher selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
assertNotNull("Test if matcher name is not null", type);
@@ -163,8 +164,8 @@
if (matcher != null) {
selector.release(matcher);
}
- this.manager.release(selector);
- this.manager.release(resolver);
+ this.release(selector);
+ this.release(resolver);
}
return result;
}
@@ -184,11 +185,11 @@
boolean result = false;
try {
- selector = (ServiceSelector)
this.manager.lookup(org.apache.cocoon.selection.Selector.ROLE +
+ selector = (ServiceSelector)
this.lookup(org.apache.cocoon.selection.Selector.ROLE +
"Selector");
assertNotNull("Test lookup of selector selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
assertNotNull("Test if selector name is not null", type);
@@ -205,8 +206,8 @@
if (sel != null) {
selector.release(sel);
}
- this.manager.release(selector);
- this.manager.release(resolver);
+ this.release(selector);
+ this.release(resolver);
}
return result;
}
@@ -228,18 +229,18 @@
Map result = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Action.ROLE +
+ selector = (ServiceSelector) this.lookup(Action.ROLE +
"Selector");
assertNotNull("Test lookup of action selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
assertNotNull("Test if action name is not null", type);
action = (Action) selector.select(type);
assertNotNull("Test lookup of action", action);
- result = action.act(redirector, new
SourceResolverAdapter(resolver, manager),
+ result = action.act(redirector, new
SourceResolverAdapter(resolver, this.getManager()),
objectmodel, source, parameters);
} catch (ServiceException ce) {
@@ -249,8 +250,8 @@
if (action != null) {
selector.release(action);
}
- this.manager.release(selector);
- this.manager.release(resolver);
+ this.release(selector);
+ this.release(resolver);
}
return result;
}
@@ -272,14 +273,14 @@
Document document = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Generator.ROLE +
+ selector = (ServiceSelector) this.lookup(Generator.ROLE +
"Selector");
assertNotNull("Test lookup of generator selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) this.lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if generator name is not null", type);
@@ -287,7 +288,7 @@
generator = (Generator) selector.select(type);
assertNotNull("Test lookup of generator", generator);
- generator.setup(new SourceResolverAdapter(resolver, manager),
+ generator.setup(new SourceResolverAdapter(resolver, getManager()),
objectmodel, source, parameters);
DOMBuilder builder = new DOMBuilder();
@@ -306,9 +307,9 @@
if (generator != null) {
selector.release(generator);
}
- this.manager.release(selector);
- this.manager.release(resolver);
- this.manager.release(parser);
+ this.release(selector);
+ this.release(resolver);
+ this.release(parser);
}
return document;
@@ -331,18 +332,18 @@
SAXParser parser = null;
Source inputsource = null;
- assertNotNull("Test for component manager", this.manager);
+ assertNotNull("Test for component manager", this.getManager());
Document document = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Transformer.ROLE+
+ selector = (ServiceSelector) this.lookup(Transformer.ROLE+
"Selector");
assertNotNull("Test lookup of transformer selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) this.lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
@@ -350,7 +351,7 @@
transformer = (Transformer) selector.select(type);
assertNotNull("Test lookup of transformer", transformer);
- transformer.setup(new SourceResolverAdapter(resolver, manager),
+ transformer.setup(new SourceResolverAdapter(resolver,
getManager()),
objectmodel, source, parameters);
DOMBuilder builder = new DOMBuilder();
@@ -373,7 +374,7 @@
}
if (selector!=null) {
- this.manager.release(selector);
+ this.release(selector);
}
if (inputsource!=null) {
@@ -381,11 +382,11 @@
}
if (resolver!=null) {
- this.manager.release(resolver);
+ this.release(resolver);
}
if (parser!=null) {
- this.manager.release(parser);
+ this.release(parser);
}
}
@@ -409,16 +410,16 @@
SourceResolver resolver = null;
Source inputsource = null;
- assertNotNull("Test for component manager", this.manager);
+ assertNotNull("Test for component manager", this.getManager());
ByteArrayOutputStream document = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Serializer.ROLE+
+ selector = (ServiceSelector) this.lookup(Serializer.ROLE+
"Selector");
assertNotNull("Test lookup of serializer selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
assertNotNull("Test if serializer name is not null", type);
@@ -441,7 +442,7 @@
}
if (selector!=null) {
- this.manager.release(selector);
+ this.release(selector);
}
if (inputsource!=null) {
@@ -449,7 +450,7 @@
}
if (resolver!=null) {
- this.manager.release(resolver);
+ this.release(resolver);
}
}
@@ -465,10 +466,10 @@
SourceResolver resolver = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Interpreter.ROLE);
+ selector = (ServiceSelector) this.lookup(Interpreter.ROLE);
assertNotNull("Test lookup of interpreter selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
assertNotNull("Test if interpreter name is not null", type);
@@ -493,8 +494,8 @@
if (interpreter != null) {
selector.release(interpreter);
}
- this.manager.release(selector);
- this.manager.release(resolver);
+ this.release(selector);
+ this.release(resolver);
}
return FlowHelper.getWebContinuation(getObjectModel()).getId();
}
@@ -508,10 +509,10 @@
SourceResolver resolver = null;
try {
- selector = (ServiceSelector) this.manager.lookup(Interpreter.ROLE);
+ selector = (ServiceSelector) this.lookup(Interpreter.ROLE);
assertNotNull("Test lookup of interpreter selector", selector);
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
assertNotNull("Test if interpreter name is not null", type);
@@ -536,8 +537,8 @@
if (interpreter != null) {
selector.release(interpreter);
}
- this.manager.release(selector);
- this.manager.release(resolver);
+ this.release(selector);
+ this.release(resolver);
}
return FlowHelper.getWebContinuation(getObjectModel()).getId();
}
@@ -566,14 +567,14 @@
SAXParser parser = null;
Source assertionsource = null;
- assertNotNull("Test for component manager", this.manager);
+ assertNotNull("Test for component manager", this.getManager());
Document assertiondocument = null;
try {
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) this.lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if assertion document is not null",
@@ -604,8 +605,8 @@
if (resolver != null) {
resolver.release(assertionsource);
}
- this.manager.release(resolver);
- this.manager.release(parser);
+ this.release(resolver);
+ this.release(parser);
}
return assertiondocument;
@@ -624,15 +625,15 @@
SAXParser parser = null;
Source assertionsource = null;
- assertNotNull("Test for component manager", this.manager);
+ assertNotNull("Test for component manager", this.getManager());
byte[] assertiondocument = null;
try {
- resolver = (SourceResolver)
this.manager.lookup(SourceResolver.ROLE);
+ resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
assertNotNull("Test lookup of source resolver", resolver);
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+ parser = (SAXParser) this.lookup(SAXParser.ROLE);
assertNotNull("Test lookup of parser", parser);
assertNotNull("Test if assertion document is not null", source);
@@ -665,8 +666,8 @@
if (resolver!=null) {
resolver.release(assertionsource);
}
- this.manager.release(resolver);
- this.manager.release(parser);
+ this.release(resolver);
+ this.release(parser);
}
return assertiondocument;
Modified:
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
Sun Oct 24 04:21:26 2004
@@ -49,7 +49,7 @@
Map sitemapElements = new HashMap();
context.pushMap("sitemap", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("123", resolver.resolve(context, getObjectModel()));
}
@@ -64,7 +64,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "oo");
context.pushMap("sitemap", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("123", resolver.resolve(context, getObjectModel()));
}
@@ -77,7 +77,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("name", "123");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("123", resolver.resolve(context, getObjectModel()));
}
@@ -90,7 +90,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("123abc", resolver.resolve(context, getObjectModel()));
}
@@ -103,7 +103,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("123abc/def", resolver.resolve(context,
getObjectModel()));
}
@@ -116,7 +116,7 @@
Map sitemapElements = new HashMap();
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("123abc/def", resolver.resolve(context,
getObjectModel()));
}
@@ -135,7 +135,7 @@
sitemapElements.put("1", "oscar");
context.pushMap("label2", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("from juliet to oscar", resolver.resolve(context,
getObjectModel()));
}
@@ -154,7 +154,7 @@
sitemapElements.put("1", "oscar");
context.pushMap("label2", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("from juliet to oscar", resolver.resolve(context,
getObjectModel()));
}
@@ -168,7 +168,7 @@
sitemapElements = new HashMap();
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("http://cocoon.apache.org";, resolver.resolve(context,
getObjectModel()));
}
@@ -182,7 +182,7 @@
sitemapElements = new HashMap();
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals(":colon-starts-this", resolver.resolve(context,
getObjectModel()));
}
@@ -197,7 +197,7 @@
sitemapElements.put("1", "abc");
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("abc:abc", resolver.resolve(context, getObjectModel()));
}
@@ -211,7 +211,7 @@
sitemapElements = new HashMap();
context.pushMap("label", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("This is a {brace}", resolver.resolve(context,
getObjectModel()));
}
@@ -222,7 +222,7 @@
Map sitemapElements = new HashMap();
context.pushMap("sitemap", sitemapElements);
- VariableResolver resolver = VariableResolverFactory.getResolver(expr,
manager);
+ VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("", resolver.resolve(context, getObjectModel()));
}
}
Modified:
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
Sun Oct 24 04:21:26 2004
@@ -19,27 +19,6 @@
Test Cases: PreparedVariableResolver
</annotation>
- <logkit>
- <factories>
- <factory type="stream"
class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
- </factories>
- <targets>
- <stream id="root">
- <stream>System.out</stream>
- <format type="extended">
- %7.7{priority} %5.5{time} [%9.9{category}] (%{context}):
%{message}\n%{throwable}
- </format>
- </stream>
- </targets>
- <categories>
- <category name="test" log-level="ERROR">
- <log-target id-ref="root"/>
- </category>
- </categories>
- </logkit>
-
- <context/>
-
<roles>
<role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
shorthand="input-modules"
@@ -47,11 +26,10 @@
</roles>
<components>
- <input-modules>
+ <input-modules>
<component-instance
class="org.apache.cocoon.components.modules.input.RequestParameterModule"
logger="core.modules.input" name="request-param"/>
<component-instance
class="org.apache.cocoon.components.modules.input.BaseLinkModule"
logger="core.modules.input" name="baselink"/>
</input-modules>
-
</components>
</testcase>
Modified:
cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
Sun Oct 24 04:21:26 2004
@@ -78,9 +78,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
Document resultDocument = load(result);
Document inputDocument = load(input);
Modified:
cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
Sun Oct 24 04:21:26 2004
@@ -75,9 +75,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("cinclude", src, parameters, load(input)));
@@ -103,9 +103,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("cinclude", src, parameters, load(input)));
@@ -131,9 +131,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("cinclude", src, parameters, load(input)));
Modified:
cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
Sun Oct 24 04:21:26 2004
@@ -81,9 +81,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
Document inputDocument = load(input);
Document resultDocument = load(result);
@@ -124,9 +124,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
Document inputDocument = load(input);
Document resultDocument = load(result);
Modified:
cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
Sun Oct 24 04:21:26 2004
@@ -75,9 +75,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("i18n", src, parameters, load(input)));
@@ -102,9 +102,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("i18n", src, parameters, load(input)));
Modified:
cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
Sun Oct 24 04:21:26 2004
@@ -74,9 +74,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("xinclude", src, parameters, load(input)));
@@ -99,9 +99,9 @@
// enter & leave environment, as a manager is looked up using
// the processing context stack
MockEnvironment env = new MockEnvironment();
- Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+ Processor processor = (Processor)this.lookup(Processor.ROLE);
- EnvironmentHelper.enterProcessor(processor, this.manager, env);
+ EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
assertEqual( load(result),
transform("xinclude", src, parameters, load(input)));
