svn commit: r1852460 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java

[mreutegg]

Author: mreutegg
Date: Tue Jan 29 15:39:42 2019
New Revision: 1852460

URL: http://svn.apache.org/viewvc?rev=1852460&view=rev
Log:
OAK-8008: Unmerged branch changes visible after restart

Add an ignored test

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

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java?rev=1852460&r1=1852459&r2=1852460&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchTest.java
 Tue Jan 29 15:39:42 2019
@@ -16,13 +16,28 @@
  */
 package org.apache.jackrabbit.oak.plugins.document;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
+import static 
org.apache.jackrabbit.oak.plugins.document.TestUtils.asDocumentState;
 import static org.apache.jackrabbit.oak.plugins.document.TestUtils.merge;
 import static 
org.apache.jackrabbit.oak.plugins.document.TestUtils.persistToBranch;
+import static 
org.apache.jackrabbit.oak.plugins.document.util.Utils.getRootDocument;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -103,4 +118,56 @@ public class DocumentNodeStoreBranchTest
             // expected
         }
     }
+
+    @Ignore("OAK-8008")
+    @Test
+    public void orphanedBranchTest() {
+        MemoryDocumentStore store = new MemoryDocumentStore();
+        DocumentNodeStore ns = builderProvider.newBuilder()
+                .setDocumentStore(store).build();
+        NodeBuilder builder = ns.getRoot().builder();
+        builder.setProperty("p", "v");
+        persistToBranch(builder);
+        ns.dispose();
+
+        // start again
+        ns = builderProvider.newBuilder()
+                .setDocumentStore(store).build();
+        assertFalse(ns.getRoot().hasProperty("p"));
+    }
+
+    @Test
+    public void compareBranchStates() {
+        DocumentNodeStore ns = builderProvider.newBuilder()
+                .setAsyncDelay(0).build();
+        ns.runBackgroundOperations();
+        DocumentStore store = ns.getDocumentStore();
+
+        NodeBuilder builder = ns.getRoot().builder();
+        builder.setProperty("p", "a");
+        persistToBranch(builder);
+        NodeState s1 = builder.getNodeState();
+        builder.setProperty("p", "b");
+        persistToBranch(builder);
+        NodeState s2 = builder.getNodeState();
+
+        Set<String> changes = new HashSet<>();
+        NodeStateDiff diff = new DefaultNodeStateDiff() {
+            @Override
+            public boolean propertyChanged(PropertyState before,
+                                           PropertyState after) {
+                changes.add(before.getName());
+                return super.propertyChanged(before, after);
+            }
+        };
+        s2.compareAgainstBaseState(s1, diff);
+        assertThat(changes, contains("p"));
+
+        NodeDocument root = getRootDocument(store);
+        RevisionVector br = asDocumentState(s1).getRootRevision();
+        assertTrue(br.isBranch());
+        DocumentNodeState state = root.getNodeAtRevision(ns, br, null);
+        assertNotNull(state);
+        assertEquals("a", state.getString("p"));
+    }
 }