Author: mreutegg
Date: Mon Nov 7 09:47:59 2016
New Revision: 1768469
URL: http://svn.apache.org/viewvc?rev=1768469&view=rev
Log:
OAK-4403: Diff traversal in persisted branch commit traversing to unrelated
paths
Adjust and enable test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java?rev=1768469&r1=1768468&r2=1768469&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
Mon Nov 7 09:47:59 2016
@@ -42,7 +42,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -161,10 +160,10 @@ public class NodeStoreDiffTest {
assertFalse(tds.paths.contains("/oak:index/prop-b/b1"));
}
- @Ignore("OAK-4403")
+ // OAK-4403
@Test
public void diffWithPersistedBranch() throws Exception{
- createNodes("/content/a", "/etc/x", "var", "/etc/y");
+ createNodes("/content/a", "/etc/x", "var/x", "/etc/y");
//#1 - Start making some changes
NodeBuilder b = ns.getRoot().builder();
@@ -191,8 +190,8 @@ public class NodeStoreDiffTest {
//With the merge the diff logic should not be accessing the
//paths which are not part of the current commit like /etc and /var
- assertThat(tds.paths, not(hasItem("/etc")));
- assertThat(tds.paths, not(hasItem("/var")));
+ assertThat(tds.paths, not(hasItem("/etc/x")));
+ assertThat(tds.paths, not(hasItem("/var/x")));
}
private NodeState merge(NodeBuilder nb) throws CommitFailedException {
