Author: mreutegg
Date: Thu Jan 14 15:34:17 2016
New Revision: 1724631
URL: http://svn.apache.org/viewvc?rev=1724631&view=rev
Log:
OAK-3882: Collision may mark the wrong commit
Improve test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java?rev=1724631&r1=1724630&r2=1724631&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java
Thu Jan 14 15:34:17 2016
@@ -103,14 +103,19 @@ public class CollisionWithSplitTest exte
}
}
- // now try to set a collision marker for the
- // committed revision on ns2
+ // attempt to set a property on a removed node
String id = Utils.getIdFromPath("/node-0");
- doc = ns2.getDocumentStore().find(NODES, id, 0);
- assertTrue(doc.getLocalCommitRoot().containsKey(conflictRev));
- Revision ourRev = ns2.newRevision();
UpdateOp op = new UpdateOp(id, false);
+ Revision ourRev = ns2.newRevision();
op.setMapEntry("p", ourRev, "v");
+ NodeDocument.setModified(op, ourRev);
+ NodeDocument.setCommitRoot(op, ourRev, 0);
+ ns2.getDocumentStore().findAndUpdate(NODES, op);
+
+ // now try to set a collision marker for the
+ // committed revision on ns2
+ doc = ns2.getDocumentStore().find(NODES, id);
+ assertTrue(doc.getLocalCommitRoot().containsKey(conflictRev));
Collision c = new Collision(doc, conflictRev, op, ourRev);
assertEquals("Collision must match our revision (" + ourRev + "). " +
"The conflict revision " + conflictRev + " is already
committed.",
