Author: angela
Date: Wed May 3 08:48:58 2017
New Revision: 1793629
URL: http://svn.apache.org/viewvc?rev=1793629&view=rev
Log:
OAK-5882 : Improve coverage for oak.security code in oak-core (wip)
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/UtilTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/UtilTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/UtilTest.java?rev=1793629&r1=1793628&r2=1793629&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/UtilTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/UtilTest.java
Wed May 3 08:48:58 2017
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
+import java.security.Principal;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.Privilege;
@@ -24,8 +25,10 @@ import org.apache.jackrabbit.oak.Abstrac
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ACE;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
+import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
import org.junit.Before;
import org.junit.Test;
@@ -48,6 +51,21 @@ public class UtilTest extends AbstractSe
bitsProvider = new PrivilegeBitsProvider(root);
}
+ @Test(expected = IllegalArgumentException.class)
+ public void testCheckValidPrincipalInvalidBehavior() throws Exception {
+ Util.checkValidPrincipal(() -> "name", getPrincipalManager(root),
ImportBehavior.IGNORE-1);
+ }
+
+ @Test(expected = AccessControlException.class)
+ public void testCheckValidPrincipalForNull() throws Exception {
+ Util.checkValidPrincipal(null, getPrincipalManager(root));
+ }
+
+ @Test(expected = AccessControlException.class)
+ public void testCheckValidPrincipalForEmpty() throws Exception {
+ Util.checkValidPrincipal(new PrincipalImpl(""),
getPrincipalManager(root));
+ }
+
@Test
public void testGenerateName() throws AccessControlException {
ACE ace = new TestAce(true);