Author: danielf
Date: Thu Mar 17 00:01:44 2005
New Revision: 157912
URL: http://svn.apache.org/viewcvs?view=rev&rev=157912
Log:
Fix to make tests runable again. Don't know if it the right way to initaliize
settings though.
Modified:
cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Modified: cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java?view=diff&r1=157911&r2=157912
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java Thu Mar 17
00:01:44 2005
@@ -18,7 +18,10 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.core.Core;
import org.apache.cocoon.core.container.CoreServiceManager;
import org.apache.cocoon.core.container.StandaloneServiceSelector;
import org.apache.cocoon.core.container.ContainerTestCase;
@@ -33,6 +36,10 @@
* @version CVS $Id: SitemapComponentTestCase.java 55427 2004-10-24 11:38:37Z
cziegeler $
*/
public abstract class CocoonTestCase extends ContainerTestCase {
+
+ protected void addContext(DefaultContext context) {
+ context.put(Core.CONTEXT_SETTINGS, new Settings());
+ }
/* (non-Javadoc)
* @see
org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.CocoonServiceManager)
Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java?view=diff&r1=157911&r2=157912
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java Thu
Mar 17 00:01:44 2005
@@ -40,6 +40,8 @@
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.source.SourceResolverAdapter;
+import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.core.Core;
import org.apache.cocoon.core.container.CoreServiceManager;
import org.apache.cocoon.core.container.StandaloneServiceSelector;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -106,6 +108,7 @@
context.put(ContextHelper.CONTEXT_REQUEST_OBJECT, request);
context.put(ContextHelper.CONTEXT_RESPONSE_OBJECT, response);
context.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectmodel);
+ context.put(Core.CONTEXT_SETTINGS, new Settings());
}
/* (non-Javadoc)