commit e1847365a682f915e0c3e946ac9b0005b21919b5
author Carbo Kuo <carbokuo@fb.com> Wed Sep 25 05:43:51 2013 -0700
committer Michael Bolin <mbolin@fb.com> Wed Sep 25 11:13:26 2013 -0700
tree 402419090f60c652c9498f072a97b8064ea9f3b1
parent 158eccd7c51972fd6c2765cd0fcef174f9df2907

Reimplement EventSerializationTest using map comparison.

Summary:
Serialize POJO to Json and to Map object. More stable and readable than string comparison.

Test Plan: Unit test

test/com/facebook/buck/event/EventSerializationTest.java

diff --git a/test/com/facebook/buck/event/EventSerializationTest.java b/test/com/facebook/buck/event/EventSerializationTest.java
index 344c87d..a4073ad 100644
--- a/test/com/facebook/buck/event/EventSerializationTest.java
+++ b/test/com/facebook/buck/event/EventSerializationTest.java
@@ -38,6 +38,9 @@
 import com.facebook.buck.test.TestResults;
 import com.facebook.buck.timing.Clock;
 import com.facebook.buck.timing.DefaultClock;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
@@ -194,7 +197,14 @@
     return new TestResults(testCases);
   }
 
-  private void assertJsonEquals(String expected, String actual) {
-    assertEquals(String.format(expected, timestamp, nanoTime, threadId, buildId), actual);
+  private void assertJsonEquals(String expected, String actual) throws IOException {
+    ObjectMapper mapper = new ObjectMapper();
+    JsonFactory factory = mapper.getJsonFactory();
+    JsonParser jsonParser = factory.createJsonParser(
+        String.format(expected, timestamp, nanoTime, threadId, buildId));
+    JsonNode expectedObject = mapper.readTree(jsonParser);
+    jsonParser = factory.createJsonParser(actual);
+    JsonNode actualObject = mapper.readTree(jsonParser);
+    assertEquals(expectedObject, actualObject);
   }
 }