[jjson] r72 committed - test including backslash r

[jj...@googlecode.com]

Revision: 72
Author: grobmeier
Date: Tue Aug 2 04:32:49 2011
Log: test including backslash r
http://code.google.com/p/jjson/source/detail?r=72

Modified:

/trunk/jjson-struts2/src/test/java/de/grobmeier/json/plugins/struts2/JsonResultTest.java

/trunk/jjson-struts2/src/test/java/de/grobmeier/json/plugins/struts2/MultilineTestAction.java

=======================================
---
/trunk/jjson-struts2/src/test/java/de/grobmeier/json/plugins/struts2/JsonResultTest.java
Tue Aug 2 04:01:33 2011
+++
/trunk/jjson-struts2/src/test/java/de/grobmeier/json/plugins/struts2/JsonResultTest.java
Tue Aug 2 04:32:49 2011
@@ -43,6 +43,6 @@
@Test
public void testMultiline() throws Exception {
String executeAction = this.executeAction("/multilinetest");
-
Assert.assertEquals("{\"test\":\"mytest\\nagain\",\"test2\":\"mytest%0Aagain\"}",
executeAction);
+
Assert.assertEquals("{\"test\":\"mytest\\r\\nagain\",\"test2\":\"mytest%0Aagain\"}",
executeAction);
}
}
=======================================
---
/trunk/jjson-struts2/src/test/java/de/grobmeier/json/plugins/struts2/MultilineTestAction.java
Tue Aug 2 04:01:33 2011
+++
/trunk/jjson-struts2/src/test/java/de/grobmeier/json/plugins/struts2/MultilineTestAction.java
Tue Aug 2 04:32:49 2011
@@ -25,7 +25,7 @@
private static final long serialVersionUID = -6707682090128966810L;

@JSON(encodeLinebreaks = true)
- private String test = "mytest\nagain";
+ private String test = "mytest\r\nagain";

@JSON(replaceLinebreaksWith = "%0A")
private String test2 = "mytest\nagain";