svn commit: r1710599 - in /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version: OpvCopyTest.java OpvVersionTest.java

[an...@apache.org]

Author: angela
Date: Mon Oct 26 13:56:08 2015
New Revision: 1710599

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

Added:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvCopyTest.java   (with props)
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvVersionTest.java
      - copied, changed from r1710573, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java

Added: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvCopyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvCopyTest.java?rev=1710599&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvCopyTest.java (added)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvCopyTest.java Mon Oct 26 13:56:08 2015
@@ -0,0 +1,68 @@
+/*
+ * 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.version.OnParentVersionAction;
+import javax.jcr.version.VersionManager;
+
+import org.apache.jackrabbit.oak.plugins.version.VersionConstants;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+/**
+ * Test OPV COPY
+ */
+public class OpvCopyTest extends AbstractJCRTest implements VersionConstants {
+
+    private VersionManager versionManager;
+    private Node frozen;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        Node n1 = testRootNode.addNode(nodeName1, NT_FILE);
+        Node content = n1.addNode(JCR_CONTENT, NT_RESOURCE);
+        content.setProperty(JCR_DATA, "val");
+
+        assertEquals(OnParentVersionAction.VERSION, n1.getDefinition().getOnParentVersion());
+        assertEquals(OnParentVersionAction.COPY, content.getDefinition().getOnParentVersion());
+
+        testRootNode.addMixin(MIX_VERSIONABLE);
+        superuser.save();
+
+        versionManager = superuser.getWorkspace().getVersionManager();
+        frozen = versionManager.checkpoint(testRoot).getFrozenNode();
+    }
+
+    public void testDirectChild() throws Exception {
+        Node n1 = testRootNode.getNode(nodeName1);
+        n1.addMixin(MIX_VERSIONABLE);
+        superuser.save();
+
+        Node frozedFile = versionManager.checkpoint(n1.getPath()).getFrozenNode();
+        Node frozenContent = frozedFile.getNode(JCR_CONTENT);
+        assertEquals(NT_FROZENNODE, frozenContent.getPrimaryNodeType().getName());
+    }
+
+    public void testChildInSubTree() throws Exception {
+        Node frozenFile = frozen.getNode(nodeName1);
+
+        Node frozenContent = frozenFile.getNode(JCR_CONTENT);
+        assertEquals(NT_FROZENNODE, frozenContent.getPrimaryNodeType().getName());
+    }
+}
\ No newline at end of file

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

Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvVersionTest.java (from r1710573, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvVersionTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvVersionTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java&r1=1710573&r2=1710599&rev=1710599&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvVersionTest.java Mon Oct 26 13:56:08 2015
@@ -16,79 +16,78 @@
  */
 package org.apache.jackrabbit.oak.jcr.version;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
-import javax.jcr.security.AccessControlManager;
-import javax.jcr.security.Privilege;
+import javax.jcr.Property;
 import javax.jcr.version.OnParentVersionAction;
-import javax.jcr.version.Version;
 import javax.jcr.version.VersionManager;
 
-import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
-import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
 import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
-import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
-import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
+import org.apache.jackrabbit.oak.plugins.version.VersionConstants;
 import org.apache.jackrabbit.test.AbstractJCRTest;
 
 /**
- * Test OPV IGNORE
+ * Test OPV VERSION
  */
-public class OpvIgnoreTest extends AbstractJCRTest {
+public class OpvVersionTest extends AbstractJCRTest implements VersionConstants {
 
+    private String siblingName;
     private VersionManager versionManager;
+    private Node frozen;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        // add child nodes that have OPV COPY and thus end up in the frozen node
-        testRootNode.addNode(nodeName1, NodeTypeConstants.NT_OAK_UNSTRUCTURED).addNode(nodeName2, NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+        Node n1 = testRootNode.addNode(nodeName1, NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+        Node n2 = n1.addNode(nodeName2, NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+        Node n3 = n1.addNode(nodeName3, NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+
+        siblingName = nodeName1 + 'b';
+        Node n1b = testRootNode.addNode(siblingName, NodeTypeConstants.NT_OAK_UNSTRUCTURED);
+
+        assertEquals(OnParentVersionAction.VERSION, n1.getDefinition().getOnParentVersion());
+        assertEquals(OnParentVersionAction.VERSION, n2.getDefinition().getOnParentVersion());
+        assertEquals(OnParentVersionAction.VERSION, n3.getDefinition().getOnParentVersion());
+        assertEquals(OnParentVersionAction.VERSION, n1b.getDefinition().getOnParentVersion());
+
+        testRootNode.addMixin(MIX_VERSIONABLE);
+        n1b.addMixin(MIX_VERSIONABLE);
+        n2.addMixin(MIX_VERSIONABLE);
         superuser.save();
 
         versionManager = superuser.getWorkspace().getVersionManager();
-    }
-
-    private void addIgnoredChild(@Nonnull Node node) throws Exception {
-        AccessControlManager acMgr = superuser.getAccessControlManager();
-        JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, node.getPath());
-        acl.addAccessControlEntry(EveryonePrincipal.getInstance(), AccessControlUtils.privilegesFromNames(acMgr, Privilege.JCR_READ));
-        acMgr.setPolicy(acl.getPath(), acl);
-        superuser.save();
-
-        Node c = node.getNode(AccessControlConstants.REP_POLICY);
-        assertEquals(OnParentVersionAction.IGNORE, c.getDefinition().getOnParentVersion());
+        frozen = versionManager.checkpoint(testRoot).getFrozenNode();
     }
 
     public void testDirectChild() throws Exception {
-        addIgnoredChild(testRootNode);
+        // n1 : is not versionable -> copied to frozen node
+        assertTrue(frozen.hasNode(nodeName1));
+        Node frozenN1 = frozen.getNode(nodeName1);
+        assertEquals(NT_FROZENNODE, frozenN1.getPrimaryNodeType().getName());
 
-        testRootNode.addMixin(JcrConstants.MIX_VERSIONABLE);
-        superuser.save();
+        assertTrue(frozenN1.hasNode(nodeName2));
+        assertTrue(frozenN1.hasNode(nodeName3));
 
-        // enforce the creation of the version (and the frozen node)
-        Version version = versionManager.checkpoint(testRoot);
-        Node frozen = version.getFrozenNode();
+        // n1b is versionable -> only child of 'nt:versionedChild' is created in
+        // the frozen node with 'jcr:childVersionHistory' property referring to
+        // the version history of n1b
+        assertTrue(frozen.hasNode(siblingName));
+        Node frozenN1b = frozen.getNode(siblingName);
+        assertEquals(NT_VERSIONEDCHILD, frozenN1b.getPrimaryNodeType().getName());
+        Property childVh = frozenN1b.getProperty(JCR_CHILD_VERSION_HISTORY);
+        assertEquals(versionManager.getVersionHistory(testRoot + '/' + siblingName).getUUID(), childVh.getString());
 
-        assertTrue(frozen.hasNode(nodeName1));
-        assertTrue(frozen.getNode(nodeName1).hasNode(nodeName2));
-        assertFalse(frozen.hasNode(AccessControlConstants.REP_POLICY));
     }
 
     public void testChildInSubTree() throws Exception {
-        addIgnoredChild(testRootNode.getNode(nodeName1));
+        Node frozenN1 = frozen.getNode(nodeName1);
 
-        testRootNode.addMixin(JcrConstants.MIX_VERSIONABLE);
-        superuser.save();
+        Node frozenN2 = frozenN1.getNode(nodeName2);
+        assertEquals(NT_VERSIONEDCHILD, frozenN2.getPrimaryNodeType().getName());
+        Property childVh = frozenN2.getProperty(JCR_CHILD_VERSION_HISTORY);
+        assertEquals(versionManager.getVersionHistory(testRoot + '/' + nodeName1 + '/' + nodeName2).getUUID(), childVh.getString());
 
-        // enforce the creation of the version (and the frozen node)
-        Version version = versionManager.checkpoint(testRoot);
-        Node frozen = version.getFrozenNode();
-
-        assertTrue(frozen.hasNode(nodeName1));
-        Node frozenChild = frozen.getNode(nodeName1);
-        assertTrue(frozenChild.hasNode(nodeName2));
-        assertFalse(frozenChild.hasNode(AccessControlConstants.REP_POLICY));
+        Node frozenN3 = frozenN1.getNode(nodeName3);
+        assertEquals(NT_FROZENNODE, frozenN3.getPrimaryNodeType().getName());
     }
 }
\ No newline at end of file