Author: angela
Date: Tue Feb 21 18:38:30 2017
New Revision: 1783917
URL: http://svn.apache.org/viewvc?rev=1783917&view=rev
Log:
OAK-5689 : AbstractSecurityTest: enforce test-failure for traversal queries
(resolve FIXME in tests)
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/EveryoneGroupTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java?rev=1783917&r1=1783916&r2=1783917&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
Tue Feb 21 18:38:30 2017
@@ -41,9 +41,6 @@ public class PrincipalProviderImplTest e
@Test
public void testEveryoneMembers() throws Exception {
- // FIXME: check, why this query causes a traversal despite the
existence of an index
- getQueryEngineSettings().setFailTraversal(false);
-
Principal everyone =
principalProvider.getPrincipal(EveryonePrincipal.NAME);
assertTrue(everyone instanceof EveryonePrincipal);
@@ -67,8 +64,6 @@ public class PrincipalProviderImplTest e
}
} finally {
- getQueryEngineSettings().setFailTraversal(true);
-
if (everyoneGroup != null) {
everyoneGroup.remove();
root.commit();
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/EveryoneGroupTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/EveryoneGroupTest.java?rev=1783917&r1=1783916&r2=1783917&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/EveryoneGroupTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/EveryoneGroupTest.java
Tue Feb 21 18:38:30 2017
@@ -102,25 +102,16 @@ public class EveryoneGroupTest extends A
@Test
public void testGetMembers() throws Exception {
- // FIXME: check, why this query causes a traversal despite the
existence of an index
- getQueryEngineSettings().setFailTraversal(false);
+ Set<Authorizable> members =
ImmutableSet.copyOf(everyoneGroup.getMembers());
- try {
- Set<Authorizable> members =
ImmutableSet.copyOf(everyoneGroup.getMembers());
-
- assertFalse(members.contains(everyoneGroup));
- for (Authorizable a : authorizables) {
- assertTrue(members.contains(a));
- }
- } finally {
- getQueryEngineSettings().setFailTraversal(true);
+ assertFalse(members.contains(everyoneGroup));
+ for (Authorizable a : authorizables) {
+ assertTrue(members.contains(a));
}
}
@Test
public void testGetDeclaredMembers() throws Exception {
- getQueryEngineSettings().setFailTraversal(false);
-
Set<Authorizable> members =
ImmutableSet.copyOf(everyoneGroup.getDeclaredMembers());
assertFalse(members.contains(everyoneGroup));
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java?rev=1783917&r1=1783916&r2=1783917&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java
Tue Feb 21 18:38:30 2017
@@ -284,18 +284,14 @@ public class UserManagerImplTest extends
@Test
public void testFindWithNullValue() throws RepositoryException {
- // FIXME: check, why this query causes a traversal despite the
existence of an index
- getQueryEngineSettings().setFailTraversal(false);
-
- try {
- Iterator<Authorizable> result =
userMgr.findAuthorizables(UserConstants.REP_PRINCIPAL_NAME, null);
- assertTrue(result.hasNext());
+ Iterator<Authorizable> result =
userMgr.findAuthorizables(UserConstants.REP_PRINCIPAL_NAME, null);
+ assertTrue(result.hasNext());
+ }
- result = userMgr.findAuthorizables("./" +
UserConstants.REP_PRINCIPAL_NAME, null);
- assertTrue(result.hasNext());
- } finally {
- getQueryEngineSettings().setFailTraversal(true);
- }
+ @Test
+ public void testFindWithNullValue2() throws RepositoryException {
+ Iterator<Authorizable> result = userMgr.findAuthorizables("./" +
UserConstants.REP_PRINCIPAL_NAME, null);
+ assertTrue(result.hasNext());
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java?rev=1783917&r1=1783916&r2=1783917&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
Tue Feb 21 18:38:30 2017
@@ -139,9 +139,6 @@ public class UserPrincipalProviderTest e
@Test
public void testEveryoneMembers() throws Exception {
- // FIXME: check, why this query causes a traversal despite the
existence of an index
- getQueryEngineSettings().setFailTraversal(false);
-
Principal everyone =
principalProvider.getPrincipal(EveryonePrincipal.NAME);
assertTrue(everyone instanceof EveryonePrincipal);
@@ -158,8 +155,6 @@ public class UserPrincipalProviderTest e
((java.security.acl.Group)
ep).isMember(getTestUser().getPrincipal());
} finally {
- getQueryEngineSettings().setFailTraversal(true);
-
if (everyoneGroup != null) {
everyoneGroup.remove();
root.commit();
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java?rev=1783917&r1=1783916&r2=1783917&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
Tue Feb 21 18:38:30 2017
@@ -93,19 +93,12 @@ public class AutoSaveEnabledManagerTest
@Test
public void testFindAuthorizable() throws RepositoryException {
- // FIXME: check, why this query causes a traversal despite the
existence of an index
- getQueryEngineSettings().setFailTraversal(false);
+ Iterator<Authorizable> res =
mgr.findAuthorizables(UserConstants.REP_AUTHORIZABLE_ID,
UserConstants.DEFAULT_ANONYMOUS_ID);
+ assertTrue(res.hasNext());
- try {
- Iterator<Authorizable> res =
mgr.findAuthorizables(UserConstants.REP_AUTHORIZABLE_ID,
UserConstants.DEFAULT_ANONYMOUS_ID);
- assertTrue(res.hasNext());
-
- Authorizable a = res.next();
- assertNotNull(a);
- assertTrue(a instanceof AuthorizableImpl);
- } finally {
- getQueryEngineSettings().setFailTraversal(true);
- }
+ Authorizable a = res.next();
+ assertNotNull(a);
+ assertTrue(a instanceof AuthorizableImpl);
}
@Test
