Index: src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java
===================================================================
--- src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java	(revision 653887)
+++ src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java	(working copy)
@@ -117,9 +117,8 @@
     public void testPendingChanges() throws RepositoryException, LockException, ConstraintViolationException, NoSuchNodeTypeException, ItemExistsException, VersionException, NotExecutableException {
         testRootNode.addNode(nodeName2, testNodeType);
 
-        String srcWorkspace = getAnotherWorkspace();
         try {
-            testRootNode.update(srcWorkspace);
+            testRootNode.update(workspaceName);
             fail("Update while changes are pending must fail with InvalidItemStateException");
         } catch (InvalidItemStateException  e) {
             // ok
@@ -141,9 +140,8 @@
             throw new NotExecutableException();
         }
 
-        String srcWorkspace = getAnotherWorkspace();
         try {
-            testRootNode.update(srcWorkspace);
+            testRootNode.update(workspaceName);
             fail("Update while changes are pending must fail with InvalidItemStateException");
         } catch (InvalidItemStateException  e) {
             // ok
@@ -155,18 +153,17 @@
         testRootNode.setProperty(propertyName2, "test");
         testRootNode.save();
 
-        String srcWorkspace = getAnotherWorkspace();
         // get the root node in the second workspace
-        Session session2 = helper.getSuperuserSession(srcWorkspace);
+        Session session2 = helper.getSuperuserSession(workspaceName);
         try {
             // make sure the source-session has the corresponding node.
-            Node testRootW2 = (Node) session2.getItem(testRootNode.getCorrespondingNodePath(srcWorkspace));
+            Node testRootW2 = (Node) session2.getItem(testRootNode.getCorrespondingNodePath(workspaceName));
             if (testRootW2.hasProperty(propertyName2)) {
                 throw new NotExecutableException();
             }
 
             // call the update method on test node in default workspace
-            testRootNode.update(srcWorkspace);
+            testRootNode.update(workspaceName);
 
             // ok first check if node has no longer propertis
             assertFalse("Node updated with Node.update() should have property removed", testRootNode.hasProperty(propertyName2));
@@ -176,12 +173,11 @@
     }
 
     public void testUpdateAddsMissingSubtree() throws RepositoryException, NotExecutableException {
-        String srcWorkspace = getAnotherWorkspace();
         // get the root node in the second workspace
-        Session session2 = helper.getSuperuserSession(srcWorkspace);
+        Session session2 = helper.getSuperuserSession(workspaceName);
         try {
             // make sure the source-session has the corresponding node.
-            Node testRootW2 = (Node) session2.getItem(testRootNode.getCorrespondingNodePath(srcWorkspace));
+            Node testRootW2 = (Node) session2.getItem(testRootNode.getCorrespondingNodePath(workspaceName));
 
             // create test node in second workspace
             Node aNode2 = testRootW2.addNode(nodeName1, testNodeType);
@@ -191,7 +187,7 @@
             testRootW2.save();
 
             // call the update method on test node in default workspace
-            testRootNode.update(srcWorkspace);
+            testRootNode.update(workspaceName);
 
             // ok check if the child has been added
             boolean allPresent = testRootNode.hasNode(nodeName1) &&
@@ -204,16 +200,4 @@
         }
     }
 
-    private String getAnotherWorkspace() throws NotExecutableException {
-        String srcWorkspace = null;
-        for (int i = 0; i < accessibleWorkspaces.length; i++) {
-            if (!accessibleWorkspaces[i].equals(currentWorkspace)) {
-                srcWorkspace = accessibleWorkspaces[i];
-            }
-        }
-        if (srcWorkspace == null) {
-            throw new NotExecutableException("Cannot run update. No workspace found, that misses the corresponding node.");
-        }
-        return srcWorkspace;
-    }
 }