svn commit: r761070 - in /incubator/shindig/trunk/java: gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java server/pom.xml server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java

[awiner]

Author: awiner
Date: Wed Apr  1 21:37:39 2009
New Revision: 761070

URL: http://svn.apache.org/viewvc?rev=761070&view=rev
Log:
Use JsonAssert instead of JSONObject.toString() and assertEquals() so tests 
don't depend on hash ordering

Modified:
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
    incubator/shindig/trunk/java/server/pom.xml
    
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.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=761070&r1=761069&r2=761070&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
 Wed Apr  1 21:37:39 2009
@@ -22,17 +22,17 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.shindig.common.JsonAssert;
 import org.apache.shindig.config.ContainerConfig;
 import org.apache.shindig.expressions.Expressions;
+import org.apache.shindig.gadgets.Gadget;
+import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.http.HttpRequest;
 import org.apache.shindig.gadgets.http.HttpResponse;
 import org.apache.shindig.gadgets.http.HttpResponseBuilder;
 import org.apache.shindig.gadgets.http.RequestPipeline;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
 import org.apache.shindig.gadgets.spec.PipelinedData;
-import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.GadgetException;
-
 import org.easymock.EasyMock;
 import org.json.JSONObject;
 import org.junit.Before;
@@ -135,8 +135,8 @@
     JSONObject resultWithKeyP = new JSONObject("{id: 'p', data: 1}");
     JSONObject resultWithKeyA = new JSONObject("{id: 'a', data: 2}");
     Iterator<Object> iter = result.iterator();
-    assertEquals(resultWithKeyP.toString(), iter.next().toString());
-    assertEquals(resultWithKeyA.toString(), iter.next().toString());
+    JsonAssert.assertJsonEquals(resultWithKeyP.toString(), 
iter.next().toString());
+    JsonAssert.assertJsonEquals(resultWithKeyA.toString(), 
iter.next().toString());
 
     // Should have only fetched one request
     assertEquals(1, pipeline.requests.size());
@@ -216,12 +216,12 @@
             "content: '{foo: \\'bar\\'}'}, id: 'p'}";
 
     String resultString = executeHttpPreload(response, 
XML_WITH_HTTP_REQUEST_FOR_TEXT);
-    assertEquals(new JSONObject(expectedResult).toString(), resultString);
+    JsonAssert.assertJsonEquals(expectedResult, resultString);
   }
 
   private void verifyHttpPreload(HttpResponse response, String expectedJson) 
throws Exception {
     String resultString = executeHttpPreload(response, XML_WITH_HTTP_REQUEST);
-    assertEquals(new JSONObject(expectedJson).toString(), resultString);
+    JsonAssert.assertJsonEquals(expectedJson, resultString);
   }
   
   /**

Modified: incubator/shindig/trunk/java/server/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=761070&r1=761069&r2=761070&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Wed Apr  1 21:37:39 2009
@@ -113,6 +113,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-common</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
       <artifactId>shindig-gadgets</artifactId>
     </dependency>
     <dependency>

Modified: 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=761070&r1=761069&r2=761070&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
 (original)
+++ 
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
 Wed Apr  1 21:37:39 2009
@@ -20,6 +20,7 @@
 import org.apache.shindig.auth.BasicSecurityToken;
 import org.apache.shindig.auth.BasicSecurityTokenDecoder;
 import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.common.JsonAssert;
 import org.apache.shindig.common.crypto.BlobCrypterException;
 
 import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
@@ -176,7 +177,7 @@
     
     JSONObject json = jsonObjects.get("json").getJSONObject("data");
     JSONObject expected = new JSONObject("{content: {key: 'value'}, status: 
200}");
-    assertEquals(expected.toString(), json.toString());
+    JsonAssert.assertJsonObjectEquals(expected, json);
   }
 
   @Test