Author: mreutegg
Date: Thu Apr 11 12:27:05 2013
New Revision: 1466844
URL: http://svn.apache.org/r1466844
Log:
OAK-619 Lock-free MongoMK implementation
- Fix test
Modified:
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
Modified:
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java?rev=1466844&r1=1466843&r2=1466844&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
Thu Apr 11 12:27:05 2013
@@ -70,13 +70,13 @@ public class ClusterTest {
mk1.commit("/", "+\"regular\": {}", null, null);
String b1 = mk1.branch(null);
String b2 = mk1.branch(null);
- mk1.commit("/", "+\"branchVisible\": {}", b1, null);
- mk1.commit("/", "+\"branchInvisible\": {}", b2, null);
+ b1 = mk1.commit("/", "+\"branchVisible\": {}", b1, null);
+ b2 = mk1.commit("/", "+\"branchInvisible\": {}", b2, null);
mk1.merge(b1, null);
MongoMK mk2 = createMK(0);
String nodes = mk2.getNodes("/", null, 0, 0, 100, null);
-
assertEquals("{\"branchVisible\":{},\"regular\":{},\":childNodeCount\":3}",
nodes);
+
assertEquals("{\"branchVisible\":{},\"regular\":{},\":childNodeCount\":2}",
nodes);
mk1.dispose();
mk2.dispose();