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 1F90410D76 for ; Thu, 8 Aug 2013 10:56:54 +0000 (UTC) Received: (qmail 724 invoked by uid 500); 8 Aug 2013 10:56:53 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 99643 invoked by uid 500); 8 Aug 2013 10:56:49 -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 99579 invoked by uid 99); 8 Aug 2013 10:56:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 10:56:47 +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; Thu, 08 Aug 2013 10:56:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5E91623889EC; Thu, 8 Aug 2013 10:56:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1511688 - in /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version: SessionMoveVersionExceptionTest.java WorkspaceMoveVersionExceptionTest.java Date: Thu, 08 Aug 2013 10:56:20 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130808105620.5E91623889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Thu Aug 8 10:56:19 2013 New Revision: 1511688 URL: http://svn.apache.org/r1511688 Log: JCR-3642: Ambiguous exception expectation in SessionMoveVersionExceptionTest and WorkspaceMoveVersionExceptionTest Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/SessionMoveVersionExceptionTest.java jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceMoveVersionExceptionTest.java Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/SessionMoveVersionExceptionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/SessionMoveVersionExceptionTest.java?rev=1511688&r1=1511687&r2=1511688&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/SessionMoveVersionExceptionTest.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/SessionMoveVersionExceptionTest.java Thu Aug 8 10:56:19 2013 @@ -45,7 +45,7 @@ public class SessionMoveVersionException try { // try to move the sub node this should throw an VersionException // either instantly or upon save() - superuser.move(movingNode.getPath(), nonVersionableNode.getPath()); + superuser.move(movingNode.getPath(), nonVersionableNode.getPath() + "/" + nodeName1); superuser.save(); fail("Moving a node using Session.move() where parent node is " + "versionable and checked in should throw a VersionException!"); Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceMoveVersionExceptionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceMoveVersionExceptionTest.java?rev=1511688&r1=1511687&r2=1511688&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceMoveVersionExceptionTest.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceMoveVersionExceptionTest.java Thu Aug 8 10:56:19 2013 @@ -43,8 +43,8 @@ public class WorkspaceMoveVersionExcepti // check the parent node in versionableNode.checkin(); try { - // try to move the sub node this should throw an VersionException either instantly or upon save() - superuser.getWorkspace().move(movingNode.getPath(), nonVersionableNode.getPath()); + // try to move the sub node this should throw an VersionException + superuser.getWorkspace().move(movingNode.getPath(), nonVersionableNode.getPath() + "/" + nodeName1); fail("Moving a node using Workspace.move() where parent node is " + "versionable and checked in should throw a VersionException!"); } catch (VersionException e) { @@ -62,7 +62,7 @@ public class WorkspaceMoveVersionExcepti versionableNode.checkin(); try { - // try to move the sub node this should throw an VersionException either instantly or upon save() + // try to move the sub node this should throw an VersionException superuser.getWorkspace().move(nonVersionableNode.getPath(), versionableNode.getPath() + "/" + nodeName1); fail("Moving a node using Workspace.move() where destination parent " + "node is versionable and checked in should throw a VersionException!");