Fixed GrailsExceptionResolverTests

Author: rainboyan

grace-test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy

@@ -179,14 +179,21 @@ grails.exceptionresolver.params.exclude = ['jennysPhoneNumber']
         request.addParameter "jennysPhoneNumber", "8675309"
 
         System.setProperty(Environment.KEY, Environment.DEVELOPMENT.name)
-        def msg = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config))).getRequestLogMessage(new RuntimeException("bad things happened"), request)
-
-        assertEquals '''RuntimeException occurred when processing request: [GET] /execute/me - parameters:
-foo: bar
-one: two
-jennysPhoneNumber: ***
-bad things happened. Stacktrace follows:'''.replaceAll('[\n\r]', ''), msg.replaceAll('[\n\r]', '')
-
+        def resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+        resolver.stackFilterer = new DefaultStackTraceFilterer()
+        def msg = resolver.getRequestLogMessage(new RuntimeException("bad things happened"), request)
+
+        assertEquals '''RuntimeException occurred when processing request:
+URI: /execute/me
+Method: GET
+Message: bad things happened
+Parameters:
+  - foo: bar
+  - one: two
+  - jennysPhoneNumber: [FILTERED]
+
+Filtered stacktrace:
+'''.replaceAll('[\n\r]', ''), msg.replaceAll('[\n\r]', '')
     }
 
     @Test
@@ -207,16 +214,20 @@ grails.exceptionresolver.params.exclude = ['jennysPhoneNumber']
         resolver.stackFilterer = new DefaultStackTraceFilterer()
         def msg = resolver.getRequestLogMessage(request)
 
-        assertEquals '''Exception occurred when processing request: [GET] /execute/me - parameters:
-foo: bar
-one: two
-jennysPhoneNumber: ***
-Stacktrace follows:'''.replaceAll('[\n\r]', ''), msg.replaceAll('[\n\r]', '')
+        assertEquals '''Exception occurred when processing request:
+URI: /execute/me
+Method: GET
+Parameters:
+  - foo: bar
+  - one: two
+  - jennysPhoneNumber: [FILTERED]
+
+Filtered stacktrace:
+'''.replaceAll('[\n\r]', ''), msg.replaceAll('[\n\r]', '')
     }
 
     @Test
     void testDisablingRequestParameterLogging() {
-
         def oldEnvName = Environment.current.name
         try {
             def request = new MockHttpServletRequest()
@@ -225,25 +236,35 @@ Stacktrace follows:'''.replaceAll('[\n\r]', ''), msg.replaceAll('[\n\r]', '')
             request.addParameter "foo", "bar"
             request.addParameter "one", "two"
 
-            def msgWithParameters = '''Exception occurred when processing request: [GET] /execute/me - parameters:
-foo: bar
-one: two
-Stacktrace follows:'''.replaceAll('[\n\r]', '')
-            def msgWithoutParameters = '''Exception occurred when processing request: [GET] /execute/me
-Stacktrace follows:'''.replaceAll('[\n\r]', '')
+            def msgWithParameters = '''Exception occurred when processing request:
+URI: /execute/me
+Method: GET
+Parameters:
+  - foo: bar
+  - one: two
+
+Filtered stacktrace:'''.replaceAll('[\n\r]', '')
+            def msgWithoutParameters = '''Exception occurred when processing request:
+URI: /execute/me
+Method: GET
+
+Filtered stacktrace:'''.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.DEVELOPMENT.name)
             def resolver = new GrailsExceptionResolver(grailsApplication:application)
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             def msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithParameters, msg.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.PRODUCTION.name)
             resolver = new GrailsExceptionResolver(grailsApplication:application)
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithoutParameters, msg.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.TEST.name)
             resolver = new GrailsExceptionResolver(grailsApplication:application)
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithoutParameters, msg.replaceAll('[\n\r]', '')
 
@@ -253,16 +274,19 @@ grails.exceptionresolver.logRequestParameters = false
 
             System.setProperty(Environment.KEY, Environment.DEVELOPMENT.name)
             resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithoutParameters, msg.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.PRODUCTION.name)
             resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithoutParameters, msg.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.TEST.name)
             resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithoutParameters, msg.replaceAll('[\n\r]', '')
 
@@ -272,16 +296,19 @@ grails.exceptionresolver.logRequestParameters = true
 
             System.setProperty(Environment.KEY, Environment.DEVELOPMENT.name)
             resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithParameters, msg.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.PRODUCTION.name)
             resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithParameters, msg.replaceAll('[\n\r]', '')
 
             System.setProperty(Environment.KEY, Environment.TEST.name)
             resolver = new GrailsExceptionResolver(grailsApplication:new DefaultGrailsApplication(config:new PropertySourcesConfig().merge(config)))
+            resolver.stackFilterer = new DefaultStackTraceFilterer()
             msg = resolver.getRequestLogMessage(request)
             assertEquals msgWithParameters, msg.replaceAll('[\n\r]', '')
         } finally {

grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java

@@ -263,7 +263,7 @@ protected String getRequestLogMessage(String exceptionName, HttpServletRequest r
         StringBuilder sb = new StringBuilder();
 
         sb.append(exceptionName)
-                .append(" occurred when processing request: ")
+                .append(" occurred when processing request:")
                 .append(LINE_SEPARATOR);
         sb.append("URI: ");