You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by dp...@apache.org on 2011/12/13 15:04:28 UTC
svn commit: r1213697 -
/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java
Author: dpfister
Date: Tue Dec 13 14:04:27 2011
New Revision: 1213697
URL: http://svn.apache.org/viewvc?rev=1213697&view=rev
Log:
Replace '\r' (Mac OS line terminator) with '\n' (Unix line terminator)
- revert unintentional test deletion
Modified:
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java?rev=1213697&r1=1213696&r2=1213697&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java Tue Dec 13 14:04:27 2011
@@ -42,6 +42,20 @@ public class ConflictingMoveTest extends
}
@Test
+ public void collidingMove() {
+ String head = mk.getHeadRevision();
+
+ head = mk.commit("/", "+\"x\" : {} \n+\"y\" : {}\n", head, "");
+
+ try {
+ mk.commit("/", ">\"x\" : \"y\"", head, "");
+ fail("expected to fail since /y already exists");
+ } catch (MicroKernelException e) {
+ // expected
+ }
+ }
+
+ @Test
public void conflictingMove() {
String head = mk.getHeadRevision();