svn commit: r1562076 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/CopyTest.java

[angela]

Author: angela
Date: Tue Jan 28 14:15:30 2014
New Revision: 1562076

URL: http://svn.apache.org/r1562076
Log:
    OAK-920

Proper permission handling upon Workspace#copy

Modified:
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/CopyTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1562076&r1=1562075&r2=1562076&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Tue Jan 28 14:15:30 2014
@@ -120,8 +120,6 @@
       
org.apache.jackrabbit.oak.jcr.security.authorization.VersionManagementTest#testRemoveVersion3
  <!-- OAK-168 -->
 
       
org.apache.jackrabbit.oak.jcr.security.authorization.CopyTest#testCopyInvisibleSubTree
         <!-- OAK-920 -->
-      
org.apache.jackrabbit.oak.jcr.security.authorization.CopyTest#testCopyInvisibleProperty
        <!-- OAK-920 -->
-      
org.apache.jackrabbit.oak.jcr.security.authorization.CopyTest#testCopyInvisibleAcContent
       <!-- OAK-920 -->
 
       <!-- Query -->
       
org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS
          <!-- OAK-203 -->

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/CopyTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/CopyTest.java?rev=1562076&r1=1562075&r2=1562076&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/CopyTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/CopyTest.java
 Tue Jan 28 14:15:30 2014
@@ -85,6 +85,8 @@ public class CopyTest extends AbstractEv
         deny(childNPath, privilegesFromName(Privilege.JCR_READ));
         allow(targetPath, privilegesFromName(Privilege.JCR_ALL));
 
+        assertFalse(testSession.nodeExists(childNPath));
+
         testSession.getWorkspace().copy(path, destPath);
 
         Node copiedNode = testSession.getNode(destPath);
@@ -96,7 +98,6 @@ public class CopyTest extends AbstractEv
         assertFalse(superuser.nodeExists(destPath + '/' + childName));
     }
 
-    @Ignore("OAK-920") // FIXME
     @Test
     public void testCopyInvisibleProperty() throws Exception {
         deny(childNPath, 
privilegesFromName(PrivilegeConstants.REP_READ_PROPERTIES));
@@ -113,11 +114,10 @@ public class CopyTest extends AbstractEv
         assertFalse(superuser.nodeExists(destPath + '/' + childName + '/' + 
propertyName1));
     }
 
-    @Ignore("OAK-920") // FIXME
     @Test
     public void testCopyInvisibleAcContent() throws Exception {
-        deny(childNPath, privilegesFromName(Privilege.JCR_LOCK_MANAGEMENT));
-        allow(targetPath, privilegesFromName(PrivilegeConstants.REP_WRITE));
+        deny(childNPath, 
privilegesFromName(Privilege.JCR_READ_ACCESS_CONTROL));
+        allow(targetPath, privilegesFromName(PrivilegeConstants.JCR_ALL));
 
         testSession.getWorkspace().copy(path, destPath);