Author: lukaszlenart
Date: Wed Sep 4 06:51:05 2013
New Revision: 1519918
URL: http://svn.apache.org/r1519918
Log:
Modifies assertEquals on result to don't depend on order of validations
Removed:
struts/struts2/trunk/plugins/json/src/test/resources/org/apache/struts2/json/json-validation-1.txt
Modified:
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java
Modified:
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java?rev=1519918&r1=1519917&r2=1519918&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java
(original)
+++
struts/struts2/trunk/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java
Wed Sep 4 06:51:05 2013
@@ -41,6 +41,8 @@ import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
+import static org.fest.assertions.Assertions.assertThat;
+
public class JSONValidationInterceptorTest extends StrutsTestCase {
private MockActionInvocation invocation;
@@ -66,10 +68,14 @@ public class JSONValidationInterceptorTe
String json = stringWriter.toString();
String normalizedActual = TestUtils.normalize(json, true);
- String normalizedExpected = TestUtils
-
.normalize(JSONValidationInterceptorTest.class.getResource("json-validation-1.txt"));
+
//json
- assertEquals(normalizedExpected, normalizedActual);
+ assertThat(normalizedActual)
+ .contains("\"errors\":[\"Generalerror\"],")
+ .contains("\"fieldErrors\":{")
+ .contains("\"value\":[\"Minvalueis-1\"],")
+ .contains("\"text\":[\"Tooshort\",\"Thisisnoemail\"]");
+
//execution
assertFalse(action.isExecuted());
//http status
