GRAILS-5786 - Include actions defined in super classes in url mapping tests.

Author: ldaley

src/java/grails/test/GrailsUrlMappingsTestCase.groovy

@@ -33,6 +33,8 @@ import org.springframework.web.servlet.DispatcherServlet
 import org.codehaus.groovy.grails.commons.GrailsControllerClass
 import org.springframework.web.context.ServletContextAware
 import javax.servlet.ServletContext
+import org.codehaus.groovy.grails.commons.GrailsClassUtils
+import org.springframework.beans.BeanUtils
 
 /**
  * @author Luke Daley
@@ -89,8 +91,8 @@ class GrailsUrlMappingsTestCase extends GroovyTestCase {
 
     def getActions(controller) {
         def instance = controllers[controller]
-        instance.class.declaredFields.findAll {
-            instance."${it.name}" instanceof Closure
+        BeanUtils.getPropertyDescriptors(instance.class).findAll {
+            GrailsClassUtils.getPropertyOrStaticPropertyOrFieldValue(instance, it.name) instanceof Closure
         }.collect {
             StringUtils.substringBeforeLast(it.name, "Flow")
         }

src/test/grails/test/GrailsUrlMappingsTestCaseTests.groovy

@@ -31,7 +31,9 @@ class GrailsUrlMappingsTestCaseTests extends GrailsUnitTestCase {
         super.setUp()
 
         mockApplication = new DefaultGrailsApplication(
-                [ GrailsUrlMappingsTestCaseFakeController, MoneyController, GRAILS_3571_UrlMappings, TestInternalUrlMappings, OverrideUrlMappings ] as Class[],
+                [ GrailsUrlMappingsTestCaseFakeController, MoneyController, GRAILS_3571_UrlMappings, TestInternalUrlMappings, OverrideUrlMappings,
+                  GrailsUrlMappingTestCaseTestsBaseController, GrailsUrlMappingTestCaseTestsSubclassController
+                ] as Class[],
                 new GroovyClassLoader(this.getClass().classLoader))
         mockApplication.initialise()
         mockApplication.config.disableMultipart = true
@@ -258,6 +260,13 @@ class GrailsUrlMappingsTestCaseTests extends GrailsUnitTestCase {
         }
     }
 
+    void testGrails5786() {
+        def test = new Grails5786TestCase()
+        test.grailsApplication = mockApplication
+        test.setUp()
+        test.testSuperClassMapping()
+    }
+    
     private void checkFailures(TestResult result) {
         result.errors().each { TestFailure failure ->
             println ">> Error: ${failure.toString()}"
@@ -273,6 +282,12 @@ class GrailsUrlMappingsTestCaseTests extends GrailsUnitTestCase {
     }
 }
 
+class Grails5786TestCase extends GrailsUrlMappingsTestCase {
+    void testSuperClassMapping() {
+        assertUrlMapping('/grailsUrlMappingTestCaseTestsSubclass/base', controller: 'grailsUrlMappingTestCaseTestsSubclass', action:'base')
+    }
+}
+
 class GRAILS_3571_UrlMappings {
   static mappings = {
     "/$controller/$action?/$id?"{
@@ -444,3 +459,9 @@ class MockUrlMapping implements UrlMapping {
 	}
 
 }
+
+abstract class GrailsUrlMappingTestCaseTestsBaseController {
+	def base = {}
+}
+
+class GrailsUrlMappingTestCaseTestsSubclassController extends GrailsUrlMappingTestCaseTestsBaseController {}