From b1af6cba9ab126d6fd0d5943f20265fb07cd9bd7 Mon Sep 17 00:00:00 2001 From: Randall Hauch Date: Fri, 25 May 2012 11:43:16 -0500 Subject: [PATCH] JCR-2666 Corrected expectation for a test in RestoreTest The test case 'testRestoreNameJcr2' in o.a.j.test.version.RestoreTest, ends by validating that restoring a versionable parent also restores its versionable child. This was the correct behavior in JCR 1.0, but was changed in Section 15.7.5 of JSR-283 ("If the workspace currently has an already existing node corresponding to C's version history and the removeExisting flag of the restore is set to true, then that instance of C becomes the child of the restored N."). The 'testRestoreName' method in the same class correctly notes this and changed the behavior for JCR 2. The last 3 lines of 'testRestoreNameJcr2' were replaced with the last 5 lines in 'testRestoreName'. Even with this change, the full Jackrabbit build completes successfully. --- .../jackrabbit/test/api/version/RestoreTest.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java index 9b5ec17..a4dfab5 100644 --- a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java +++ b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RestoreTest.java @@ -1041,10 +1041,11 @@ public class RestoreTest extends AbstractVersionTest { child1 = versionableNode.getNode(nodeName4); assertEquals("restore must restore child node version 1.0.", v1Child.getName(), versionManager.getBaseVersion(child1.getPath()).getName()); - // restore V2 via name. child should be 1.1 + // New JSR283 version: + // restore V2 via name. child should still be be 1.0 versionManager.restore(versionableNode.getPath(), v2, true); child1 = versionableNode.getNode(nodeName4); - assertEquals("Node.restore('foo') must restore child node version 1.1.", v11Child.getName(), versionManager.getBaseVersion(child1.getPath()).getName()); + assertEquals("Node.restore('foo') must not restore child node and keep version 1.0.", v1Child.getName(), child1.getBaseVersion().getName()); } /** -- 1.7.6