svn commit: r1797048 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java

[angela]

Author: angela
Date: Wed May 31 14:45:37 2017
New Revision: 1797048

URL: http://svn.apache.org/viewvc?rev=1797048&view=rev
Log:
OAK-6290 : UserQueryManager.findAuthorizables fails with 
IllegalArgumentException when there are multiple selectors 
OAK-5882 : Improve coverage for oak.security code in oak-core (wip)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java?rev=1797048&r1=1797047&r2=1797048&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
 Wed May 31 14:45:37 2017
@@ -26,6 +26,8 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.oak.api.ResultRow;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.query.QueryImpl;
 import org.apache.jackrabbit.oak.security.user.UserManagerImpl;
 import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
 import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
@@ -62,7 +64,7 @@ class ResultRowToAuthorizable implements
     private Authorizable getAuthorizable(@CheckForNull ResultRow row) {
         Authorizable authorizable = null;
         if (row != null) {
-            String resultPath = row.getPath();
+            String resultPath = 
row.getValue(QueryImpl.JCR_PATH).getValue(Type.STRING);
             try {
                 Tree tree = root.getTree(resultPath);
                 AuthorizableType type = UserUtil.getType(tree);

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java?rev=1797048&r1=1797047&r2=1797048&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
 Wed May 31 14:45:37 2017
@@ -39,7 +39,6 @@ import org.apache.jackrabbit.oak.securit
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -178,7 +177,6 @@ public class UserQueryManagerTest extend
         assertResultContainsAuthorizables(result);
     }
 
-
     @Test
     public void testFindWithCurrentRelPath() throws Exception {
         user.setProperty(propertyName, v);
@@ -197,7 +195,6 @@ public class UserQueryManagerTest extend
         assertResultContainsAuthorizables(result);
     }
 
-    @Ignore("OAK-6290")
     @Test
     public void testFindWithRelPathMultipleSelectorNames() throws Exception {
         user.setProperty(propertyName, v);
@@ -205,8 +202,10 @@ public class UserQueryManagerTest extend
         g.setProperty("rel/path/to/" + propertyName, v);
         root.commit();
 
-        Iterator<Authorizable> result = 
queryMgr.findAuthorizables("rel/path/to/" + propertyName, v.getString(), 
AuthorizableType.AUTHORIZABLE, false);
-        assertResultContainsAuthorizables(result, g);
+        for (AuthorizableType type : new AuthorizableType[] 
{AuthorizableType.AUTHORIZABLE, AuthorizableType.GROUP}) {
+            Iterator<Authorizable> result = 
queryMgr.findAuthorizables("rel/path/to/" + propertyName, v.getString(), 
AuthorizableType.AUTHORIZABLE, false);
+            assertResultContainsAuthorizables(result, g);
+        }
     }
 
     @Test