You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2013/04/11 08:40:30 UTC

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

Author: angela
Date: Thu Apr 11 06:40:30 2013
New Revision: 1466773

URL: http://svn.apache.org/r1466773
Log:
OAK-527: permissions (WIP: fix test setup that caused wrong permissions for testSession and remove affected tests from exclusion list)

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

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1466773&r1=1466772&r2=1466773&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Apr 11 06:40:30 2013
@@ -260,9 +260,7 @@
       org.apache.jackrabbit.oak.jcr.version.VersionHistoryTest#testGetVersionHistoryAfterMove            <!-- OAK-602 -->
 
       org.apache.jackrabbit.oak.jcr.security.authorization.AccessControlManagementTest#testRemoveMixin       <!-- OAK-767 -->
-      org.apache.jackrabbit.oak.jcr.security.authorization.ReadTest#testReadDenied                           <!-- OAK-51 -->
-      org.apache.jackrabbit.oak.jcr.security.authorization.ReadTest#testAllowEveryoneDenyGroup               <!-- OAK-51 -->
-      org.apache.jackrabbit.oak.jcr.security.authorization.ReadTest#testAllowEveryonePathDenyGroupChildPath  <!-- OAK-51 -->
+      org.apache.jackrabbit.oak.jcr.security.authorization.ReadTest#testReadDenied                           <!-- OAK-766 -->
     </known.issues>
   </properties>
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java?rev=1466773&r1=1466772&r2=1466773&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java Thu Apr 11 06:40:30 2013
@@ -93,6 +93,10 @@ public abstract class AbstractEvaluation
         creds = new SimpleCredentials(uid, uid.toCharArray());
         testUser = uMgr.createUser(uid, uid);
 
+        UserManager umgr = getUserManager(superuser);
+        testGroup = umgr.createGroup("testGroup" + UUID.randomUUID());
+        testGroup.addMember(testUser);
+
         // create some nodes below the test root in order to apply ac-stuff
         Node node = testRootNode.addNode(nodeName1, testNodeType);
         Node cn1 = node.addNode(nodeName2, testNodeType);
@@ -170,12 +174,6 @@ public abstract class AbstractEvaluation
     }
 
     protected Group getTestGroup() throws Exception {
-        if (testGroup == null) {
-            UserManager umgr = getUserManager(superuser);
-            testGroup = umgr.createGroup("testGroup" + UUID.randomUUID());
-            testGroup.addMember(testUser);
-            superuser.save();
-        }
         return testGroup;
     }
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java?rev=1466773&r1=1466772&r2=1466773&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java Thu Apr 11 06:40:30 2013
@@ -198,7 +198,6 @@ public class ReadTest extends AbstractEv
         assertTrue(testSession.nodeExists(path));
     }
 
-    @Ignore("OAK-51") // FIXME
     @Test
     public void testAllowEveryoneDenyGroup() throws Exception {
         /*
@@ -229,7 +228,6 @@ public class ReadTest extends AbstractEv
         assertTrue(testSession.nodeExists(childNPath));
     }
 
-    @Ignore("OAK-51") // FIXME
     @Test
     public void testAllowEveryonePathDenyGroupChildPath() throws Exception {
         /*