From commits-return-12639-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Dec 13 14:04:52 2011 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8EB0B71EC for ; Tue, 13 Dec 2011 14:04:52 +0000 (UTC) Received: (qmail 65281 invoked by uid 500); 13 Dec 2011 14:04:52 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 65239 invoked by uid 500); 13 Dec 2011 14:04:52 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 65232 invoked by uid 99); 13 Dec 2011 14:04:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 14:04:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 14:04:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3989D23888CD; Tue, 13 Dec 2011 14:04:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213697 - /jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java Date: Tue, 13 Dec 2011 14:04:28 -0000 To: commits@jackrabbit.apache.org From: dpfister@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111213140428.3989D23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();