GRAILS-5409 - Added setting of webRequest.controllerName back into integration tests.

Author: ldaley

src/java/org/codehaus/groovy/grails/test/junit3/JUnit3GrailsEnvironmentTestSuite.groovy

@@ -28,6 +28,7 @@ import java.util.regex.Pattern
 import org.codehaus.groovy.grails.test.support.GrailsTestAutowirer
 import org.codehaus.groovy.grails.test.support.GrailsTestRequestEnvironmentInterceptor
 import org.codehaus.groovy.grails.test.support.GrailsTestTransactionInterceptor
+import org.codehaus.groovy.grails.test.support.ControllerNameExtractor
 
 /**
  * A Grails specific test suite that runs tests in a “Grails” environment. That is,
@@ -71,8 +72,25 @@ class JUnit3GrailsEnvironmentTestSuite extends TestSuite {
         }
 
         def rawRunner = { test.run(result) }
-        def inTransactionRunner = mode.wrapInTransaction && transactionInterceptor.isTransactional(test) ? { transactionInterceptor.doInTransaction(rawRunner) } : rawRunner 
-        def inRequestRunner = mode.wrapInRequestEnvironment ? { requestEnvironmentInterceptor.doInRequestEnvironment(inTransactionRunner) } : rawRunner
+
+        def inTransactionRunner
+        if (mode.wrapInTransaction && transactionInterceptor.isTransactional(test)) {
+            inTransactionRunner = { transactionInterceptor.doInTransaction(rawRunner) }
+        } else {
+            inTransactionRunner = rawRunner
+        }
+
+        def inRequestRunner
+        if (mode.wrapInRequestEnvironment) {
+            def controllerName = ControllerNameExtractor.extractControllerNameFromTestClassName(test.class.name, JUnit3GrailsTestType.TESTS_SUFFIX)
+            if (controllerName) {
+                inRequestRunner = { requestEnvironmentInterceptor.doInRequestEnvironment(controllerName, inTransactionRunner) }
+            } else {
+                inRequestRunner = { requestEnvironmentInterceptor.doInRequestEnvironment(inTransactionRunner) }
+            }
+        } else {
+            inRequestRunner = inTransactionRunner
+        }
 
         inRequestRunner()
     }

src/java/org/codehaus/groovy/grails/test/junit3/JUnit3GrailsTestType.java

@@ -43,6 +43,8 @@
  */
 public class JUnit3GrailsTestType extends GrailsTestTypeSupport {
 
+    public static final String TESTS_SUFFIX = "Tests";
+     
     protected TestSuite wholeTestSuite;
     protected JUnit3GrailsTestTypeMode mode;
 
@@ -57,7 +59,7 @@ public JUnit3GrailsTestType(String name, String sourceDirectory, JUnit3GrailsTes
 
     protected List<String> getTestSuffixes() { 
         List<String> testSuffixes = new LinkedList<String>();
-        testSuffixes.add("Tests");
+        testSuffixes.add(TESTS_SUFFIX);
         return testSuffixes;
     }
 

src/java/org/codehaus/groovy/grails/test/support/ControllerNameExtractor.groovy

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.codehaus.groovy.grails.test.support
+
+import grails.util.GrailsNameUtils
+
+class ControllerNameExtractor {
+
+    static String extractControllerNameFromTestClassName(String testClassName, String[] testClassSuffixes) {
+        if (!testClassSuffixes) testClassSuffixes = [''] as String[]
+        
+        def matchingTail
+        testClassSuffixes.find { 
+            def tail = "Controller$it"
+            if (testClassName.endsWith(tail)) matchingTail = tail }
+        
+        if (matchingTail) {
+            testClassName[0..(testClassName.size() - matchingTail.size() - 1)]
+        } else {
+            null
+        }
+    } 
+    
+}

src/java/org/codehaus/groovy/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy

@@ -30,6 +30,8 @@ import grails.util.GrailsWebUtil
  */
 class GrailsTestRequestEnvironmentInterceptor {
 
+    static final String DEFAULT_CONTROLLER_NAME = 'test'
+    
     ApplicationContext applicationContext
 
     GrailsTestRequestEnvironmentInterceptor(ApplicationContext applicationContext) {
@@ -39,10 +41,11 @@ class GrailsTestRequestEnvironmentInterceptor {
     /**
      * Establishes a mock request environment
      */
-    void init() {
+    void init(String controllerName = DEFAULT_CONTROLLER_NAME) {
         GrailsWebRequest webRequest = GrailsWebUtil.bindMockWebRequest(applicationContext)
         ServletContextHolder.servletContext = webRequest.servletContext
         webRequest.servletContext.setAttribute(GrailsApplicationAttributes.APPLICATION_CONTEXT, applicationContext)
+        webRequest.controllerName = controllerName
     }
 
     /**
@@ -54,15 +57,22 @@ class GrailsTestRequestEnvironmentInterceptor {
     }
 
     /**
-     * Calls init() before and destroy() after invoking {@code body}.
+     * Passes {@code body} to {@code doInRequestEnvironment(String,Closure)} with the {@code DEFAULT_CONTROLLER_NAME}.
      */    
     void doInRequestEnvironment(Closure body) {
-        init() 
+        doInRequestEnvironment(DEFAULT_CONTROLLER_NAME, body)
+    }
+
+    /**
+     * Calls {@code init()} before and {@code destroy()} after invoking {@code body}.
+     */ 
+    void doInRequestEnvironment(String controllerName, Closure body) {
+        init(controllerName)
         try {
             body()
         } finally {
             destroy()
         }
     }
-
+    
 }