Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 60894 invoked from network); 24 Aug 2007 13:50:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Aug 2007 13:50:34 -0000 Received: (qmail 7408 invoked by uid 500); 24 Aug 2007 13:50:31 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 7320 invoked by uid 500); 24 Aug 2007 13:50:30 -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 7311 invoked by uid 99); 24 Aug 2007 13:50:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Aug 2007 06:50:30 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Aug 2007 13:50:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 353331A9832; Fri, 24 Aug 2007 06:50:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r569387 - /jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java Date: Fri, 24 Aug 2007 13:50:12 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070824135013.353331A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Fri Aug 24 06:50:11 2007 New Revision: 569387 URL: http://svn.apache.org/viewvc?rev=569387&view=rev Log: JCR-1088: de-couple WorkspaceRestoreTest from RestoreTest Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java?rev=569387&r1=569386&r2=569387&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java Fri Aug 24 06:50:11 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();