svn commit: r1511688 - in /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version: SessionMoveVersionExceptionTest.java WorkspaceMoveVersionExceptionTest.java

[mr...@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!");