svn commit: r1100905 - /cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java

[slebresne]

Author: slebresne
Date: Mon May  9 07:28:16 2011
New Revision: 1100905

URL: http://svn.apache.org/viewvc?rev=1100905&view=rev
Log:
Fix failing MerkleTreeTest

Modified:
    
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java

Modified: 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java?rev=1100905&r1=1100904&r2=1100905&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
 Mon May  9 07:28:16 2011
@@ -447,13 +447,14 @@ public class MerkleTreeTest
         // split the leftmost
         Iterator<TreeRange> ranges = mt.invalids();
         leftmost = ranges.next();
-        mt.split(leftmost.left);
-        
-        // set the hash for the left neighbor of rightmost
+        mt.split(leftmost.right);
+
+        // set the hashes for the leaf of the created split
         middle = mt.get(leftmost.right);
         middle.hash("arbitrary!".getBytes());
+        mt.get(partitioner.midpoint(leftmost.left, leftmost.right)).hash("even 
more arbitrary!".getBytes());
 
-        // trees should disagree for (middle.left, rightmost.right]
+        // trees should disagree for (leftmost.left, middle.right]
         List<TreeRange> diffs = MerkleTree.difference(mt, mt2);
         assertEquals(diffs + " contains wrong number of differences:", 1, 
diffs.size());
         assertTrue(diffs.contains(new Range(leftmost.left, middle.right)));