jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r410854 - in /jackrabbit/trunk/jackrabbit: applications/test/repositoryStubImpl.properties src/test/java/org/apache/jackrabbit/test/api/version/RestoreTest.java
Date Thu, 01 Jun 2006 12:21:37 GMT
Author: mreutegg
Date: Thu Jun  1 05:21:37 2006
New Revision: 410854

URL: http://svn.apache.org/viewvc?rev=410854&view=rev
Log:
JCR-444 Error while restoring OPV=Version childnodes (Restore of root version not allowed)
- only add mix:versionable if really needed

Modified:
    jackrabbit/trunk/jackrabbit/applications/test/repositoryStubImpl.properties
    jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/RestoreTest.java

Modified: jackrabbit/trunk/jackrabbit/applications/test/repositoryStubImpl.properties
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/applications/test/repositoryStubImpl.properties?rev=410854&r1=410853&r2=410854&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/applications/test/repositoryStubImpl.properties (original)
+++ jackrabbit/trunk/jackrabbit/applications/test/repositoryStubImpl.properties Thu Jun  1
05:21:37 2006
@@ -420,6 +420,10 @@
 javax.jcr.tck.RestoreTest.testRestoreLabel.nodename4=test:versionOnParentVersion
 javax.jcr.tck.RestoreTest.testRestoreName.nodename4=test:versionOnParentVersion
 
+# Test class: WorkspaceRestoreTest
+javax.jcr.tck.WorkspaceRestoreTest.testRestoreLabel.nodename4=test:versionOnParentVersion
+javax.jcr.tck.WorkspaceRestoreTest.testRestoreName.nodename4=test:versionOnParentVersion
+
 # config for nodes that show the indicated OPV behaviour:
 # nodes are added in order to test the versioning behaviour indicated by the test-class name.
 # NOTE:

Modified: jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/RestoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/RestoreTest.java?rev=410854&r1=410853&r2=410854&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/RestoreTest.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/RestoreTest.java
Thu Jun  1 05:21:37 2006
@@ -306,7 +306,9 @@
     public void testRestoreLabel() throws RepositoryException {
         // V1.0 of versionableNode has no child
         Node child1 = versionableNode.addNode(nodeName4);
-        child1.addMixin(mixVersionable);
+        if (!child1.isNodeType(mixVersionable)) {
+            child1.addMixin(mixVersionable);
+        }
         versionableNode.save();
         // create v1.0 of child
         Version v1Child = child1.checkin();
@@ -349,7 +351,9 @@
     public void testRestoreName() throws RepositoryException {
         // V1.0 of versionableNode has no child
         Node child1 = versionableNode.addNode(nodeName4);
-        child1.addMixin(mixVersionable);
+        if (!child1.isNodeType(mixVersionable)) {
+            child1.addMixin(mixVersionable);
+        }
         versionableNode.save();
         // create v1.0 of child
         Version v1Child = child1.checkin();



Mime
View raw message