svn commit: r1798577 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java

[st...@apache.org]

Author: stillalex
Date: Tue Jun 13 11:20:16 2017
New Revision: 1798577

URL: http://svn.apache.org/viewvc?rev=1798577&view=rev
Log:
OAK-6338 AbstractCompositeProviderTest reverse order flag is ignored


Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java?rev=1798577&r1=1798576&r2=1798577&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java Tue Jun 13 11:20:16 2017
@@ -40,6 +40,7 @@ import org.apache.jackrabbit.oak.commons
 import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
 import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.plugins.tree.RootFactory;
+import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
 import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree;
 import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
 import org.apache.jackrabbit.oak.spi.security.authorization.permission.AggregatedPermissionProvider;
@@ -50,7 +51,6 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.oak.util.NodeUtil;
 import org.apache.jackrabbit.util.Text;
 import org.junit.Test;
 
@@ -103,15 +103,16 @@ public abstract class AbstractCompositeP
     public void before() throws Exception {
         super.before();
 
-        NodeUtil rootNode = new NodeUtil(root.getTree("/"));
+        Tree rootNode = root.getTree("/");
 
-        NodeUtil test = rootNode.addChild("test", NT_OAK_UNSTRUCTURED);
-        test.addChild("child", NT_OAK_UNSTRUCTURED);
-        NodeUtil a = test.addChild("a", NT_OAK_UNSTRUCTURED);
-        a.addChild("b2", NT_OAK_UNSTRUCTURED);
-        a.addChild("b", NT_OAK_UNSTRUCTURED).addChild("c", NT_OAK_UNSTRUCTURED);
+        Tree test = TreeUtil.addChild(rootNode, "test", NT_OAK_UNSTRUCTURED);
+        TreeUtil.addChild(test, "child", NT_OAK_UNSTRUCTURED);
+        Tree a = TreeUtil.addChild(test, "a", NT_OAK_UNSTRUCTURED);
+        TreeUtil.addChild(a, "b2", NT_OAK_UNSTRUCTURED);
+        Tree b = TreeUtil.addChild(a, "b", NT_OAK_UNSTRUCTURED);
+        TreeUtil.addChild(b, "c", NT_OAK_UNSTRUCTURED);
 
-        rootNode.addChild("test2", NT_OAK_UNSTRUCTURED);
+        TreeUtil.addChild(rootNode, "test2", NT_OAK_UNSTRUCTURED);
 
         AccessControlManager acMgr = getAccessControlManager(root);
         Principal everyone = EveryonePrincipal.getInstance();
@@ -235,14 +236,13 @@ public abstract class AbstractCompositeP
     List<AggregatedPermissionProvider> getAggregatedProviders(@Nonnull String workspaceName,
                                                               @Nonnull AuthorizationConfiguration config,
                                                               @Nonnull Set<Principal> principals) {
-        if (reverseOrder()) {
-            return ImmutableList.of(
+        ImmutableList<AggregatedPermissionProvider> l = ImmutableList.of(
                     (AggregatedPermissionProvider) config.getPermissionProvider(root, workspaceName, principals),
                     getTestPermissionProvider());
+        if (reverseOrder()) {
+            return l.reverse();
         } else {
-            return ImmutableList.of(
-                    (AggregatedPermissionProvider) config.getPermissionProvider(root, workspaceName, principals),
-                    getTestPermissionProvider());
+            return l;
         }
     }