You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/04 21:07:07 UTC
[4/7] struts git commit: Update unit test
Update unit test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/32597350
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/32597350
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/32597350
Branch: refs/heads/master
Commit: 32597350fe8839721791b3d29b7a5993bb6af1aa
Parents: b198e3b f9b7ebb
Author: Victor Sosa <vi...@gmail.com>
Authored: Mon Jan 4 12:55:16 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Mon Jan 4 12:55:16 2016 -0400
----------------------------------------------------------------------
.../org/apache/struts2/json/JSONResultTest.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/32597350/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
----------------------------------------------------------------------
diff --cc plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
index e9ca283,e9ca283..edf6154
--- a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
+++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
@@@ -104,7 -104,7 +104,7 @@@ public class JSONResultTest extends Str
String normalizedActual = TestUtils.normalize(smd, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("smd-1.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testSMDDefaultAnnotations() throws Exception {
@@@ -121,7 -121,7 +121,7 @@@
String normalizedActual = TestUtils.normalize(smd, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("smd-2.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testExcludeNullPropeties() throws Exception {
@@@ -304,7 -304,7 +304,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
@SuppressWarnings("unchecked")
@@@ -321,7 -321,7 +321,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-4.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
@SuppressWarnings("unchecked")
@@@ -402,7 -402,7 +402,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-3.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
private void executeTest2Action(JSONResult result) throws Exception {
@@@ -442,7 -442,7 +442,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-2.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testJSONP() throws Exception {
@@@ -456,7 -456,7 +456,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("jsonp-1.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testNoCache() throws Exception {
@@@ -476,7 -476,7 +476,7 @@@
executeTest2Action(result);
-- assertEquals("some_super_content;charset=ISO-8859-1", response.getContentType());
++ assertEquals("some_super_content;charset=UTF-8", response.getContentType());
}
public void testStatusCode() throws Exception {
@@@ -502,7 -502,7 +502,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-2-enum.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
/**
@@@ -523,7 -523,7 +523,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-9.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testIncludePropertiesWithList() throws Exception {
@@@ -547,7 -547,7 +547,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-10.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testIncludePropertiesWithSetList() throws Exception {
@@@ -588,7 -588,7 +588,7 @@@
String normalizedActual = TestUtils.normalize(json, true);
String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("json-11.txt"));
assertEquals(normalizedExpected, normalizedActual);
-- assertEquals("application/json;charset=ISO-8859-1", response.getContentType());
++ assertEquals("application/json;charset=UTF-8", response.getContentType());
}
public void testDefaultEncoding() throws Exception {