Author: cziegeler
Date: Sat Aug 10 12:24:05 2013
New Revision: 1512670
URL: http://svn.apache.org/r1512670
Log:
Fix test case and do correct json evaluations
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=1512670&r1=1512669&r2=1512670&view=diff
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
Sat Aug 10 12:24:05 2013
@@ -18,6 +18,7 @@ package org.apache.sling.launchpad.webap
import java.io.IOException;
+import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.commons.testing.integration.NameValuePairList;
import org.apache.sling.servlets.post.SlingPostConstants;
import org.slf4j.Logger;
@@ -66,9 +67,10 @@ public class PropertyRenderingTest exten
assertJavascript(testMultiText2, json,
"out.println(data.multiText[1])");
}
- public void testTextJson() throws IOException {
+ public void testTextJson() throws Exception {
final String json = getContent(displayUrl + "/text.json",
CONTENT_TYPE_JSON);
- assertEquals("{\"text\":\"" + testText + "\"}",json);
+ final JSONObject obj = new JSONObject(json);
+ assertEquals(testText, obj.get("text"));
}
public void testTextHtml() throws IOException {
@@ -86,9 +88,10 @@ public class PropertyRenderingTest exten
assertEquals(testText, data);
}
- public void testMultiValuedTextJson() throws IOException {
+ public void testMultiValuedTextJson() throws Exception {
final String json = getContent(displayUrl + "/multiText.json",
CONTENT_TYPE_JSON);
- assertEquals("{\"multiText\":[\"" + testMultiText1 + "\",\""+
testMultiText2 + "\"]}",json);
+ final JSONObject obj = new JSONObject(json);
+ assertEquals("[\"" + testMultiText1 + "\",\""+ testMultiText2 + "\"]",
obj.get("multiText").toString());
}
public void testMultiValuedTextHtml() throws IOException {
