svn commit: r1867909 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java

[mr...@apache.org]

Author: mreutegg
Date: Thu Oct  3 07:27:02 2019
New Revision: 1867909

URL: http://svn.apache.org/viewvc?rev=1867909&view=rev
Log:
OAK-8667: Merge may fail when commit root is a bundled node

Add ignored test that reproduced the issue

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java?rev=1867909&r1=1867908&r2=1867909&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java Thu Oct  3 07:27:02 2019
@@ -64,6 +64,7 @@ import org.h2.mvstore.WriteBuffer;
 import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -863,6 +864,24 @@ public class DocumentBundlingTest {
         return names;
     }
 
+    @Ignore("OAK-8667")
+    @Test
+    public void deleteDescendantNodesOfBundledNode() throws Exception {
+        NodeBuilder builder = store.getRoot().builder();
+        NodeBuilder fileNode = newNtFileWithContent();
+        NodeBuilder jcrContent = fileNode.child("jcr:content");
+        jcrContent.child("foo").child("a");
+        jcrContent.child("bar").child("b");
+        builder.child("test").setChildNode("book.jpg", fileNode.getNodeState());
+        merge(builder);
+
+        builder = store.getRoot().builder();
+        jcrContent = childBuilder(builder, "test/book.jpg/jcr:content");
+        childBuilder(jcrContent, "foo/a").remove();
+        childBuilder(jcrContent, "bar/b").remove();
+        merge(builder);
+    }
+
     @Test
     public void bundlingPatternChangedAndBundledNodeRecreated() throws Exception{
         NodeBuilder builder = store.getRoot().builder();