Author: angela
Date: Thu Feb 1 15:13:11 2018
New Revision: 1822880
URL: http://svn.apache.org/viewvc?rev=1822880&view=rev
Log:
minor improvement: add unit tests for NoPermissions
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/NoPermissionsTest.java
- copied, changed from r1822875,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissionsTest.java
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/NoPermissionsTest.java
(from r1822875,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissionsTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/NoPermissionsTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/NoPermissionsTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissionsTest.java&r1=1822875&r2=1822880&rev=1822880&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissionsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/NoPermissionsTest.java
Thu Feb 1 15:13:11 2018
@@ -22,23 +22,23 @@ import java.util.List;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.plugins.tree.TreeType;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
-import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
+import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-/**
- * Test {@code AllPermissions}.
- */
-public class AllPermissionsTest extends AbstractSecurityTest {
+public class NoPermissionsTest extends AbstractSecurityTest {
- private final CompiledPermissions all = AllPermissions.getInstance();
+ private final CompiledPermissions noPermissions =
NoPermissions.getInstance();
private List<String> paths = new ArrayList<String>();
@@ -55,7 +55,7 @@ public class AllPermissionsTest extends
@Test
public void testGetRepositoryPermission() {
- assertSame(RepositoryPermission.ALL, all.getRepositoryPermission());
+ assertSame(RepositoryPermission.EMPTY,
noPermissions.getRepositoryPermission());
}
@Test
@@ -64,9 +64,11 @@ public class AllPermissionsTest extends
Tree tree =
getRootProvider().createReadOnlyRoot(root).getTree(path);
assertTrue(tree.exists());
- assertSame(TreePermission.ALL, all.getTreePermission(tree,
TreePermission.EMPTY));
+ assertSame(TreePermission.EMPTY,
noPermissions.getTreePermission(tree, TreePermission.EMPTY));
+ assertSame(TreePermission.EMPTY,
noPermissions.getTreePermission(tree, TreeType.DEFAULT, TreePermission.EMPTY));
for (Tree child : tree.getChildren()) {
- assertSame(TreePermission.ALL, all.getTreePermission(child,
TreePermission.EMPTY));
+ assertSame(TreePermission.EMPTY,
noPermissions.getTreePermission(child, TreePermission.EMPTY));
+ assertSame(TreePermission.EMPTY,
noPermissions.getTreePermission(child, TreeType.DEFAULT, TreePermission.EMPTY));
}
}
}
@@ -75,20 +77,35 @@ public class AllPermissionsTest extends
public void testIsGranted() {
for (String path : paths) {
Tree tree =
getRootProvider().createReadOnlyRoot(root).getTree(path);
- assertTrue(tree.exists());
-
- assertTrue(all.isGranted(tree, null, Permissions.ALL));
+ assertFalse(noPermissions.isGranted(tree, null,
Permissions.NO_PERMISSION));
for (PropertyState prop : tree.getProperties()) {
- assertTrue(all.isGranted(tree, prop, Permissions.ALL));
+ assertFalse(noPermissions.isGranted(tree, prop,
Permissions.NO_PERMISSION));
}
for (Tree child : tree.getChildren()) {
- assertTrue(all.isGranted(child, null, Permissions.ALL));
+ assertFalse(noPermissions.isGranted(child, null,
Permissions.NO_PERMISSION));
}
}
}
@Test
+ public void testGetPrivileges() {
+ for (String path : paths) {
+ Tree tree =
getRootProvider().createReadOnlyRoot(root).getTree(path);
+ assertTrue(noPermissions.getPrivileges(tree).isEmpty());
+ }
+ }
+
+ @Test
+ public void testHasPrivileges() {
+ for (String path : paths) {
+ Tree tree =
getRootProvider().createReadOnlyRoot(root).getTree(path);
+ assertFalse(noPermissions.hasPrivileges(tree));
+ assertFalse(noPermissions.hasPrivileges(tree,
PrivilegeConstants.JCR_READ));
+ }
+ }
+
+ @Test
public void testSame() {
- assertSame(all, AllPermissions.getInstance());
+ assertSame(noPermissions, NoPermissions.getInstance());
}
}
\ No newline at end of file
