svn commit: r1521805 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKBranchMergeTest.java

[mreutegg]

Author: mreutegg
Date: Wed Sep 11 11:26:15 2013
New Revision: 1521805

URL: http://svn.apache.org/r1521805
Log:
OAK-992: NPE when running FlatTreeWithAceForSamePrincipalTest on MongoMK
- Adding simplified test case (currently ignored)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKBranchMergeTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKBranchMergeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKBranchMergeTest.java?rev=1521805&r1=1521804&r2=1521805&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKBranchMergeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKBranchMergeTest.java
 Wed Sep 11 11:26:15 2013
@@ -441,6 +441,18 @@ public class MongoMKBranchMergeTest exte
         }
     }
 
+    @Ignore("OAK-992")
+    @Test
+    public void branchReadAfterMerge() {
+        String branchRev = mk.branch(null);
+        branchRev = mk.commit("/", "+\"foo\":{}", branchRev, null);
+        branchRev = mk.commit("/", "+\"bar\":{}", branchRev, null);
+        mk.merge(branchRev, null);
+        assertNodesExist(branchRev, "/foo");
+    }
+
+    //--------------------------< internal 
>------------------------------------
+
     private String addNodes(String rev, String...nodes) {
         for (String node : nodes) {
             rev = mk.commit("", "+\"" + node + "\":{}", rev, "");