cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject cassandra git commit: Fix broken JSON object comparison in test
Date Fri, 27 Mar 2015 22:29:09 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk a2d1bfbc7 -> 9129b6e81


Fix broken JSON object comparison in test

patch by Ariel Weisberg; reviewed by Aleksey Yeschenko for
CASSANDRA-9065


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9129b6e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9129b6e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9129b6e8

Branch: refs/heads/trunk
Commit: 9129b6e812fe69163243dc98b65a6629770564d5
Parents: a2d1bfb
Author: Ariel Weisberg <ariel@weisberg.ws>
Authored: Fri Mar 27 18:22:06 2015 -0400
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Mar 28 01:28:19 2015 +0300

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/tools/SSTableExportTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9129b6e8/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index 023b5f3..794d224 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -91,7 +91,7 @@ public class SSTableExportTest
     {
         return bytesToHex(ByteBufferUtil.bytes(str));
     }
-    
+
     @Test
     public void testEnumeratekeys() throws IOException
     {
@@ -123,7 +123,7 @@ public class SSTableExportTest
             char[] buf = new char[(int) temp.length()];
             file.read(buf);
             String output = new String(buf);
-    
+
             String sep = System.getProperty("line.separator");
             assert output.equals(asHex("rowA") + sep + asHex("rowB") + sep) : output;
         }
@@ -328,8 +328,8 @@ public class SSTableExportTest
 
         assertEquals(
                 "unexpected serialization format for topLevelDeletion",
-                "{\"markedForDeleteAt\":0,\"localDeletionTime\":0}",
-                serializedDeletionInfo.toJSONString());
+                JSONValue.parse("{\"markedForDeleteAt\":0,\"localDeletionTime\":0}"),
+                serializedDeletionInfo);
 
         // check the colums are what we put in
         JSONArray cols = (JSONArray) row.get("cells");


Mime
View raw message