You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/09/20 20:42:48 UTC
svn commit: r577866 -
/jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java
Author: jukka
Date: Thu Sep 20 11:42:48 2007
New Revision: 577866
URL: http://svn.apache.org/viewvc?rev=577866&view=rev
Log:
1.3: Merged revision 569387 (JCR-1088)
Modified:
jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java
Modified: jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java?rev=577866&r1=577865&r2=577866&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java Thu Sep 20 11:42:48 2007
@@ -38,9 +38,15 @@
* @executeClass org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest
* @keywords versioning
*/
-public class WorkspaceRestoreTest extends RestoreTest {
+public class WorkspaceRestoreTest extends AbstractVersionTest {
Session wSuperuser;
+
+ Version version;
+ Version version2;
+ Version rootVersion;
+
+ Node versionableNode2;
Node wTestRoot;
Node wVersionableNode;
Node wVersionableNode2;
@@ -51,6 +57,18 @@
protected void setUp() throws Exception {
super.setUp();
+ version = versionableNode.checkin();
+ versionableNode.checkout();
+ version2 = versionableNode.checkin();
+ versionableNode.checkout();
+ rootVersion = versionableNode.getVersionHistory().getRootVersion();
+
+ // build a second versionable node below the testroot
+ try {
+ versionableNode2 = createVersionableNode(testRootNode, nodeName2, versionableNodeType);
+ } catch (RepositoryException e) {
+ fail("Failed to create a second versionable node: " + e.getMessage());
+ }
try {
wSuperuser = helper.getSuperuserSession(workspaceName);
} catch (RepositoryException e) {
@@ -112,6 +130,7 @@
protected void tearDown() throws Exception {
try {
// remove all versionable nodes below the test
+ versionableNode2.remove();
wVersionableNode.remove();
wVersionableNode2.remove();
wTestRoot.save();