Merge pull request #10230 from joemccall86/fix_10226_31x

Fix #10226

Author: graemerocher

grails-plugin-testing/src/main/groovy/grails/test/mixin/web/UrlMappingsUnitTestMixin.groovy

@@ -39,6 +39,7 @@ import org.grails.gsp.GroovyPagesTemplateEngine
  */
 class UrlMappingsUnitTestMixin extends ControllerUnitTestMixin {
 
+    public static final String KEY_EXCEPTION = 'exception'
     private assertionKeys = ["controller", "action", "view"]
 
     /**
@@ -193,7 +194,12 @@ class UrlMappingsUnitTestMixin extends ControllerUnitTestMixin {
         def mappingInfos
         if (url instanceof Integer) {
             mappingInfos = []
-            def mapping = mappingsHolder.matchStatusCode(url)
+            def mapping
+            if (assertions."$KEY_EXCEPTION") {
+                mapping = mappingsHolder.matchStatusCode(url, assertions."$KEY_EXCEPTION" as Throwable)
+            } else {
+                mapping = mappingsHolder.matchStatusCode(url)
+            }
             if (mapping) mappingInfos << mapping
         }
         else {

grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy

@@ -166,6 +166,17 @@ class UrlMappingsTestMixinTests {
         assertUrlMapping('/users/timmy', controller: 'user', action: 'update', method: 'put') { name = 'timmy' }
     }
 
+    @Test
+    @Issue('https://github.com/grails/grails-core/issues/10226')
+    void testExceptionUrlMapping() {
+        mockController(ExceptionTestErrorsController)
+        mockUrlMappings(ExceptionTestUrlMappings)
+
+        assertForwardUrlMapping(500, controller: 'exceptionTestErrors', action: 'handleNullPointer', exception: new NullPointerException())
+        assertForwardUrlMapping(500, controller: 'exceptionTestErrors', action: 'handleIllegalArgument', exception: new IllegalArgumentException())
+        assertForwardUrlMapping(500, controller: 'exceptionTestErrors', action: 'handleDefault')
+    }
+
     @Test
     @Issue('https://github.com/grails/grails-core/issues/9065')
     void testResourcesUrlMapping() {
@@ -282,3 +293,18 @@ class ResourceTestUrlMappings {
         '/person'(resources: 'person')
     }
 }
+
+@Artefact("Controller")
+class ExceptionTestErrorsController {
+    def handleNullPointer() {}
+    def handleIllegalArgument() {}
+    def handleDefault() {}
+}
+
+class ExceptionTestUrlMappings {
+    static mappings = {
+        '500'(controller: 'exceptionTestErrors', action: 'handleNullPointer', exception: NullPointerException)
+        '500'(controller: 'exceptionTestErrors', action: 'handleIllegalArgument', exception: IllegalArgumentException)
+        '500'(controller: 'exceptionTestErrors', action: 'handleDefault')
+    }
+}