Author: beaton
Date: Mon Jun 8 18:50:59 2009
New Revision: 782725
URL: http://svn.apache.org/viewvc?rev=782725&view=rev
Log:
Fix failing test case, looks like it was making bad assumptions about the order
of objects in a JSONArray.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=782725&r1=782724&r2=782725&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
Mon Jun 8 18:50:59 2009
@@ -239,10 +239,15 @@
Collection<Callable<PreloadedData>> tasks = preloader.createPreloadTasks(
context, batch);
PreloadedData data = tasks.iterator().next().call();
- JsonAssert.assertObjectEquals(
- "[{error:{code:403,data:{content:\"Security token
missing\"}},id:\"a\"}," +
- "{error:{code:403,data:{content:\"Security token
missing\"}},id:\"p\"}]",
- data.toJson());
+ JSONObject resultWithKeyA = new JSONObject(
+ "{error:{code:403,data:{content:\"Security token
missing\"}},id:\"a\"}");
+ JSONObject resultWithKeyP = new JSONObject(
+ "{error:{code:403,data:{content:\"Security token
missing\"}},id:\"p\"}");
+ Collection<Object> result = data.toJson();
+ assertEquals(2, result.size());
+ Map<String, String> resultsById = getResultsById(result);
+ JsonAssert.assertJsonEquals(resultWithKeyA.toString(),
resultsById.get("a"));
+ JsonAssert.assertJsonEquals(resultWithKeyP.toString(),
resultsById.get("p"));
}
private Map<String, String> getResultsById(Collection<Object> result) {
