svn commit: r1721522 - in /sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr: GeneralAclTest.java NonExistentPathTest.java RootAddChildNodeTest.java TestUtil.java

[bd...@apache.org]

Author: bdelacretaz
Date: Wed Dec 23 11:27:28 2015
New Revision: 1721522

URL: http://svn.apache.org/viewvc?rev=1721522&view=rev
Log:
SLING-5355 - cleanup tests

Added:
    sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
      - copied, changed from r1721521, sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/RootAddChildNodeTest.java
Removed:
    sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/RootAddChildNodeTest.java
Modified:
    sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
    sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java

Copied: sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java (from r1721521, sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/RootAddChildNodeTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java?p2=sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java&p1=sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/RootAddChildNodeTest.java&r1=1721521&r2=1721522&rev=1721522&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/RootAddChildNodeTest.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java Wed Dec 23 11:27:28 2015
@@ -34,8 +34,8 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-/** Test root node and node creation privileges */
-public class RootAddChildNodeTest {
+/** Various ACL-related tests */
+public class GeneralAclTest {
 
     @Rule
     public final SlingContext context = new SlingContext(ResourceResolverType.JCR_OAK);
@@ -52,17 +52,17 @@ public class RootAddChildNodeTest {
 
     @After
     public void cleanup() throws ParseException, RepositoryException {
-        U.parseAndExecute("delete service user " + U.username);
+        U.cleanupUser();
         s.logout();
     }
     
     @Test(expected=AccessDeniedException.class)
-    public void getRootNodeFails() throws Exception {
+    public void getRootNodeIntiallyFails() throws Exception {
         s.getRootNode();
     }
     
     @Test
-    public void readOnlyThenWrite() throws Exception {
+    public void readOnlyThenWriteThenDeny() throws Exception {
         final Node tmp = U.adminSession.getRootNode().addNode("tmp_" + U.id);
         U.adminSession.save();
         final String path = tmp.getPath();
@@ -84,7 +84,7 @@ public class RootAddChildNodeTest {
         try {
             n.setProperty("U.id", U.id);
             s.save();
-            fail("Expected write access to be denied:" + path);
+            fail("Expected write access to be initially denied:" + path);
         } catch(AccessDeniedException ignore) {
         }
         s.refresh(false);
@@ -97,6 +97,18 @@ public class RootAddChildNodeTest {
         U.parseAndExecute(allowWrite);
         n.setProperty("U.id", U.id);
         s.save();
+        
+        final String deny = 
+                "set ACL for " + U.username + "\n"
+                + "deny jcr:all on " + path + "\n"
+                + "end"
+                ;
+        U.parseAndExecute(deny);
+        try {
+            s.getNode(path);
+            fail("Expected access to be denied again:" + path);
+        } catch(PathNotFoundException ignore) {
+        }
     }
     
     @Test

Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java?rev=1721522&r1=1721521&r2=1721522&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java Wed Dec 23 11:27:28 2015
@@ -48,7 +48,7 @@ public class NonExistentPathTest {
 
     @After
     public void cleanup() throws ParseException, RepositoryException {
-        U.parseAndExecute("delete service user " + U.username);
+        U.cleanupUser();
         s.logout();
     }
     

Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java?rev=1721522&r1=1721521&r2=1721522&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java Wed Dec 23 11:27:28 2015
@@ -77,6 +77,11 @@ class TestUtil {
         adminSession.save();
     }
     
+    void cleanupUser() throws ParseException, RepositoryException {
+        parseAndExecute("delete service user " + username);
+        assertServiceUser("in cleanupUser()", username, false);
+    }
+    
     Session loginService(String serviceUsername) throws RepositoryException {
         final SimpleCredentials cred = new SimpleCredentials(serviceUsername, new char[0]);
         return adminSession.impersonate(cred);