svn commit: r1692156 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionTest.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Jul 21 15:52:53 2015
New Revision: 1692156

URL: http://svn.apache.org/r1692156
Log:
OAK-3130: VersionHistory.removeVersion() succeeds even if version is still referenced

Add test. Succeeds unless vMgr.checkout(n.getPath()) is commented out

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionTest.java?rev=1692156&r1=1692155&r2=1692156&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionTest.java Tue Jul 21 15:52:53 2015
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.jcr.ve
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
+import javax.jcr.ReferentialIntegrityException;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -101,4 +102,24 @@ public class VersionTest extends Abstrac
                 frozenChild.getProperty(Property.JCR_FROZEN_UUID).getString());
         vMgr.restore(v, true);
     }
+
+    // OAK-3130
+    public void testRemoveVersion() throws RepositoryException {
+        Node n = testRootNode.addNode(nodeName1, testNodeType);
+        n.addMixin(mixVersionable);
+        superuser.save();
+
+        VersionManager vMgr = superuser.getWorkspace().getVersionManager();
+        vMgr.checkin(n.getPath());
+        // comment out the next line and the test will fail
+        vMgr.checkout(n.getPath());
+
+        Version v = vMgr.getBaseVersion(n.getPath());
+        try {
+            v.getContainingHistory().removeVersion(v.getName());
+            fail("removeVersion() must fail with ReferentialIntegrityException");
+        } catch (ReferentialIntegrityException e) {
+            // expected
+        }
+    }
 }