SLING-1411 Clarify how to un-set a privilege and fix the sample ACE edit script from the launchpad.content bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@917006 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
index e3c7525..7ef0c4b 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
@@ -78,6 +78,7 @@
postParams.add(new NameValuePair("principalId", testUserId));
postParams.add(new NameValuePair("privilege@jcr:read", "granted"));
postParams.add(new NameValuePair("privilege@jcr:write", "denied"));
+ postParams.add(new NameValuePair("privilege@jcr:modifyAccessControl", "bogus")); //invalid value should be ignored.
Credentials creds = new UsernamePasswordCredentials("admin", "admin");
assertAuthenticatedPostStatus(creds, postUrl, HttpServletResponse.SC_OK, postParams, null);
@@ -97,10 +98,12 @@
JSONArray grantedArray = aceObject.getJSONArray("granted");
assertNotNull(grantedArray);
+ assertEquals(1, grantedArray.length());
assertEquals("jcr:read", grantedArray.getString(0));
JSONArray deniedArray = aceObject.getJSONArray("denied");
assertNotNull(deniedArray);
+ assertEquals(1, deniedArray.length());
assertEquals("jcr:write", deniedArray.getString(0));
}
@@ -115,6 +118,7 @@
postParams.add(new NameValuePair("principalId", testGroupId));
postParams.add(new NameValuePair("privilege@jcr:read", "granted"));
postParams.add(new NameValuePair("privilege@jcr:write", "denied"));
+ postParams.add(new NameValuePair("privilege@jcr:modifyAccessControl", "bogus")); //invalid value should be ignored.
Credentials creds = new UsernamePasswordCredentials("admin", "admin");
assertAuthenticatedPostStatus(creds, postUrl, HttpServletResponse.SC_OK, postParams, null);
@@ -134,6 +138,7 @@
JSONArray grantedArray = aceObject.getJSONArray("granted");
assertNotNull(grantedArray);
+ assertEquals(1, grantedArray.length());
assertEquals("jcr:read", grantedArray.getString(0));
//denied rights are not applied for groups, so make sure it is not there