Author: angela
Date: Thu Oct 1 08:16:51 2020
New Revision: 1882173
URL: http://svn.apache.org/viewvc?rev=1882173&view=rev
Log:
OAK-9249 : Improve tests in o.a.j.oak.spi.security.authorization.cug
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AccessControlTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/RestoreParentNestedCugTest.java
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
Thu Oct 1 08:16:51 2020
@@ -66,7 +66,7 @@ import static org.junit.Assert.assertTru
* to expose the CUG specific implementations of {@code AccessControlManager}
* and {@code PermissionProvider}.
*/
-public class AbstractCugTest extends AbstractSecurityTest implements
CugConstants, NodeTypeConstants {
+public abstract class AbstractCugTest extends AbstractSecurityTest implements
CugConstants, NodeTypeConstants {
static final String SUPPORTED_PATH = "/content";
static final String SUPPORTED_PATH2 = "/content2";
@@ -87,7 +87,7 @@ public class AbstractCugTest extends Abs
public void before() throws Exception {
super.before();
- /**
+ /*
* Create tree structure:
*
* + root
@@ -102,10 +102,10 @@ public class AbstractCugTest extends Abs
*/
Tree rootNode = root.getTree("/");
- createTrees(rootNode, NT_OAK_UNSTRUCTURED, "content", "subtree");
- createTrees(rootNode, NT_OAK_UNSTRUCTURED, "content2");
- createTrees(rootNode, NT_OAK_UNSTRUCTURED, "some", "content", "tree");
- createTrees(rootNode, NT_OAK_UNSTRUCTURED, "testNode", "child");
+ createTrees(rootNode, "content", "subtree");
+ createTrees(rootNode, "content2");
+ createTrees(rootNode, "some", "content", "tree");
+ createTrees(rootNode, "testNode", "child");
root.commit();
}
@@ -153,10 +153,10 @@ public class AbstractCugTest extends Abs
return new CugPermissionProvider(root,
root.getContentSession().getWorkspaceName(), ImmutableSet.copyOf(principals),
supportedPaths, getConfig(AuthorizationConfiguration.class).getContext(),
getRootProvider(), getTreeProvider());
}
- void createTrees(@NotNull Tree tree, @NotNull String ntName, @NotNull
String... names) throws AccessDeniedException {
+ void createTrees(@NotNull Tree tree, @NotNull String... names) throws
AccessDeniedException {
Tree parent = tree;
for (String n : names) {
- parent = TreeUtil.addChild(parent, n, ntName);
+ parent = TreeUtil.addChild(parent, n,
NodeTypeConstants.NT_OAK_UNSTRUCTURED);
}
}
@@ -172,8 +172,8 @@ public class AbstractCugTest extends Abs
// add more child nodes
Tree n = root.getTree(SUPPORTED_PATH);
- createTrees(n, NT_OAK_UNSTRUCTURED, "a", "b", "c");
- createTrees(n, NT_OAK_UNSTRUCTURED, "aa", "bb", "cc");
+ createTrees(n, "a", "b", "c");
+ createTrees(n, "aa", "bb", "cc");
// create cugs
// - /content/a : allow testGroup, deny everyone
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AccessControlTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AccessControlTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AccessControlTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AccessControlTest.java
Thu Oct 1 08:16:51 2020
@@ -59,7 +59,7 @@ public class AccessControlTest extends A
setupCugsAndAcls();
- /**
+ /*
* regular acl at
* - /content
*
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
Thu Oct 1 08:16:51 2020
@@ -78,8 +78,8 @@ public class CugAccessControlManagerTest
return new CugPolicyImpl(path, NamePathMapper.DEFAULT,
getPrincipalManager(root), ImportBehavior.ABORT, getExclude());
}
- private CugPolicy getApplicableCug(@NotNull String path) throws
RepositoryException {
- return (CugPolicy)
cugAccessControlManager.getApplicablePolicies(path).nextAccessControlPolicy();
+ private CugPolicy getApplicableCug() throws RepositoryException {
+ return (CugPolicy)
cugAccessControlManager.getApplicablePolicies(AbstractCugTest.SUPPORTED_PATH).nextAccessControlPolicy();
}
@Test
@@ -120,7 +120,7 @@ public class CugAccessControlManagerTest
@Test
public void testGetApplicablePoliciesAfterSet() throws Exception {
- cugAccessControlManager.setPolicy(SUPPORTED_PATH,
getApplicableCug(SUPPORTED_PATH));
+ cugAccessControlManager.setPolicy(SUPPORTED_PATH, getApplicableCug());
AccessControlPolicyIterator it =
cugAccessControlManager.getApplicablePolicies(SUPPORTED_PATH);
assertFalse(it.hasNext());
}
@@ -150,7 +150,7 @@ public class CugAccessControlManagerTest
@Test
public void testGetPoliciesAfterSet() throws Exception {
- cugAccessControlManager.setPolicy(SUPPORTED_PATH,
getApplicableCug(SUPPORTED_PATH));
+ cugAccessControlManager.setPolicy(SUPPORTED_PATH, getApplicableCug());
AccessControlPolicy[] policies =
cugAccessControlManager.getPolicies(SUPPORTED_PATH);
assertEquals(1, policies.length);
@@ -284,7 +284,7 @@ public class CugAccessControlManagerTest
@Test
public void testSetPolicy() throws Exception {
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cug.addPrincipals(EveryonePrincipal.getInstance());
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
@@ -300,7 +300,7 @@ public class CugAccessControlManagerTest
@Test
public void testSetPolicyPersisted() throws Exception {
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cug.addPrincipals(EveryonePrincipal.getInstance());
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
root.commit();
@@ -362,7 +362,7 @@ public class CugAccessControlManagerTest
@Test
public void testSetPolicyMixinAlreadyPresent() throws Exception {
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cug.addPrincipals(EveryonePrincipal.getInstance());
TreeUtil.addMixin(root.getTree(SUPPORTED_PATH), MIX_REP_CUG_MIXIN,
root.getTree(NODE_TYPES_PATH), "uid");
@@ -376,7 +376,7 @@ public class CugAccessControlManagerTest
@Test
public void testResetPolicy() throws Exception {
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cug.addPrincipals(EveryonePrincipal.getInstance());
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
@@ -395,7 +395,7 @@ public class CugAccessControlManagerTest
@Test
public void testRemovePolicy() throws Exception {
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
cugAccessControlManager.removePolicy(SUPPORTED_PATH,
cugAccessControlManager.getPolicies(SUPPORTED_PATH)[0]);
@@ -404,7 +404,7 @@ public class CugAccessControlManagerTest
@Test
public void testRemovePolicyPersisted() throws Exception {
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
root.commit();
cugAccessControlManager.removePolicy(SUPPORTED_PATH,
cugAccessControlManager.getPolicies(SUPPORTED_PATH)[0]);
@@ -418,7 +418,7 @@ public class CugAccessControlManagerTest
public void testRemovePolicyRemovesMixin() throws Exception {
ReadOnlyNodeTypeManager ntMgr =
ReadOnlyNodeTypeManager.getInstance(root, NamePathMapper.DEFAULT);
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
root.commit();
@@ -434,7 +434,7 @@ public class CugAccessControlManagerTest
public void testRemovePolicyMixinAlreadyRemoved() throws Exception {
ReadOnlyNodeTypeManager ntMgr =
ReadOnlyNodeTypeManager.getInstance(root, NamePathMapper.DEFAULT);
- CugPolicy cug = getApplicableCug(SUPPORTED_PATH);
+ CugPolicy cug = getApplicableCug();
cugAccessControlManager.setPolicy(SUPPORTED_PATH, cug);
root.commit();
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
Thu Oct 1 08:16:51 2020
@@ -54,9 +54,10 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.calls;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
public class CugConfigurationTest extends AbstractCugTest {
@@ -111,7 +112,7 @@ public class CugConfigurationTest extend
public void testGetPermissionProviderDisabled() {
CugConfiguration cc =
createConfiguration(ConfigurationParameters.of(CugConstants.PARAM_CUG_ENABLED,
false));
- PermissionProvider pp = cc.getPermissionProvider(root,
root.getContentSession().getWorkspaceName(),
ImmutableSet.<Principal>of(EveryonePrincipal.getInstance()));
+ PermissionProvider pp = cc.getPermissionProvider(root,
root.getContentSession().getWorkspaceName(),
ImmutableSet.of(EveryonePrincipal.getInstance()));
assertSame(EmptyPermissionProvider.getInstance(), pp);
}
@@ -121,7 +122,7 @@ public class CugConfigurationTest extend
CugConstants.PARAM_CUG_ENABLED, false,
CugConstants.PARAM_CUG_SUPPORTED_PATHS, "/content");
CugConfiguration cc = createConfiguration(params);
- PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.<Principal>of(EveryonePrincipal.getInstance()));
+ PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.of(EveryonePrincipal.getInstance()));
assertSame(EmptyPermissionProvider.getInstance(), pp);
}
@@ -129,7 +130,7 @@ public class CugConfigurationTest extend
public void testGetPermissionProviderDisabled3() {
CugConfiguration cc =
createConfiguration(ConfigurationParameters.EMPTY);
- PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.<Principal>of(EveryonePrincipal.getInstance()));
+ PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.of(EveryonePrincipal.getInstance()));
assertSame(EmptyPermissionProvider.getInstance(), pp);
}
@@ -138,7 +139,7 @@ public class CugConfigurationTest extend
// enabled but no supported paths specified
CugConfiguration cc =
createConfiguration(ConfigurationParameters.of(CugConstants.PARAM_CUG_ENABLED,
true));
- PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.<Principal>of(EveryonePrincipal.getInstance()));
+ PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.of(EveryonePrincipal.getInstance()));
assertSame(EmptyPermissionProvider.getInstance(), pp);
}
@@ -149,7 +150,7 @@ public class CugConfigurationTest extend
CugConstants.PARAM_CUG_SUPPORTED_PATHS, "/content");
CugConfiguration cc = createConfiguration(params);
- PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.<Principal>of(EveryonePrincipal.getInstance()));
+ PermissionProvider pp = cc.getPermissionProvider(root, "default",
ImmutableSet.of(EveryonePrincipal.getInstance()));
assertTrue(pp instanceof CugPermissionProvider);
}
@@ -261,6 +262,6 @@ public class CugConfigurationTest extend
NodeBuilder rootBuilder =
spy(getTreeProvider().asNodeState(root.getTree(PathUtils.ROOT_PATH)).builder());
ri.initialize(rootBuilder);
- calls(1);
+ verify(rootBuilder, times(1)).getNodeState();
}
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
Thu Oct 1 08:16:51 2020
@@ -57,8 +57,8 @@ public class CugContextTest extends Abst
// add more child nodes
Tree n = root.getTree(SUPPORTED_PATH);
- createTrees(n, NT_OAK_UNSTRUCTURED, "a", "b", "c");
- createTrees(n, NT_OAK_UNSTRUCTURED, "aa", "bb", "cc");
+ createTrees(n, "a", "b", "c");
+ createTrees(n, "aa", "bb", "cc");
// create cugs
createCug("/content/a", getTestUser().getPrincipal());
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
Thu Oct 1 08:16:51 2020
@@ -127,13 +127,10 @@ public class CugEvaluationTest extends A
@Test
public void testReadAcl2() throws Exception {
- ContentSession cs = createTestSession2();
- try {
+ try (ContentSession cs = createTestSession2()) {
Root r = cs.getLatestRoot();
assertTrue(r.getTree("/content/rep:policy").exists());
- } finally {
- cs.close();
}
}
@@ -149,14 +146,11 @@ public class CugEvaluationTest extends A
@Test
public void testReadCug2() throws Exception {
- ContentSession cs = createTestSession2();
- try {
+ try (ContentSession cs = createTestSession2()) {
Root r = cs.getLatestRoot();
assertTrue(r.getTree("/content/a/rep:cugPolicy").exists());
assertFalse(r.getTree("/content2/rep:cugPolicy").exists());
- } finally {
- cs.close();
}
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
Thu Oct 1 08:16:51 2020
@@ -49,24 +49,24 @@ public class CugExcludeDefaultTest {
@Test
public void testEmptyPrincipalSet() {
- assertTrue(exclude.isExcluded(ImmutableSet.<Principal>of()));
+ assertTrue(exclude.isExcluded(ImmutableSet.of()));
}
@Test
public void testSystemPrincipal() {
- Set<Principal> principals =
ImmutableSet.<Principal>of(SystemPrincipal.INSTANCE);
+ Set<Principal> principals = ImmutableSet.of(SystemPrincipal.INSTANCE);
assertTrue(exclude.isExcluded(principals));
}
@Test
public void testAdminPrincipal() {
- Set<Principal> principals =
ImmutableSet.<Principal>of((AdminPrincipal) () -> "admin");
+ Set<Principal> principals = ImmutableSet.of((AdminPrincipal) () ->
"admin");
assertTrue(exclude.isExcluded(principals));
}
@Test
public void testSystemUserPrincipal() {
- Set<Principal> principals =
ImmutableSet.<Principal>of((SystemUserPrincipal) () -> "test");
+ Set<Principal> principals = ImmutableSet.of((SystemUserPrincipal) ()
-> "test");
assertTrue(exclude.isExcluded(principals));
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
Thu Oct 1 08:16:51 2020
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertTru
public class CugExcludeImplTest extends CugExcludeDefaultTest {
private String[] principalNames = new String[] {"a","b","c","test"};
- private Set<Principal> principals = ImmutableSet.<Principal>of(new
PrincipalImpl("test"));
+ private Set<Principal> principals = ImmutableSet.of(new
PrincipalImpl("test"));
@Override
CugExclude createInstance() {
@@ -53,13 +53,13 @@ public class CugExcludeImplTest extends
@Test
public void testEmpty2() {
- activate(Collections.<String, Object>emptyMap());
+ activate(Collections.emptyMap());
assertFalse(exclude.isExcluded(principals));
}
@Test
public void testExcludeTest() {
- Map<String, Object> m = ImmutableMap.<String,
Object>of("principalNames", principalNames);
+ Map<String, Object> m = ImmutableMap.of("principalNames",
principalNames);
activate(m);
Set<Principal> all = new HashSet<>();
@@ -74,21 +74,21 @@ public class CugExcludeImplTest extends
@Test
public void testExcludeAnother() {
- Map<String, Object> m = ImmutableMap.<String,
Object>of("principalNames", principalNames);
+ Map<String, Object> m = ImmutableMap.of("principalNames",
principalNames);
activate(m);
- assertFalse(exclude.isExcluded(ImmutableSet.<Principal>of(new
PrincipalImpl("another"))));
+ assertFalse(exclude.isExcluded(ImmutableSet.of(new
PrincipalImpl("another"))));
}
@Test
public void testModifyExclude() {
- Map<String, Object> m = ImmutableMap.<String,
Object>of("principalNames", principalNames);
+ Map<String, Object> m = ImmutableMap.of("principalNames",
principalNames);
activate(m);
- ((CugExcludeImpl) exclude).modified(ImmutableMap.<String,
Object>of("principalNames", new String[]{"other"}));
+ ((CugExcludeImpl) exclude).modified(ImmutableMap.of("principalNames",
new String[]{"other"}));
for (String name : principalNames) {
Principal p = new PrincipalImpl(name);
assertFalse(exclude.isExcluded(ImmutableSet.of(p)));
}
- assertTrue(exclude.isExcluded(ImmutableSet.<Principal>of(new
PrincipalImpl("other"))));
+ assertTrue(exclude.isExcluded(ImmutableSet.of(new
PrincipalImpl("other"))));
}
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
Thu Oct 1 08:16:51 2020
@@ -21,11 +21,13 @@ import java.io.InputStream;
import java.util.Set;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
+import javax.jcr.Property;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.Value;
+import javax.jcr.ValueFactory;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.security.AccessControlException;
@@ -50,6 +52,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static
org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConstants.MIX_REP_CUG_MIXIN;
+import static
org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConstants.NT_REP_CUG_POLICY;
+import static
org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConstants.REP_CUG_POLICY;
+import static
org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConstants.REP_PRINCIPAL_NAMES;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -58,8 +64,8 @@ import static org.junit.Assert.fail;
public abstract class CugImportBaseTest {
- static final String TEST_NODE_NAME = "testNode";
- static final String TEST_NODE_PATH = "/testNode";
+ private static final String TEST_NODE_NAME = "testNode";
+ private static final String TEST_NODE_PATH = "/testNode";
static final String TEST_GROUP_PRINCIPAL_NAME = "testPrincipal";
static final String XML_CUG_POLICY = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>" +
@@ -84,7 +90,7 @@ public abstract class CugImportBaseTest
"</sv:node>" +
"</sv:node>";
- static final String XML_NESTED_CUG_POLICY = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>" +
+ private static final String XML_NESTED_CUG_POLICY = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"rep:cugPolicy\"
xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\";
xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\";
xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\";
xmlns:fn=\"http://www.w3.org/2005/xpath-functions\";
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\"; xmlns:rep=\"internal\"
xmlns:jcr=\"http://www.jcp.org/jcr/1.0\";>" +
"<sv:property sv:name=\"jcr:primaryType\"
sv:type=\"Name\"><sv:value>rep:CugPolicy</sv:value></sv:property>" +
"<sv:property sv:name=\"rep:principalNames\"
sv:type=\"String\" sv:multiple=\"true\">" +
@@ -122,6 +128,7 @@ public abstract class CugImportBaseTest
@After
public void after() throws Exception {
try {
+ getImportSession().refresh(false);
adminSession.refresh(false);
adminSession.getNode(TEST_NODE_PATH).remove();
@@ -166,14 +173,10 @@ public abstract class CugImportBaseTest
}
void doImport(String parentPath, String xml) throws Exception {
- doImport(parentPath, xml,
ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW);
- }
-
- void doImport(String parentPath, String xml, int importUUIDBehavior)
throws Exception {
- doImport(getImportSession(), parentPath, xml, importUUIDBehavior);
+ doImport(getImportSession(), parentPath, xml);
}
- void doImport(Session importSession, String parentPath, String xml, int
importUUIDBehavior) throws Exception {
+ private void doImport(Session importSession, String parentPath, String
xml) throws Exception {
InputStream in;
if (xml.charAt(0) == '<') {
in = new ByteArrayInputStream(xml.getBytes());
@@ -181,7 +184,7 @@ public abstract class CugImportBaseTest
in = getClass().getResourceAsStream(xml);
}
try {
- importSession.importXML(parentPath, in, importUUIDBehavior);
+ importSession.importXML(parentPath, in,
ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW);
} finally {
in.close();
}
@@ -191,7 +194,7 @@ public abstract class CugImportBaseTest
assertEquals(expectedPrincipalNames.size(), principalNames.length);
Set<String> result =
ImmutableSet.copyOf(Iterables.transform(ImmutableSet.copyOf(principalNames),
principalName -> {
try {
- return (principalName == null) ? null :
principalName.getString();
+ return principalName.getString();
} catch (RepositoryException e) {
throw new IllegalStateException(e);
}
@@ -205,12 +208,21 @@ public abstract class CugImportBaseTest
adminSession.save();
Node targetNode = getTargetNode();
- targetNode.addMixin(CugConstants.MIX_REP_CUG_MIXIN);
+ targetNode.addMixin(MIX_REP_CUG_MIXIN);
doImport(getTargetPath(), XML_CUG_POLICY);
adminSession.save();
+
+ assertTrue(targetNode.hasNode(REP_CUG_POLICY));
+ Node n = targetNode.getNode(REP_CUG_POLICY);
+ assertEquals(NT_REP_CUG_POLICY, n.getPrimaryNodeType().getName());
+
+ assertTrue(n.hasProperty(REP_PRINCIPAL_NAMES));
+ Property p = n.getProperty(REP_PRINCIPAL_NAMES);
+ ValueFactory vf = adminSession.getValueFactory();
+ assertArrayEquals(new Value[]
{vf.createValue(TEST_GROUP_PRINCIPAL_NAME),
vf.createValue(EveryonePrincipal.NAME)}, p.getValues());
}
- @Test
+ @Test(expected = AccessControlException.class)
public void testCugValidPrincipalsNoMixin() throws Exception {
testGroup = ((JackrabbitSession)
adminSession).getUserManager().createGroup(new
PrincipalImpl(TEST_GROUP_PRINCIPAL_NAME));
adminSession.save();
@@ -218,12 +230,12 @@ public abstract class CugImportBaseTest
doImport(getTargetPath(), XML_CUG_POLICY);
try {
adminSession.save();
- fail();
} catch (AccessControlException e) {
Throwable cause = e.getCause();
assertTrue(cause instanceof CommitFailedException);
assertTrue(((CommitFailedException)
cause).isAccessControlViolation());
assertEquals(22, ((CommitFailedException) cause).getCode());
+ throw e;
}
}
@@ -235,6 +247,12 @@ public abstract class CugImportBaseTest
doImport(getTargetPath(), XML_CHILD_WITH_CUG);
adminSession.save();
+
+ Node targetNode = getTargetNode();
+ assertTrue(targetNode.hasNode("child"));
+
+ Node child = getTargetNode().getNode("child");
+ assertTrue(child.hasNode(REP_CUG_POLICY));
}
@Test
@@ -245,7 +263,7 @@ public abstract class CugImportBaseTest
"</sv:node>";
doImport(getTargetPath(), xmlCugPolicyWithoutPrincipals);
- assertFalse(getTargetNode().hasNode(CugConstants.REP_CUG_POLICY));
+ assertFalse(getTargetNode().hasNode(REP_CUG_POLICY));
getImportSession().save();
}
@@ -257,52 +275,46 @@ public abstract class CugImportBaseTest
"<sv:property sv:name=\"rep:principalNames\"
sv:type=\"String\" sv:multiple=\"true\"></sv:property>" +
"</sv:node>";
- getTargetNode().addMixin(CugConstants.MIX_REP_CUG_MIXIN);
+ getTargetNode().addMixin(MIX_REP_CUG_MIXIN);
doImport(getTargetPath(), xmlCugPolicyEmptyPrincipals);
getImportSession().save();
- String propPath = getTargetPath() + "/" + CugConstants.REP_CUG_POLICY
+ "/" + CugConstants.REP_PRINCIPAL_NAMES;
+ String propPath = getTargetPath() + "/" + REP_CUG_POLICY + "/" +
REP_PRINCIPAL_NAMES;
assertTrue(getImportSession().propertyExists(propPath));
assertArrayEquals(new Value[0],
getImportSession().getProperty(propPath).getValues());
}
- @Test
+ @Test(expected = ConstraintViolationException.class)
public void testNestedCug() throws Exception {
- try {
- doImport(getTargetPath(), XML_NESTED_CUG_POLICY);
- fail();
- } catch (ConstraintViolationException e) {
- // success
- } finally {
- getImportSession().refresh(false);
- }
+ doImport(getTargetPath(), XML_NESTED_CUG_POLICY);
}
@Test
public void testNestedCugWithMixin() throws Exception {
- getTargetNode().addMixin(CugConstants.MIX_REP_CUG_MIXIN);
+ getTargetNode().addMixin(MIX_REP_CUG_MIXIN);
doImport(getTargetPath(), XML_NESTED_CUG_POLICY);
- assertTrue(getTargetNode().hasNode(CugConstants.REP_CUG_POLICY));
+ assertTrue(getTargetNode().hasNode(REP_CUG_POLICY));
- Node cugPolicy = getTargetNode().getNode(CugConstants.REP_CUG_POLICY);
- assertTrue(cugPolicy.hasProperty(CugConstants.REP_PRINCIPAL_NAMES));
- assertFalse(cugPolicy.hasNode(CugConstants.REP_CUG_POLICY));
+ Node cugPolicy = getTargetNode().getNode(REP_CUG_POLICY);
+ assertTrue(cugPolicy.hasProperty(REP_PRINCIPAL_NAMES));
+ assertFalse(cugPolicy.hasNode(REP_CUG_POLICY));
}
@Test
public void testNestedCugSave() throws Exception {
- getTargetNode().addMixin(CugConstants.MIX_REP_CUG_MIXIN);
+ getTargetNode().addMixin(MIX_REP_CUG_MIXIN);
doImport(getTargetPath(), XML_NESTED_CUG_POLICY);
+ getImportSession().save();
- assertTrue(getTargetNode().hasNode(CugConstants.REP_CUG_POLICY));
+ assertTrue(getTargetNode().hasNode(REP_CUG_POLICY));
- Node cugPolicy = getTargetNode().getNode(CugConstants.REP_CUG_POLICY);
- assertTrue(cugPolicy.hasProperty(CugConstants.REP_PRINCIPAL_NAMES));
- assertFalse(cugPolicy.hasNode(CugConstants.REP_CUG_POLICY));
+ Node cugPolicy = getTargetNode().getNode(REP_CUG_POLICY);
+ assertTrue(cugPolicy.hasProperty(REP_PRINCIPAL_NAMES));
+ assertFalse(cugPolicy.hasNode(REP_CUG_POLICY));
}
- @Test
+ @Test(expected = ConstraintViolationException.class)
public void testCugWithInvalidName() throws Exception {
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"someOtherNode\"
xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\";
xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\";
xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\";
xmlns:fn=\"http://www.w3.org/2005/xpath-functions\";
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\"; xmlns:rep=\"internal\"
xmlns:jcr=\"http://www.jcp.org/jcr/1.0\";>" +
@@ -312,23 +324,16 @@ public abstract class CugImportBaseTest
"</sv:property>" +
"</sv:node>";
- getTargetNode().addMixin(CugConstants.MIX_REP_CUG_MIXIN);
+ getTargetNode().addMixin(MIX_REP_CUG_MIXIN);
doImport(getTargetPath(), xml);
- try {
- getImportSession().save();
- fail();
- } catch (ConstraintViolationException e) {
- // success
- } finally {
- getImportSession().refresh(false);
- }
+ // save must fail
+ getImportSession().save();
}
@Test
public void testCugAtUnsupportedPath() throws Exception {
doImport("/", XML_CHILD_WITH_CUG);
-
getImportSession().save();
assertTrue(getImportSession().getRootNode().hasNode("child"));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
Thu Oct 1 08:16:51 2020
@@ -119,9 +119,9 @@ public class CugPermissionProviderTest e
// add more child nodes
Tree n = root.getTree(SUPPORTED_PATH);
- createTrees(n, NT_OAK_UNSTRUCTURED, "a", "b", "c");
- createTrees(n, NT_OAK_UNSTRUCTURED, "aa", "bb", "cc");
- createTrees(n, NT_OAK_UNSTRUCTURED, "no", "cug", "in", "subtree");
+ createTrees(n, "a", "b", "c");
+ createTrees(n, "aa", "bb", "cc");
+ createTrees(n, "no", "cug", "in", "subtree");
createCug("/content/a", testGroupPrincipal);
createCug("/content/a/b/c", EveryonePrincipal.getInstance());
@@ -391,12 +391,11 @@ public class CugPermissionProviderTest e
*/
@Test
public void testIsGrantedNonExistingLocation() throws Exception {
- ContentSession anonymous = login(new GuestCredentials());
- try {
+ try (ContentSession anonymous = login(new GuestCredentials())) {
// additionally create a root that doesn't have access to the root
node
Root anonymousRoot = anonymous.getLatestRoot();
- for (Root r : new Root[] {anonymousRoot, root}) {
+ for (Root r : new Root[]{anonymousRoot, root}) {
TreeLocation location = TreeLocation.create(r,
"/path/to/non/existing/tree");
assertFalse(cugPermProvider.isGranted(location,
Permissions.READ));
assertFalse(cugPermProvider.isGranted(location,
Permissions.READ_NODE));
@@ -406,8 +405,6 @@ public class CugPermissionProviderTest e
assertFalse(cugPermProvider.isGranted(location,
Permissions.ADD_NODE));
assertFalse(cugPermProvider.isGranted(location,
Permissions.READ_ACCESS_CONTROL));
}
- } finally {
- anonymous.close();
}
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java
Thu Oct 1 08:16:51 2020
@@ -105,12 +105,7 @@ public class CugPolicyImplTest extends A
@Test
public void testCreateWithDuplicateName() {
- Set<Principal> duplication = ImmutableSet.of(testPrincipal, new
Principal() {
- @Override
- public String getName() {
- return testPrincipal.getName();
- }
- });
+ Set<Principal> duplication = ImmutableSet.of(testPrincipal, () ->
testPrincipal.getName());
assertEquals(2, duplication.size());
CugPolicyImpl cugPolicy = createCugPolicy(duplication);
@@ -255,7 +250,7 @@ public class CugPolicyImplTest extends A
@Test(expected = IllegalArgumentException.class)
public void testInvalidImportBehavior() {
- CugPolicy cug = createCugPolicy(-1, principals);
+ createCugPolicy(-1, principals);
}
@Test
@@ -275,7 +270,7 @@ public class CugPolicyImplTest extends A
}
@Test
- public void testExcludedPrincipalAddedBefore() throws Exception {
+ public void testExcludedPrincipalAddedBefore() {
Principal excluded = getExcludedPrincipal();
CugPolicyImpl cug = createCugPolicy(ImportBehavior.ABORT,
Collections.singleton(excluded));
assertTrue(Iterables.contains(cug.getPrincipalNames(),
excluded.getName()));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
Thu Oct 1 08:16:51 2020
@@ -126,7 +126,7 @@ public class CugUtilTest extends Abstrac
@Test
public void testIsSupportedPath() {
- Set<String> configuredPaths =
CUG_CONFIG.getConfigValue(PARAM_CUG_SUPPORTED_PATHS, ImmutableSet.<String>of());
+ Set<String> configuredPaths =
CUG_CONFIG.getConfigValue(PARAM_CUG_SUPPORTED_PATHS, ImmutableSet.of());
assertFalse(CugUtil.isSupportedPath(null, configuredPaths));
assertFalse(CugUtil.isSupportedPath(UNSUPPORTED_PATH,
configuredPaths));
@@ -138,13 +138,13 @@ public class CugUtilTest extends Abstrac
@Test
public void testGetSupportedPathsDefaultMountInfoProvider() {
- Set<String> expected =
CUG_CONFIG.getConfigValue(PARAM_CUG_SUPPORTED_PATHS, ImmutableSet.<String>of());
+ Set<String> expected =
CUG_CONFIG.getConfigValue(PARAM_CUG_SUPPORTED_PATHS, ImmutableSet.of());
assertEquals(expected, CugUtil.getSupportedPaths(CUG_CONFIG,
Mounts.defaultMountInfoProvider()));
}
@Test
public void testGetSupportedPathsWithDifferentMounts() {
- Set<String> expected =
CUG_CONFIG.getConfigValue(PARAM_CUG_SUPPORTED_PATHS, ImmutableSet.<String>of());
+ Set<String> expected =
CUG_CONFIG.getConfigValue(PARAM_CUG_SUPPORTED_PATHS, ImmutableSet.of());
MountInfoProvider mip = Mounts.newBuilder().mount("private", "/libs",
"/apps", "/nonCugPath").build();
assertNotSame(expected, CugUtil.getSupportedPaths(CUG_CONFIG, mip));
assertEquals(expected, CugUtil.getSupportedPaths(CUG_CONFIG, mip));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
Thu Oct 1 08:16:51 2020
@@ -37,6 +37,7 @@ import org.junit.Test;
import javax.jcr.nodetype.NodeDefinitionTemplate;
import javax.jcr.nodetype.NodeTypeTemplate;
+import static com.google.common.base.Preconditions.checkNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -53,6 +54,11 @@ public class CugValidatorTest extends Ab
node = root.getTree(SUPPORTED_PATH);
}
+ @NotNull
+ private Validator createRootValidator(@NotNull NodeState ns) {
+ return checkNotNull(new CugValidatorProvider().getRootValidator(ns,
ns, new CommitInfo("sid", "uid")));
+ }
+
@Test
public void testChangePrimaryType() {
node = root.getTree(SUPPORTED_PATH2);
@@ -67,42 +73,42 @@ public class CugValidatorTest extends Ab
}
}
- @Test
- public void testPropertyChangedBeforeWasCug() throws Exception {
+ @Test(expected = CommitFailedException.class)
+ public void testPropertyChangedBeforeWasCug() throws CommitFailedException
{
NodeState ns = mock(NodeState.class);
- Validator validator = new CugValidatorProvider().getRootValidator(ns,
ns, new CommitInfo("sid", "uid"));
+ Validator validator = createRootValidator(ns);
try {
PropertyState before =
PropertyStates.createProperty(JCR_PRIMARYTYPE, NT_REP_CUG_POLICY);
PropertyState after =
PropertyStates.createProperty(JCR_PRIMARYTYPE, NT_OAK_UNSTRUCTURED);
validator.propertyChanged(before, after);
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(20, e.getCode());
+ throw e;
}
}
- @Test
- public void testPropertyChangedAfterIsCug() throws Exception {
+ @Test(expected = CommitFailedException.class)
+ public void testPropertyChangedAfterIsCug() throws CommitFailedException {
NodeState ns = mock(NodeState.class);
- Validator validator = new CugValidatorProvider().getRootValidator(ns,
ns, new CommitInfo("sid", "uid"));
+ Validator validator = createRootValidator(ns);
try {
PropertyState before =
PropertyStates.createProperty(JCR_PRIMARYTYPE, NT_OAK_UNSTRUCTURED);
PropertyState after =
PropertyStates.createProperty(JCR_PRIMARYTYPE, NT_REP_CUG_POLICY);
validator.propertyChanged(before, after);
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(20, e.getCode());
+ throw e;
}
}
@Test
public void testPropertyChangedNoCugInvolved() throws Exception {
NodeState ns = mock(NodeState.class);
- Validator validator = new CugValidatorProvider().getRootValidator(ns,
ns, new CommitInfo("sid", "uid"));
+ Validator validator = createRootValidator(ns);
PropertyState before = PropertyStates.createProperty(JCR_PRIMARYTYPE,
NT_OAK_UNSTRUCTURED);
PropertyState after = PropertyStates.createProperty(JCR_PRIMARYTYPE,
NT_UNSTRUCTURED);
@@ -110,7 +116,7 @@ public class CugValidatorTest extends Ab
validator.propertyChanged(before, after);
}
- @Test
+ @Test(expected = CommitFailedException.class)
public void testChangePrimaryTypeOfCug() throws Exception {
node.setProperty(JcrConstants.JCR_MIXINTYPES,
ImmutableList.of(MIX_REP_CUG_MIXIN), Type.NAMES);
Tree cug = TreeUtil.addChild(node, REP_CUG_POLICY, NT_REP_CUG_POLICY);
@@ -120,46 +126,46 @@ public class CugValidatorTest extends Ab
try {
cug.setProperty(JcrConstants.JCR_PRIMARYTYPE,
NodeTypeConstants.NT_OAK_UNSTRUCTURED, Type.NAME);
root.commit();
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(21, e.getCode());
+ throw e;
}
}
- @Test
+ @Test(expected = CommitFailedException.class)
public void testInvalidPrimaryType() throws Exception {
Tree cug = TreeUtil.addChild(node, REP_CUG_POLICY,
NodeTypeConstants.NT_OAK_UNSTRUCTURED);
cug.setProperty(REP_PRINCIPAL_NAMES,
ImmutableList.of(EveryonePrincipal.NAME), Type.STRINGS);
try {
root.commit();
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(21, e.getCode());
+ throw e;
} finally {
root.refresh();
}
}
- @Test
+ @Test(expected = CommitFailedException.class)
public void testMissingMixin() throws Exception {
Tree cug = TreeUtil.addChild(node, REP_CUG_POLICY, NT_REP_CUG_POLICY);
cug.setProperty(REP_PRINCIPAL_NAMES,
ImmutableList.of(EveryonePrincipal.NAME), Type.STRINGS);
try {
root.commit();
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(22, e.getCode());
+ throw e;
} finally {
root.refresh();
}
}
- @Test
+ @Test(expected = CommitFailedException.class)
public void testRemoveMixin() throws Exception {
node.setProperty(JcrConstants.JCR_MIXINTYPES,
ImmutableList.of(MIX_REP_CUG_MIXIN), Type.NAMES);
Tree cug = TreeUtil.addChild(node, REP_CUG_POLICY, NT_REP_CUG_POLICY);
@@ -169,26 +175,26 @@ public class CugValidatorTest extends Ab
try {
node.removeProperty(JcrConstants.JCR_MIXINTYPES);
root.commit();
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(22, e.getCode());
+ throw e;
} finally {
root.refresh();
}
}
- @Test
+ @Test(expected = CommitFailedException.class)
public void testCugPolicyWithDifferentName() throws Exception {
node.setProperty(JcrConstants.JCR_MIXINTYPES,
ImmutableList.of(MIX_REP_CUG_MIXIN), Type.NAMES);
Tree cug = TreeUtil.addChild(node, "anotherName", NT_REP_CUG_POLICY);
cug.setProperty(REP_PRINCIPAL_NAMES,
ImmutableList.of(EveryonePrincipal.NAME), Type.STRINGS);
try {
root.commit();
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(23, e.getCode());
+ throw e;
} finally {
root.refresh();
}
@@ -218,7 +224,7 @@ public class CugValidatorTest extends Ab
ntMgr.registerNodeType(ntTemplate, true);
}
- @Test
+ @Test(expected = CommitFailedException.class)
public void testJcrNodeTypesOutsideOfSystemIsValidated() throws Exception {
Tree n = TreeUtil.addChild(node, JCR_NODE_TYPES, NT_OAK_UNSTRUCTURED);
Tree cug = TreeUtil.addChild(n, REP_CUG_POLICY, NT_REP_CUG_POLICY);
@@ -226,10 +232,10 @@ public class CugValidatorTest extends Ab
try {
root.commit();
- fail();
} catch (CommitFailedException e) {
assertTrue(e.isAccessControlViolation());
assertEquals(22, e.getCode());
+ throw e;
} finally {
root.refresh();
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/RestoreParentNestedCugTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/RestoreParentNestedCugTest.java?rev=1882173&r1=1882172&r2=1882173&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/RestoreParentNestedCugTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/RestoreParentNestedCugTest.java
Thu Oct 1 08:16:51 2020
@@ -37,7 +37,6 @@ import java.security.Principal;
import java.util.UUID;
import static org.apache.jackrabbit.oak.commons.PathUtils.ROOT_PATH;
-import static
org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.NestedCugHookTest.assertNestedCugs;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -97,8 +96,8 @@ public class RestoreParentNestedCugTest
((Group)
uMgr.getAuthorizable(testGroupPrincipal3)).addMember(testUser2);
Tree n = root.getTree(SUPPORTED_PATH);
- createTrees(n, NT_OAK_UNSTRUCTURED, "a", "b1");
- createTrees(n, NT_OAK_UNSTRUCTURED, "a", "b2");
+ createTrees(n, "a", "b1");
+ createTrees(n, "a", "b2");
// - /content/a : allow user1 & user2, deny everyone
// - /content/a/b1 : allow user1, deny everyone
