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

[an...@apache.org]

Author: angela
Date: Mon Oct 26 14:31:37 2015
New Revision: 1710607

URL: http://svn.apache.org/viewvc?rev=1710607&view=rev
Log:
OAK-3541 : VersionableState.copy doesn't respect OPV flag in the subtree (tests for OPV ABORT)

Added:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvAbortTest.java   (with props)

Added: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvAbortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvAbortTest.java?rev=1710607&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvAbortTest.java (added)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvAbortTest.java Mon Oct 26 14:31:37 2015
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.jcr.version;
+
+import javax.jcr.Node;
+import javax.jcr.nodetype.NodeDefinitionTemplate;
+import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.nodetype.NodeTypeTemplate;
+import javax.jcr.version.OnParentVersionAction;
+import javax.jcr.version.VersionException;
+import javax.jcr.version.VersionManager;
+
+import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
+import org.apache.jackrabbit.oak.plugins.version.VersionConstants;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+/**
+ * Test OPV ABORT
+ */
+public class OpvAbortTest extends AbstractJCRTest implements VersionConstants {
+
+    private VersionManager vMgr;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        vMgr = superuser.getWorkspace().getVersionManager();
+
+        NodeTypeManager ntMgr = superuser.getWorkspace().getNodeTypeManager();
+        NodeDefinitionTemplate def = ntMgr.createNodeDefinitionTemplate();
+        def.setOnParentVersion(OnParentVersionAction.ABORT);
+        def.setName("child");
+        def.setRequiredPrimaryTypeNames(new String[] {NT_BASE});
+
+        NodeTypeTemplate tmpl = ntMgr.createNodeTypeTemplate();
+        tmpl.setName("OpvAbortTest");
+        tmpl.setMixin(true);
+        tmpl.getNodeDefinitionTemplates().add(def);
+        ntMgr.registerNodeType(tmpl, true);
+
+        testRootNode.addMixin(MIX_VERSIONABLE);
+        superuser.save();
+    }
+
+    public void testDirectChild() throws Exception {
+        testRootNode.addMixin("OpvAbortTest");
+        Node n = testRootNode.addNode("child", NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+        assertEquals(OnParentVersionAction.ABORT, n.getDefinition().getOnParentVersion());
+        superuser.save();
+
+        try {
+            vMgr.checkpoint(testRootNode.getPath());
+            fail();
+        } catch (VersionException e) {
+            // success
+        } finally {
+            superuser.refresh(false);
+        }
+    }
+
+    public void testChildInSubTree() throws Exception {
+        Node n = testRootNode.addNode(nodeName1).addNode(nodeName2);
+        n.addMixin("OpvAbortTest");
+
+        Node child = n.addNode("child", NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+        superuser.save();
+
+        assertEquals(OnParentVersionAction.ABORT, child.getDefinition().getOnParentVersion());
+        try {
+            vMgr.checkpoint(testRootNode.getPath());
+            fail();
+        } catch (VersionException e) {
+            // success
+        } finally {
+            superuser.refresh(false);
+        }
+    }
+}
\ No newline at end of file

Propchange: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvAbortTest.java
------------------------------------------------------------------------------
    svn:eol-style = native