svn commit: r752628 - in /struts/struts2/trunk/core/src/test/java/org/apache/struts2: interceptor/validation/JSONValidationInterceptorTest.java views/jsp/StrutsMockHttpServletResponse.java

[musachy]

Author: musachy
Date: Wed Mar 11 21:31:51 2009
New Revision: 752628

URL: http://svn.apache.org/viewvc?rev=752628&view=rev
Log:
WW-3032 Set character encoding to UTF-8 for ajax validation

Modified:
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java?rev=752628&r1=752627&r2=752628&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
 Wed Mar 11 21:31:51 2009
@@ -80,7 +80,7 @@
         //http status
         assertEquals(HttpServletResponse.SC_BAD_REQUEST, response.getStatus());
         assertEquals("application/json", response.getContentType());
-
+        assertEquals("UTF-8", response.getCharacterEncoding());
     }
 
     public void testValidationSucceeds() throws Exception {
@@ -123,6 +123,7 @@
         assertEquals("/*{}*/", normalizedActual);
         assertFalse(action.isExecuted());
         assertEquals("application/json", response.getContentType());
+        assertEquals("UTF-8", response.getCharacterEncoding());
     }
 
     protected void setUp() throws Exception {

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java?rev=752628&r1=752627&r2=752628&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
 Wed Mar 11 21:31:51 2009
@@ -39,6 +39,7 @@
     private int status;
     private String redirectURL;
     private String contentType;
+    private String encoding;
 
     public Locale getLocale() {
         return locale;
@@ -65,7 +66,7 @@
     }
 
     public void setCharacterEncoding(String string) {
-        //To change body of implemented methods use File | Settings | File 
Templates.
+        this.encoding = string;
     }
 
     public void setWriter(PrintWriter writer) {
@@ -102,4 +103,9 @@
         this.redirectURL = redirectURL;
         super.sendRedirect(redirectURL);
     }
+
+    @Override
+    public String getCharacterEncoding() {
+        return encoding;
+    }
 }