svn commit: r164138 - /cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java /cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java

[danielf]

Author: danielf
Date: Thu Apr 21 15:19:03 2005
New Revision: 164138

URL: http://svn.apache.org/viewcvs?rev=164138&view=rev
Log:
Moved context setup from SitemapTestCase to SitemapComponentTestCase as it is 
needed for testing sitemap components as well. Moved processor creation from 
setUp to process, as setUp is called for all test cases anyway and as it makes 
the SitemapTestCase more useful as baseclass.

Modified:
    cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
    cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java

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?rev=164138&r1=164137&r2=164138&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java 
(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java Thu 
Apr 21 15:19:03 2005
@@ -106,6 +106,7 @@
         context.put(ContextHelper.CONTEXT_REQUEST_OBJECT, request);
         context.put(ContextHelper.CONTEXT_RESPONSE_OBJECT, response);
         context.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectmodel);
+        context.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, getContext());
     }
 
     /* (non-Javadoc)

Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java?rev=164138&r1=164137&r2=164138&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapTestCase.java Thu Apr 21 
15:19:03 2005
@@ -29,7 +29,6 @@
 
 public class SitemapTestCase extends SitemapComponentTestCase {
 
-    protected Processor processor;
     protected String classDir;
     protected URL classDirURL;
 
@@ -37,12 +36,6 @@
         this.classDirURL = getClassDirURL();
         this.classDir = this.classDirURL.toExternalForm();
         super.setUp();
-        this.processor = (Processor)this.lookup(Processor.ROLE);
-    }
-
-    public void tearDown() throws Exception {
-        this.release(this.processor);
-        super.tearDown();
     }
 
     protected void prepare()
@@ -66,8 +59,9 @@
         prepare(context, roles, components);
     }
 
-
-    // Hack to get the URL to the directory that this class is in
+    /**
+     * Utility method for geting the URL to the directory that this class is in
+     */
     protected URL getClassDirURL() throws RuntimeException {
         String className = getClass().getName().replace( '.', '/' ) + ".class";
         try {
@@ -92,19 +86,21 @@
     }
 
     protected byte[] process(String uri) throws Exception {
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         MockEnvironment env = new MockEnvironment();
         env.setURI("", uri);
         getRequest().setEnvironment(env);
         env.setObjectModel(getObjectModel());
 
-        EnvironmentHelper.enterProcessor(this.processor, this.getManager(), 
env);
+        EnvironmentHelper.enterProcessor(processor, this.getManager(), env);
         try {
-            this.processor.process(env);
+            processor.process(env);
             getLogger().info("Output: " + new String(env.getOutput(), 
"UTF-8"));
 
             return env.getOutput();
         } finally {
             EnvironmentHelper.leaveProcessor();
+            this.release(processor);
         }
     }