You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/28 03:09:03 UTC
svn commit: r949055 - in /shindig/trunk:
features/src/main/javascript/features/opensocial-jsonrpc/
features/src/main/javascript/features/osapi/ java/common/conf/
java/common/src/main/java/org/apache/shindig/protocol/
java/common/src/test/java/org/apach...
Author: lindner
Date: Fri May 28 01:09:02 2010
New Revision: 949055
URL: http://svn.apache.org/viewvc?rev=949055&view=rev
Log:
SHINDIG-1144 | fix json-rpc responses
Modified:
shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
shindig/trunk/java/common/conf/shindig.properties
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Modified: shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js (original)
+++ shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js Fri May 28 01:09:02 2010
@@ -169,7 +169,8 @@ var JsonRpcRequestItem = function(rpc, o
return;
}
- result = result.data;
+ // Support old 'data' element and correct 'result' element
+ result = result.result || result.data;
var globalError = false;
var responseMap = {};
@@ -188,7 +189,7 @@ var JsonRpcRequestItem = function(rpc, o
") and response id(" + response.id + ") do not match";
}
- var rawData = response.data;
+ var rawData = response.result || result.data;
var error = response.error;
var errorMessage = "";
@@ -234,7 +235,7 @@ var JsonRpcRequestItem = function(rpc, o
callback) {
var globalErrorCode =
JsonRpcContainer.translateHttpError(result.rc
- || result.data.error)
+ || result.result.error || result.data.error)
|| opensocial.ResponseItem.Error.INTERNAL_ERROR;
var errorResponseMap = {};
Modified: shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js (original)
+++ shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js Fri May 28 01:09:02 2010
@@ -39,7 +39,7 @@
}
});
} else {
- var jsonResponse = response.data;
+ var jsonResponse = response.result || response.data;
if (jsonResponse.error) {
callback(jsonResponse);
} else {
Modified: shindig/trunk/java/common/conf/shindig.properties
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/conf/shindig.properties?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/common/conf/shindig.properties (original)
+++ shindig/trunk/java/common/conf/shindig.properties Fri May 28 01:09:02 2010
@@ -124,5 +124,16 @@ shindig.http.client.max-object-size-byte
shindig.uri.proxy.use-strict-parsing=false
shindig.uri.concat.use-strict-parsing=false
-
org.apache.shindig.serviceExpirationDurationMinutes=60
+
+#
+# Older versions of shindig used 'data' in the json-rpc response format
+# The spec calls for using 'result' instead, however to avoid breakage we
+# allow you to set it back to the old way here
+#
+# valid values are
+# result - new form
+# data - old broken form
+# both - return both fields for full compatibility
+#
+shindig.json-rpc.result-field=result
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Fri May 28 01:09:02 2010
@@ -30,6 +30,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
+import com.google.inject.name.Named;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -67,6 +68,14 @@ public class JsonRpcServlet extends ApiS
this.formParser = formParser;
}
+ private String jsonRpcResultField = "result";
+ private boolean jsonRpcBothFields = false;
+ @Inject
+ void setJsonRpcResultField(@Named("shindig.json-rpc.result-field")String jsonRpcResultField) {
+ this.jsonRpcResultField = jsonRpcResultField;
+ jsonRpcBothFields = "both".equals(jsonRpcResultField);
+ }
+
@Override
protected void service(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
throws IOException {
@@ -220,6 +229,17 @@ public class JsonRpcServlet extends ApiS
}
/**
+ *
+ */
+ protected void addResult(Map<String,Object> result, Object data) {
+ if (jsonRpcBothFields) {
+ result.put("result", data);
+ result.put("data", data);
+ }
+ result.put(jsonRpcResultField, data);
+ }
+
+ /**
* Determine if the content contains a batch request
*
* @param content json content or null
@@ -248,7 +268,7 @@ public class JsonRpcServlet extends ApiS
} else {
Object response = responseItem.getResponse();
if (response instanceof DataCollection) {
- result.put("data", ((DataCollection) response).getEntry());
+ addResult(result, ((DataCollection) response).getEntry());
} else if (response instanceof RestfulCollection) {
Map<String, Object> map = Maps.newHashMap();
RestfulCollection<?> collection = (RestfulCollection<?>) response;
@@ -270,9 +290,9 @@ public class JsonRpcServlet extends ApiS
map.put("sorted", collection.isUpdatedSince());
map.put("list", collection.getEntry());
- result.put("data", map);
+ addResult(result, map);
} else {
- result.put("data", response);
+ addResult(result, response);
}
// TODO: put "code" for != 200?
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java Fri May 28 01:09:02 2010
@@ -120,7 +120,7 @@ public class JsonRpcServletTest extends
servlet.service(req, res);
mockControl.verify();
- JsonAssert.assertJsonEquals("{id: 'id', data: {foo:'bar'}}", getOutput());
+ JsonAssert.assertJsonEquals("{id: 'id', result: {foo:'bar'}}", getOutput());
}
@Test
@@ -158,7 +158,7 @@ public class JsonRpcServletTest extends
servlet.service(req, res);
mockControl.verify();
- JsonAssert.assertJsonEquals("{id: 'id', data: {image-data:'" + IMAGE_DATA +
+ JsonAssert.assertJsonEquals("{id: 'id', result: {image-data:'" + IMAGE_DATA +
"', image-type:'" + IMAGE_TYPE + "', image-ref:'@" + IMAGE_FIELDNAME + "'}}", getOutput());
}
@@ -200,7 +200,7 @@ public class JsonRpcServletTest extends
servlet.service(req, res);
mockControl.verify();
- JsonAssert.assertJsonEquals("{id: 'id', data: {image-data:'" + IMAGE_DATA +
+ JsonAssert.assertJsonEquals("{id: 'id', result: {image-data:'" + IMAGE_DATA +
"', image-type:'" + IMAGE_TYPE + "', image-ref:'@" + IMAGE_FIELDNAME + "'}}", getOutput());
}
@@ -247,7 +247,7 @@ public class JsonRpcServletTest extends
servlet.service(req, res);
mockControl.verify();
- JsonAssert.assertJsonEquals("{id: 'id', data: {image-data:'" + IMAGE_DATA +
+ JsonAssert.assertJsonEquals("{id: 'id', result: {image-data:'" + IMAGE_DATA +
"', image-type:'" + IMAGE_TYPE + "', image-ref:'@" + IMAGE_FIELDNAME + "'}}", getOutput());
}
@@ -342,7 +342,7 @@ public class JsonRpcServletTest extends
servlet.service(req, res);
mockControl.verify();
- JsonAssert.assertJsonEquals("[{id:'1',data:{foo:'bar'}},{id:'2',data:{foo:'bar'}}]",
+ JsonAssert.assertJsonEquals("[{id:'1',result:{foo:'bar'}},{id:'2',result:{foo:'bar'}}]",
getOutput());
}
@@ -362,21 +362,21 @@ public class JsonRpcServletTest extends
servlet.service(req, res);
mockControl.verify();
- JsonAssert.assertJsonEquals("{id:'1',data:{foo:'bar'}}", getOutput());
+ JsonAssert.assertJsonEquals("{id:'1',result:{foo:'bar'}}", getOutput());
}
@Test
public void testGetJsonResponseWithKey() throws Exception {
ResponseItem responseItem = new ResponseItem("Name");
Object result = servlet.getJSONResponse("my-key", responseItem);
- JsonAssert.assertObjectEquals("{id: 'my-key', data: 'Name'}", result);
+ JsonAssert.assertObjectEquals("{id: 'my-key', result: 'Name'}", result);
}
@Test
public void testGetJsonResponseWithoutKey() throws Exception {
ResponseItem responseItem = new ResponseItem("Name");
Object result = servlet.getJSONResponse(null, responseItem);
- JsonAssert.assertObjectEquals("{data: 'Name'}", result);
+ JsonAssert.assertObjectEquals("{result: 'Name'}", result);
}
@Test
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java Fri May 28 01:09:02 2010
@@ -129,7 +129,7 @@ public class PipelineExecutor {
String id = (String) JsonUtil.getProperty(entry, "id");
- Object data = JsonUtil.getProperty(entry, "data");
+ Object data = JsonUtil.getProperty(entry, "result");
if (data != null) {
elResults.put(id, data);
} else {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java Fri May 28 01:09:02 2010
@@ -121,7 +121,7 @@ public class PipelinedDataPreloader {
public VariableTask(String key, Object data) {
this.result = (data == null) ? ImmutableMap.of("id", (Object) key)
- : ImmutableMap.of("id", key, "data", data);
+ : ImmutableMap.of("id", key, "result", data);
}
public PreloadedData call() throws Exception {
@@ -284,7 +284,7 @@ public class PipelinedDataPreloader {
} else {
// Create {data: {status: [CODE], content: {...}|[...]|"...", headers:{...}}}
JSONObject data = new JSONObject();
- wrapper.put("data", data);
+ wrapper.put("result", data);
// Add the status
data.put("status", response.getHttpStatusCode());
@@ -305,8 +305,8 @@ public class PipelinedDataPreloader {
data.put("content", new JSONObject(responseText));
}
} catch (JSONException je) {
- // JSON parse failed: create a 406 error, and remove the "data" section
- wrapper.remove("data");
+ // JSON parse failed: create a 406 error, and remove the "result" section
+ wrapper.remove("result");
wrapper.put("error", createJsonError(
HttpResponse.SC_NOT_ACCEPTABLE, je.getMessage(), response));
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java Fri May 28 01:09:02 2010
@@ -50,7 +50,7 @@ public class DefaultServiceFetcher {
static final Logger logger = Logger.getLogger(Renderer.class.getName());
- static final String JSON_RESPONSE_WRAPPER_ELEMENT = "data";
+ static final String JSON_RESPONSE_WRAPPER_ELEMENT = "result";
static final String OSAPI_FEATURE_CONFIG = "osapi";
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java Fri May 28 01:09:02 2010
@@ -85,7 +85,7 @@ import com.google.inject.Inject;
* in the above format. The RPC itself succeeded in these cases. If an RPC error occurred the client
* should introspect the error message for information as to the cause.
*
- * TODO: send errors using "data", not plain content
+ * TODO: send errors using "result", not plain content
*
* @see MakeRequestHandler
*/
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java Fri May 28 01:09:02 2010
@@ -105,7 +105,7 @@ public class PipelineExecutorTest {
Capture<PipelinedData.Batch> batchCapture =
new Capture<PipelinedData.Batch>();
- JSONObject expectedData = new JSONObject("{data: {foo: 'bar'}}");
+ JSONObject expectedData = new JSONObject("{result: {foo: 'bar'}}");
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask("key", expectedData.toString());
@@ -124,7 +124,7 @@ public class PipelineExecutorTest {
assertTrue(batchCapture.getValue().getPreloads().containsKey("me"));
assertTrue(batchCapture.getValue().getPreloads().containsKey("json"));
- JsonAssert.assertJsonEquals("[{id: 'key', data: {foo: 'bar'}}]",
+ JsonAssert.assertJsonEquals("[{id: 'key', result: {foo: 'bar'}}]",
JsonSerializer.serialize(results.results));
JsonAssert.assertJsonEquals("{foo: 'bar'}",
JsonSerializer.serialize(results.keyedResults.get("key")));
@@ -152,13 +152,13 @@ public class PipelineExecutorTest {
Capture<PipelinedData.Batch> firstBatch =
new Capture<PipelinedData.Batch>();
Callable<PreloadedData> firstTask = createPreloadTask("json",
- "{data: {user: 'canonical'}}");
+ "{result: {user: 'canonical'}}");
// Second batch, the user fetch
Capture<PipelinedData.Batch> secondBatch =
new Capture<PipelinedData.Batch>();
Callable<PreloadedData> secondTask = createPreloadTask("me",
- "{data: {'id':'canonical'}}");
+ "{result: {'id':'canonical'}}");
// First, a batch with an HTTP request
expect(
@@ -176,8 +176,8 @@ public class PipelineExecutorTest {
PipelineExecutor.Results results = executor.execute(context,
ImmutableList.of(pipeline));
- JsonAssert.assertJsonEquals("[{id: 'json', data: {user: 'canonical'}}," +
- "{id: 'me', data: {id: 'canonical'}}]",
+ JsonAssert.assertJsonEquals("[{id: 'json', result: {user: 'canonical'}}," +
+ "{id: 'me', result: {id: 'canonical'}}]",
JsonSerializer.serialize(results.results));
assertEquals(ImmutableSet.of("json", "me"), results.keyedResults.keySet());
assertTrue(results.remainingPipelines.isEmpty());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java Fri May 28 01:09:02 2010
@@ -121,7 +121,7 @@ public class PipelinedDataPreloaderTest
public void testSocialPreload() throws Exception {
GadgetSpec spec = new GadgetSpec(GADGET_URL, XML);
- String socialResult = "[{id:'p', data:1}, {id:'a', data:2}]";
+ String socialResult = "[{id:'p', result:1}, {id:'a', result:2}]";
RecordingRequestPipeline pipeline = new RecordingRequestPipeline(socialResult);
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline, containerConfig);
@@ -143,8 +143,8 @@ public class PipelinedDataPreloaderTest
Collection<Object> result = tasks.iterator().next().call().toJson();
assertEquals(2, result.size());
- JSONObject resultWithKeyP = new JSONObject("{id: 'p', data: 1}");
- JSONObject resultWithKeyA = new JSONObject("{id: 'a', data: 2}");
+ JSONObject resultWithKeyP = new JSONObject("{id: 'p', result: 1}");
+ JSONObject resultWithKeyA = new JSONObject("{id: 'a', result: 2}");
Map<String, String> resultsById = getResultsById(result);
JsonAssert.assertJsonEquals(resultWithKeyA.toString(), resultsById.get("a"));
JsonAssert.assertJsonEquals(resultWithKeyP.toString(), resultsById.get("p"));
@@ -276,7 +276,7 @@ public class PipelinedDataPreloaderTest
HttpResponse response = new HttpResponseBuilder()
.setResponseString("{foo: 'bar'}")
.create();
- String expectedResult = "{data: {status: 200, content: {foo: 'bar'}}, id: 'p'}";
+ String expectedResult = "{result: {status: 200, content: {foo: 'bar'}}, id: 'p'}";
verifyHttpPreload(response, expectedResult);
}
@@ -290,7 +290,7 @@ public class PipelinedDataPreloaderTest
.addHeader("not-ok", "shouldn'tbehere")
.create();
- String expectedResult = "{data: {status: 200, headers:" +
+ String expectedResult = "{result: {status: 200, headers:" +
"{'content-type': ['application/json; charset=UTF-8'], 'set-cookie': ['cookiecookie']}," +
"content: [1, 2]}, id: 'p'}";
@@ -320,7 +320,7 @@ public class PipelinedDataPreloaderTest
.create();
JSONObject result = new JSONObject(executeHttpPreload(response, XML_WITH_HTTP_REQUEST));
- assertFalse(result.has("data"));
+ assertFalse(result.has("result"));
JSONObject error = result.getJSONObject("error");
assertEquals(HttpResponse.SC_NOT_ACCEPTABLE, error.getInt("code"));
@@ -334,7 +334,7 @@ public class PipelinedDataPreloaderTest
.create();
// Even though the response was actually JSON, @format=text, so the content
// will be a block of text
- String expectedResult = "{data: {status: 200, headers:" +
+ String expectedResult = "{result: {status: 200, headers:" +
"{'content-type': ['application/json; charset=UTF-8']}," +
"content: '{foo: \\'bar\\'}'}, id: 'p'}";
@@ -444,7 +444,7 @@ public class PipelinedDataPreloaderTest
public void testSocialPreloadViewResolution() throws Exception {
GadgetSpec spec = new GadgetSpec(GADGET_URL, XML_IN_DEFAULT_CONTAINER);
- String socialResult = "[{id:'p', data:1}, {id:'a', data:2}]";
+ String socialResult = "[{id:'p', result:1}, {id:'a', result:2}]";
RecordingRequestPipeline pipeline = new RecordingRequestPipeline(socialResult);
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline, containerConfig);
@@ -488,7 +488,7 @@ public class PipelinedDataPreloaderTest
Collection<Object> result = tasks.iterator().next().call().toJson();
assertEquals(1, result.size());
- JsonAssert.assertObjectEquals("{id: 'p', data: 2}", result.iterator().next());
+ JsonAssert.assertObjectEquals("{id: 'p', result: 2}", result.iterator().next());
}
private static class RecordingRequestPipeline implements RequestPipeline {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java Fri May 28 01:09:02 2010
@@ -117,11 +117,11 @@ public class DefaultServiceFetcherTest e
public void testReadConfigWithValidEndpoints() throws Exception {
List<String> endPoint1Services = ImmutableList.of("do.something", "delete.someting");
JSONObject service1 = new JSONObject();
- service1.put("data", endPoint1Services);
+ service1.put("result", endPoint1Services);
List<String> endPoint2Services = ImmutableList.of("weather.get");
JSONObject service2 = new JSONObject();
- service2.put("data", endPoint2Services);
+ service2.put("result", endPoint2Services);
EasyMock.expect(mockFetcher.fetch(EasyMock.isA(HttpRequest.class))).andReturn(
new HttpResponse(service1.toString()));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java Fri May 28 01:09:02 2010
@@ -120,7 +120,7 @@ public class PipelineDataGadgetRewriterT
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask(
- "key", "{data: {foo: 'bar'}}");
+ "key", "{result: {foo: 'bar'}}");
// One batch with 1 each HTTP and Social preload
expect(preloader.createPreloadTasks(same(gadget.getContext()),
Modified: shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=949055&r1=949054&r2=949055&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java (original)
+++ shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java Fri May 28 01:09:02 2010
@@ -213,14 +213,14 @@ public class EndToEndTest {
jsonObjects.put(jsonObj.getString("id"), jsonObj);
}
- JSONObject me = jsonObjects.get("me").getJSONObject("data");
+ JSONObject me = jsonObjects.get("me").getJSONObject("result");
assertEquals("Digg", me.getJSONObject("name").getString("familyName"));
- JSONObject json = jsonObjects.get("json").getJSONObject("data");
+ JSONObject json = jsonObjects.get("json").getJSONObject("result");
JSONObject expected = new JSONObject("{content: {key: 'value'}, status: 200}");
JsonAssert.assertJsonObjectEquals(expected, json);
- JsonAssert.assertObjectEquals("{id: 'var', data: 'value'}", jsonObjects.get("var"));
+ JsonAssert.assertObjectEquals("{id: 'var', result: 'value'}", jsonObjects.get("var"));
}
// TODO PML - convert this to use junit 4 Theories to simplify this.