jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1396104 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ oak-core/src/test/java/org/apache/jackrabbit/oak/ oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ oak-jcr/ oak-jcr/src/test...
Date Tue, 09 Oct 2012 16:44:52 GMT
Author: angela
Date: Tue Oct  9 16:44:52 2012
New Revision: 1396104

URL: http://svn.apache.org/viewvc?rev=1396104&view=rev
Log:
OAK-50 : Implement User Management (WIP)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java Tue Oct  9 16:44:52 2012
@@ -251,7 +251,7 @@ abstract class AuthorizableImpl implemen
                 sb.append(isGroup() ? "group:" : "user:");
                 sb.append(node.getSession().getWorkspace().getName());
                 sb.append(':');
-                sb.append(node.getIdentifier());
+                sb.append(id);
                 hashCode = sb.toString().hashCode();
             } catch (RepositoryException e) {
                 log.warn("Error while calculating hash code.",e.getMessage());
@@ -302,7 +302,7 @@ abstract class AuthorizableImpl implemen
 
     @Nonnull
     Tree getTree() {
-        Tree tree = userManager.getUserProvider().getAuthorizable(id);
+        Tree tree = getUserProvider().getAuthorizable(id);
         if (tree == null) {
             throw new IllegalStateException("Authorizable not associated with an existing tree");
         }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java Tue Oct  9 16:44:52 2012
@@ -178,12 +178,11 @@ class GroupImpl extends AuthorizableImpl
         } else {
             MembershipProvider mMgr = uMgr.getMembershipProvider();
             Iterator oakPaths = mMgr.getMembers(getTree(), AuthorizableType.AUTHORIZABLE, includeInherited);
-            if (!oakPaths.hasNext()) {
+            if (oakPaths.hasNext()) {
                 AuthorizableIterator iterator = AuthorizableIterator.create(oakPaths, uMgr, UserManager.SEARCH_TYPE_AUTHORIZABLE);
                 return new RangeIteratorAdapter(iterator, iterator.getSize());
             } else {
                 return RangeIteratorAdapter.EMPTY;
-
             }
         }
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java Tue Oct  9 16:44:52 2012
@@ -24,6 +24,8 @@ import javax.jcr.NoSuchWorkspaceExceptio
 import javax.jcr.SimpleCredentials;
 import javax.security.auth.login.LoginException;
 
+import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.mk.core.MicroKernelImpl;
 import org.apache.jackrabbit.oak.api.ContentRepository;
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent;
@@ -44,6 +46,12 @@ public abstract class AbstractOakTest {
         contentRepository = createRepository();
     }
 
+    protected MicroKernel createMicroKernelWithInitialContent() {
+        MicroKernel mk = new MicroKernelImpl();
+        new InitialContent().available(mk);
+        return mk;
+    }
+
     protected abstract ContentRepository createRepository();
 
     protected static ContentRepository createEmptyRepository() {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java Tue Oct  9 16:44:52 2012
@@ -40,7 +40,6 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.util.Text;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
@@ -104,7 +103,7 @@ public class UserProviderImplTest extend
 
     @Override
     protected ContentRepository createRepository() {
-        return new Oak().with(new PropertyIndexHook()).with(new OpenSecurityProvider()).createContentRepository();
+        return new Oak(createMicroKernelWithInitialContent()).with(new PropertyIndexHook()).with(new OpenSecurityProvider()).createContentRepository();
     }
 
     private UserProvider createUserProvider() {
@@ -207,7 +206,6 @@ public class UserProviderImplTest extend
         }
     }
 
-    @Ignore("OAK-270: UUID collisions are not yet detected upon commit.")
     @Test
     public void testCreateWithCollision() throws Exception {
         UserProvider userProvider = createUserProvider();
@@ -329,8 +327,12 @@ public class UserProviderImplTest extend
     public void testIsAdminUser() throws Exception {
         UserProvider userProvider = createUserProvider();
 
-        Tree adminTree = userProvider.createUser(defaultConfig.getAdminId(), null);
-        userProvider.isAdminUser(adminTree);
+        String adminId = defaultConfig.getAdminId();
+        Tree adminTree = userProvider.getAuthorizable(adminId, AuthorizableType.USER);
+        if (adminTree == null) {
+            adminTree = userProvider.createUser(defaultConfig.getAdminId(), null);
+        }
+        assertTrue(userProvider.isAdminUser(adminTree));
 
         List<Tree> others = new ArrayList<Tree>();
         others.add(userProvider.createUser("laura", null));

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Tue Oct  9 16:44:52 2012
@@ -33,225 +33,246 @@
 
   <properties>
     <known.issues>
-org.apache.jackrabbit.test.api.AddNodeTest#testSameNameSiblings<!-- OAK-203 -->
-org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionSrc<!--OAK-132-->
-org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionDest<!--OAK-132-->
-org.apache.jackrabbit.test.api.SessionTest#testSaveConstraintViolationException<!--OAK-66-->
-org.apache.jackrabbit.test.api.SessionTest#testHasCapability
-org.apache.jackrabbit.test.api.SessionTest#testMoveLockException
-org.apache.jackrabbit.test.api.SessionUUIDTest#testSaveReferentialIntegrityException<!--OAK-66-->
-org.apache.jackrabbit.test.api.SessionUUIDTest#testSaveMovedRefNode<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeTest#testSaveConstraintViolationException<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeTest#testAddNodeConstraintViolationExceptionUndefinedNodeType<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeTest#testRemoveMandatoryNode<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeTest#testRefreshInvalidItemStateException<!--OAK-141-->
-org.apache.jackrabbit.test.api.NodeTest#testPrimaryTypeProtected<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeTest#testMixinTypesProtected<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeTest#testRemoveNodeLockedItself
-org.apache.jackrabbit.test.api.NodeTest#testRemoveNodeParentLocked
-org.apache.jackrabbit.test.api.NodeUUIDTest#testSaveReferentialIntegrityException<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeUUIDTest#testSaveMovedRefNode<!--OAK-66-->
-org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforeUnsupportedRepositoryOperationException<!--OAK-169-->
-org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforePlaceAtEndParentSave<!--OAK-169-->
-org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforePlaceAtEndSessionSave<!--OAK-169-->
-org.apache.jackrabbit.test.api.SetValueValueFormatExceptionTest#testNodeNotReferenceable
-org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testLocked
-org.apache.jackrabbit.test.api.WorkspaceCopyReferenceableTest#testCopyNodesNewUUID
-org.apache.jackrabbit.test.api.WorkspaceCopyVersionableTest#testCopyNodesVersionableAndCheckedIn
-org.apache.jackrabbit.test.api.WorkspaceMoveReferenceableTest#testMoveNodesReferenceableNodesNewUUID
-org.apache.jackrabbit.test.api.WorkspaceMoveVersionableTest#testMoveNodesVersionableAndCheckedIn
-org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveLockedNode
-org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveLockedChildItem
-org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveCheckedInItem
-org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDoubleTest#testConversions          <!-- OAK-302 -->
-org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDoubleTest#testConversionsMultiple  <!-- OAK-302 -->
-org.apache.jackrabbit.test.api.nodetype.CanSetPropertyLongTest#testConversions            <!-- OAK-302 -->
-org.apache.jackrabbit.test.api.nodetype.CanSetPropertyLongTest#testConversionsMultiple    <!-- OAK-302 -->
-org.apache.jackrabbit.test.api.nodetype.CanSetPropertyMultipleTest#testReturnFalseBecauseIsProtected  <!-- OAK-250 -->
-org.apache.jackrabbit.test.api.nodetype.CanSetPropertyTest#testReturnFalseBecauseIsProtected          <!-- OAK-250 -->
-org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testValueConstraintViolationExceptionBecauseOfInvalidTypeParameter
-org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testValuesConstraintViolationExceptionBecauseOfInvalidTypeParameter
-org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testStringConstraintViolationExceptionBecauseOfInvalidTypeParameter
-org.apache.jackrabbit.test.api.NodeAddMixinTest#testAddInheritedMixin
-org.apache.jackrabbit.test.api.NodeAddMixinTest#testLocked
-org.apache.jackrabbit.test.api.NodeCanAddMixinTest#testLocked
-org.apache.jackrabbit.test.api.NodeRemoveMixinTest#testLocked
-org.apache.jackrabbit.test.api.ValueFactoryTest#testValueFormatException<!--OAK-204-->
-org.apache.jackrabbit.test.api.WorkspaceCopySameNameSibsTest
-org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesConstraintViolationException
-org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesAccessDenied
-org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesLocked
-org.apache.jackrabbit.test.api.WorkspaceMoveSameNameSibsTest
-org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesConstraintViolationException
-org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesLocked
-org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesAccessDenied
-org.apache.jackrabbit.test.api.ImpersonateTest
-org.apache.jackrabbit.test.api.CheckPermissionTest
-org.apache.jackrabbit.test.api.DocumentViewImportTest
-org.apache.jackrabbit.test.api.SerializationTest
-org.apache.jackrabbit.test.api.HasPermissionTest
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddInvalidLockToken
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockNonLockable
-org.apache.jackrabbit.test.api.lock.LockTest#testGetNode
-org.apache.jackrabbit.test.api.lock.LockTest#testAddRemoveLockToken
-org.apache.jackrabbit.test.api.lock.LockTest#testNodeLocked
-org.apache.jackrabbit.test.api.lock.LockTest#testGetLockOwnerProperty
-org.apache.jackrabbit.test.api.lock.LockTest#testGetLockOwner
-org.apache.jackrabbit.test.api.lock.LockTest#testShallowLock
-org.apache.jackrabbit.test.api.lock.LockTest#testParentChildLock
-org.apache.jackrabbit.test.api.lock.LockTest#testParentChildDeepLock
-org.apache.jackrabbit.test.api.lock.LockTest#testIsDeep
-org.apache.jackrabbit.test.api.lock.LockTest#testIsSessionScoped
-org.apache.jackrabbit.test.api.lock.LockTest#testLogout
-org.apache.jackrabbit.test.api.lock.LockTest#testLockTransfer
-org.apache.jackrabbit.test.api.lock.LockTest#testOpenScopedLocks
-org.apache.jackrabbit.test.api.lock.LockTest#testRefresh
-org.apache.jackrabbit.test.api.lock.LockTest#testRefreshNotLive
-org.apache.jackrabbit.test.api.lock.LockTest#testGetLock
-org.apache.jackrabbit.test.api.lock.LockTest#testMoveLocked
-org.apache.jackrabbit.test.api.lock.SetValueLockExceptionTest#testSetValueLockException
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testParentChildDeepLock
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetNodeOnLockObtainedFromChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetNodeOnLockObtainedFromNewChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testDeepLockAboveLockedChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testShallowLockAboveLockedChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveLockedChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLive
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsDeep
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsSessionScoped
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testRefresh
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testRefreshNotLive
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockHoldingNode
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testNodeIsLocked
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testNodeHoldsLocked
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockVisibility
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockOwningSession
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemaining
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemainingAfterUnlock
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockExpiration
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testOwnerHint
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testUnlock
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testUnlockByOtherSession
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockedChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockedNewChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testHoldsLockChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testHoldsLockNewChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetLockOnChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetLockOnNewChild
-org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveMixLockableFromLockedNode
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockWithPendingChanges
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testNullOwnerHint
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokens
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokensAfterUnlock
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokensSessionScoped
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockToken
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenToAnotherSession
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken2
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken3
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockTokenTwice
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenAgain
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer2
-org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer3
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockToken
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLive
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsDeep
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsSessionScoped
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRefresh
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRefreshNotLive
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockHoldingNode
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testNodeIsLocked
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testNodeHoldsLocked
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockVisibility
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockOwningSession
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemaining
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemainingAfterUnlock
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockExpiration
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testOwnerHint
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testUnlock
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testUnlockByOtherSession
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockedChild
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockedNewChild
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testHoldsLockChild
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testHoldsLockNewChild
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockOnChild
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockOnNewChild
-org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRemoveMixLockableFromLockedNode
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockToken
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock2
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLive
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsDeep
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsSessionScoped
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRefresh
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRefreshNotLive
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockHoldingNode
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testNodeIsLocked
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testNodeHoldsLocked
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockVisibility
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockOwningSession
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemaining
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemainingAfterUnlock
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockExpiration
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testOwnerHint
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testUnlock
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testUnlockByOtherSession
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockedChild
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockedNewChild
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testHoldsLockChild
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testHoldsLockNewChild
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockOnChild
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockOnNewChild
-org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRemoveMixLockableFromLockedNode
-org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsMandatory  <!-- OAK-66 -->
-org.apache.jackrabbit.test.api.LifecycleTest
-org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS<!-- OAK-203 -->
-org.apache.jackrabbit.test.api.query.GetPropertyNamesTest#testGetPropertyNames
-org.apache.jackrabbit.test.api.query.SaveTest#testConstraintViolationException
-org.apache.jackrabbit.test.api.query.SaveTest#testItemExistsException<!-- OAK-203 -->
-org.apache.jackrabbit.test.api.query.SimpleSelectionTest#testSingleProperty
-org.apache.jackrabbit.test.api.query.SaveTest#testLockException
-org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoin
-org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinNtBase
-org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType
-org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS
-org.apache.jackrabbit.test.api.query.qom.ColumnTest#testExpandColumnsForNodeType
-org.apache.jackrabbit.test.api.query.qom.SelectorTest#testUnknownNodeType
-org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testInnerJoin
-org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testReferenceLiteral
-org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testWeakReferenceLiteral
-org.apache.jackrabbit.test.api.query.qom.ChildNodeJoinConditionTest#testRightOuterJoin
-org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testRightOuterJoin
-org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testLeftOuterJoin
-org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoin
-org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoin
-org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoin
-org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoinWithPath
-org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoinWithPath
-org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoinWithPath
-org.apache.jackrabbit.test.api.observation.EventTest#testGetUserId
-org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveNode
-org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveTree
-org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveWithRemove
-org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderAddRemove           <!-- reorder not supported -->
-org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderMove                <!-- reorder not supported -->
-org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderSameName            <!-- reorder not supported -->
-org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderSameNameWithRemove  <!-- reorder not supported -->
-org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testNodeType
-org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testNoLocalTrue
-org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeAdded
-org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeMoved
-org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeRemoved
-org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyAdded
-org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyChanged
-org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyRemoved
-org.apache.jackrabbit.test.api.observation.GetUserDataTest#testSave
-org.apache.jackrabbit.test.api.observation.GetUserDataTest#testWorkspaceOperation
-org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testUUID
-org.apache.jackrabbit.test.api.observation.LockingTest#testAddLockToNode
-org.apache.jackrabbit.test.api.observation.LockingTest#testRemoveLockFromNode
-org.apache.jackrabbit.oak.jcr.security.user.EveryoneGroupTest#testMembers <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.test.api.AddNodeTest#testSameNameSiblings<!-- OAK-203 -->
+      org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionSrc<!--OAK-132-->
+      org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionDest<!--OAK-132-->
+      org.apache.jackrabbit.test.api.SessionTest#testSaveConstraintViolationException<!--OAK-66-->
+      org.apache.jackrabbit.test.api.SessionTest#testHasCapability
+      org.apache.jackrabbit.test.api.SessionTest#testMoveLockException
+      org.apache.jackrabbit.test.api.SessionUUIDTest#testSaveReferentialIntegrityException<!--OAK-66-->
+      org.apache.jackrabbit.test.api.SessionUUIDTest#testSaveMovedRefNode<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeTest#testSaveConstraintViolationException<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeTest#testAddNodeConstraintViolationExceptionUndefinedNodeType<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeTest#testRemoveMandatoryNode<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeTest#testRefreshInvalidItemStateException<!--OAK-141-->
+      org.apache.jackrabbit.test.api.NodeTest#testPrimaryTypeProtected<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeTest#testMixinTypesProtected<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeTest#testRemoveNodeLockedItself
+      org.apache.jackrabbit.test.api.NodeTest#testRemoveNodeParentLocked
+      org.apache.jackrabbit.test.api.NodeUUIDTest#testSaveReferentialIntegrityException<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeUUIDTest#testSaveMovedRefNode<!--OAK-66-->
+      org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforeUnsupportedRepositoryOperationException<!--OAK-169-->
+      org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforePlaceAtEndParentSave<!--OAK-169-->
+      org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest#testOrderBeforePlaceAtEndSessionSave<!--OAK-169-->
+      org.apache.jackrabbit.test.api.SetValueValueFormatExceptionTest#testNodeNotReferenceable
+      org.apache.jackrabbit.test.api.NodeSetPrimaryTypeTest#testLocked
+      org.apache.jackrabbit.test.api.WorkspaceCopyReferenceableTest#testCopyNodesNewUUID
+      org.apache.jackrabbit.test.api.WorkspaceCopyVersionableTest#testCopyNodesVersionableAndCheckedIn
+      org.apache.jackrabbit.test.api.WorkspaceMoveReferenceableTest#testMoveNodesReferenceableNodesNewUUID
+      org.apache.jackrabbit.test.api.WorkspaceMoveVersionableTest#testMoveNodesVersionableAndCheckedIn
+      org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveLockedNode
+      org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveLockedChildItem
+      org.apache.jackrabbit.test.api.SessionRemoveItemTest#testRemoveCheckedInItem
+      org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDoubleTest#testConversions          <!-- OAK-302 -->
+      org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDoubleTest#testConversionsMultiple  <!-- OAK-302 -->
+      org.apache.jackrabbit.test.api.nodetype.CanSetPropertyLongTest#testConversions            <!-- OAK-302 -->
+      org.apache.jackrabbit.test.api.nodetype.CanSetPropertyLongTest#testConversionsMultiple    <!-- OAK-302 -->
+      org.apache.jackrabbit.test.api.nodetype.CanSetPropertyMultipleTest#testReturnFalseBecauseIsProtected  <!-- OAK-250 -->
+      org.apache.jackrabbit.test.api.nodetype.CanSetPropertyTest#testReturnFalseBecauseIsProtected          <!-- OAK-250 -->
+      org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testValueConstraintViolationExceptionBecauseOfInvalidTypeParameter
+      org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testValuesConstraintViolationExceptionBecauseOfInvalidTypeParameter
+      org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest#testStringConstraintViolationExceptionBecauseOfInvalidTypeParameter
+      org.apache.jackrabbit.test.api.NodeAddMixinTest#testAddInheritedMixin
+      org.apache.jackrabbit.test.api.NodeAddMixinTest#testLocked
+      org.apache.jackrabbit.test.api.NodeCanAddMixinTest#testLocked
+      org.apache.jackrabbit.test.api.NodeRemoveMixinTest#testLocked
+      org.apache.jackrabbit.test.api.ValueFactoryTest#testValueFormatException<!--OAK-204-->
+      org.apache.jackrabbit.test.api.WorkspaceCopySameNameSibsTest
+      org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesConstraintViolationException
+      org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesAccessDenied
+      org.apache.jackrabbit.test.api.WorkspaceCopyTest#testCopyNodesLocked
+      org.apache.jackrabbit.test.api.WorkspaceMoveSameNameSibsTest
+      org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesConstraintViolationException
+      org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesLocked
+      org.apache.jackrabbit.test.api.WorkspaceMoveTest#testMoveNodesAccessDenied
+      org.apache.jackrabbit.test.api.ImpersonateTest
+      org.apache.jackrabbit.test.api.CheckPermissionTest
+      org.apache.jackrabbit.test.api.DocumentViewImportTest
+      org.apache.jackrabbit.test.api.SerializationTest
+      org.apache.jackrabbit.test.api.HasPermissionTest
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddInvalidLockToken
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockNonLockable
+      org.apache.jackrabbit.test.api.lock.LockTest#testGetNode
+      org.apache.jackrabbit.test.api.lock.LockTest#testAddRemoveLockToken
+      org.apache.jackrabbit.test.api.lock.LockTest#testNodeLocked
+      org.apache.jackrabbit.test.api.lock.LockTest#testGetLockOwnerProperty
+      org.apache.jackrabbit.test.api.lock.LockTest#testGetLockOwner
+      org.apache.jackrabbit.test.api.lock.LockTest#testShallowLock
+      org.apache.jackrabbit.test.api.lock.LockTest#testParentChildLock
+      org.apache.jackrabbit.test.api.lock.LockTest#testParentChildDeepLock
+      org.apache.jackrabbit.test.api.lock.LockTest#testIsDeep
+      org.apache.jackrabbit.test.api.lock.LockTest#testIsSessionScoped
+      org.apache.jackrabbit.test.api.lock.LockTest#testLogout
+      org.apache.jackrabbit.test.api.lock.LockTest#testLockTransfer
+      org.apache.jackrabbit.test.api.lock.LockTest#testOpenScopedLocks
+      org.apache.jackrabbit.test.api.lock.LockTest#testRefresh
+      org.apache.jackrabbit.test.api.lock.LockTest#testRefreshNotLive
+      org.apache.jackrabbit.test.api.lock.LockTest#testGetLock
+      org.apache.jackrabbit.test.api.lock.LockTest#testMoveLocked
+      org.apache.jackrabbit.test.api.lock.SetValueLockExceptionTest#testSetValueLockException
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testParentChildDeepLock
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetNodeOnLockObtainedFromChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetNodeOnLockObtainedFromNewChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testDeepLockAboveLockedChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testShallowLockAboveLockedChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveLockedChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLive
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsDeep
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsSessionScoped
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testRefresh
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testRefreshNotLive
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockHoldingNode
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testNodeIsLocked
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testNodeHoldsLocked
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockVisibility
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockOwningSession
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemaining
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetSecondsRemainingAfterUnlock
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testLockExpiration
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testOwnerHint
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testUnlock
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testUnlockByOtherSession
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockedChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testIsLockedNewChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testHoldsLockChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testHoldsLockNewChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetLockOnChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testGetLockOnNewChild
+      org.apache.jackrabbit.test.api.lock.DeepLockTest#testRemoveMixLockableFromLockedNode
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockWithPendingChanges
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testNullOwnerHint
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokens
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokensAfterUnlock
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testGetLockTokensSessionScoped
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockToken
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenToAnotherSession
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken2
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockToken3
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testRemoveLockTokenTwice
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testAddLockTokenAgain
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer2
+      org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer3
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockToken
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLive
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsDeep
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsSessionScoped
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRefresh
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRefreshNotLive
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockHoldingNode
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testNodeIsLocked
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testNodeHoldsLocked
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockVisibility
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockOwningSession
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemaining
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetSecondsRemainingAfterUnlock
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testLockExpiration
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testOwnerHint
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testUnlock
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testUnlockByOtherSession
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockedChild
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testIsLockedNewChild
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testHoldsLockChild
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testHoldsLockNewChild
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockOnChild
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testGetLockOnNewChild
+      org.apache.jackrabbit.test.api.lock.OpenScopedLockTest#testRemoveMixLockableFromLockedNode
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockToken
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testImplicitUnlock2
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLive
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsDeep
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsSessionScoped
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRefresh
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRefreshNotLive
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockHoldingNode
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testNodeIsLocked
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testNodeHoldsLocked
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockVisibility
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockOwningSession
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemaining
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetSecondsRemainingAfterUnlock
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testLockExpiration
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testOwnerHint
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testUnlock
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testUnlockByOtherSession
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockedChild
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testIsLockedNewChild
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testHoldsLockChild
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testHoldsLockNewChild
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockOnChild
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testGetLockOnNewChild
+      org.apache.jackrabbit.test.api.lock.SessionScopedLockTest#testRemoveMixLockableFromLockedNode
+      org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsMandatory  <!-- OAK-66 -->
+      org.apache.jackrabbit.test.api.LifecycleTest
+      org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS<!-- OAK-203 -->
+      org.apache.jackrabbit.test.api.query.GetPropertyNamesTest#testGetPropertyNames
+      org.apache.jackrabbit.test.api.query.SaveTest#testConstraintViolationException
+      org.apache.jackrabbit.test.api.query.SaveTest#testItemExistsException<!-- OAK-203 -->
+      org.apache.jackrabbit.test.api.query.SimpleSelectionTest#testSingleProperty
+      org.apache.jackrabbit.test.api.query.SaveTest#testLockException
+      org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoin
+      org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinNtBase
+      org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinFilterPrimaryType
+      org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS
+      org.apache.jackrabbit.test.api.query.qom.ColumnTest#testExpandColumnsForNodeType
+      org.apache.jackrabbit.test.api.query.qom.SelectorTest#testUnknownNodeType
+      org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testInnerJoin
+      org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testReferenceLiteral
+      org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testWeakReferenceLiteral
+      org.apache.jackrabbit.test.api.query.qom.ChildNodeJoinConditionTest#testRightOuterJoin
+      org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testRightOuterJoin
+      org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testLeftOuterJoin
+      org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoin
+      org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoin
+      org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoin
+      org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoinWithPath
+      org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoinWithPath
+      org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoinWithPath
+      org.apache.jackrabbit.test.api.observation.EventTest#testGetUserId
+      org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveNode
+      org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveTree
+      org.apache.jackrabbit.test.api.observation.NodeMovedTest#testMoveWithRemove
+      org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderAddRemove           <!-- reorder not supported -->
+      org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderMove                <!-- reorder not supported -->
+      org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderSameName            <!-- reorder not supported -->
+      org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderSameNameWithRemove  <!-- reorder not supported -->
+      org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testNodeType
+      org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testNoLocalTrue
+      org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeAdded
+      org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeMoved
+      org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeRemoved
+      org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyAdded
+      org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyChanged
+      org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testPropertyRemoved
+      org.apache.jackrabbit.test.api.observation.GetUserDataTest#testSave
+      org.apache.jackrabbit.test.api.observation.GetUserDataTest#testWorkspaceOperation
+      org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testUUID
+      org.apache.jackrabbit.test.api.observation.LockingTest#testAddLockToNode
+      org.apache.jackrabbit.test.api.observation.LockingTest#testRemoveLockFromNode
+      org.apache.jackrabbit.oak.jcr.security.user.EveryoneGroupTest#testMembers                    <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserQueryTest                                    <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testFindAuthorizableByAddedProperty <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testFindAuthorizableByRelativePath <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testFindUser                     <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testFindGroup                    <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testFindAllUsers                 <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testFindAllGroups                <!-- findAuthorizables not yet implemented -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testCleanup                      <!-- missing cleanup -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testCleanupForAllWorkspaces      <!-- missing cleanup -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testGetNewAuthorizable                 <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testCreateGroupWithExistingPrincipal2  <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testCreateGroupWithExistingPrincipal3  <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testEnforceAuthorizableFolderHierarchy <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testCreateGroupWithExistingPrincipal2  <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.GroupTest#testDeeplyNestedGroups                 <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.GroupTest#testInheritedMembers                   <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.GroupTest#testCyclicGroups                       <!-- OAK-343 -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserManagerTest#testUnknownUserLogin             <!-- due to dummy login -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserTest#testChangePassword2                     <!-- due to dummy login -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserTest#testChangePasswordWithOldPassword2      <!-- due to dummy login -->
+      org.apache.jackrabbit.oak.jcr.security.user.UserTest#testDisable                             <!-- due to dummy login -->
     </known.issues>
   </properties>
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java Tue Oct  9 16:44:52 2012
@@ -51,9 +51,8 @@ public abstract class AbstractUserTest e
 
         userMgr = getUserManager(superuser);
 
-        Principal p = getTestPrincipal();
-        user = userMgr.createUser(p.getName(), "pw");
-        group = userMgr.createGroup(getTestPrincipal());
+        user = userMgr.createUser(createUserId(), "pw");
+        group = userMgr.createGroup(createGroupId());
         superuser.save();
     }
 
@@ -99,8 +98,16 @@ public abstract class AbstractUserTest e
         }
     }
 
+    protected String createUserId() throws RepositoryException {
+        return "testUser_" + UUID.randomUUID();
+    }
+
+    protected String createGroupId() throws RepositoryException {
+        return "testGroup_" + UUID.randomUUID();
+    }
+
     protected Principal getTestPrincipal() throws RepositoryException {
-        String pn = "any_principal" + UUID.randomUUID();
+        String pn = "testPrincipal_" + UUID.randomUUID();
         return getTestPrincipal(pn);
     }
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java Tue Oct  9 16:44:52 2012
@@ -185,8 +185,8 @@ public class AuthorizableTest extends Ab
         Group group = null;
 
         try {
-            auth = userMgr.createUser(getTestPrincipal().getName(), "pw");
-            group = userMgr.createGroup(getTestPrincipal());
+            auth = userMgr.createUser(createUserId(), "pw");
+            group = userMgr.createGroup(createGroupId());
             superuser.save();
 
             Iterator<Group> groups = auth.declaredMemberOf();

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java Tue Oct  9 16:44:52 2012
@@ -29,13 +29,11 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.test.NotExecutableException;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * GroupTest...
  */
-@Ignore // FIXME: enable again
 public class GroupTest extends AbstractUserTest {
 
     private List<String> members = new ArrayList<String>();
@@ -164,7 +162,7 @@ public class GroupTest extends AbstractU
         User auth = getTestUser(superuser);
         Group newGroup = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertFalse(newGroup.isMember(auth));
@@ -192,7 +190,7 @@ public class GroupTest extends AbstractU
         int size = 100;
         List<User> users = new ArrayList<User>(size);
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             for (int k = 0; k < size; k++) {
@@ -236,8 +234,8 @@ public class GroupTest extends AbstractU
         Group newGroup1 = null;
         Group newGroup2 = null;
         try {
-            newGroup1 = userMgr.createGroup(getTestPrincipal());
-            newGroup2 = userMgr.createGroup(getTestPrincipal());
+            newGroup1 = userMgr.createGroup(createGroupId());
+            newGroup2 = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertFalse(newGroup1.isMember(auth));
@@ -290,8 +288,8 @@ public class GroupTest extends AbstractU
         Group newGroup1 = null;
         Group newGroup2 = null;
         try {
-            newGroup1 = userMgr.createGroup(getTestPrincipal());
-            newGroup2 = userMgr.createGroup(getTestPrincipal());
+            newGroup1 = userMgr.createGroup(createGroupId());
+            newGroup2 = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertFalse(newGroup1.isDeclaredMember(auth));
@@ -327,7 +325,7 @@ public class GroupTest extends AbstractU
         User auth = getTestUser(superuser);
         Group newGroup = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertTrue(newGroup.addMember(auth));
@@ -350,7 +348,7 @@ public class GroupTest extends AbstractU
         User auth = getTestUser(superuser);
         Group newGroup = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertFalseMemberOfContainsGroup(auth.memberOf(), newGroup);
@@ -373,7 +371,7 @@ public class GroupTest extends AbstractU
         User auth = getTestUser(superuser);
         Group newGroup = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertFalseIsMember(newGroup.getMembers(), auth);
@@ -394,31 +392,31 @@ public class GroupTest extends AbstractU
 
     @Test
     public void testIndirectMembers() throws NotExecutableException, RepositoryException {
-        User auth = getTestUser(superuser);
+        User user = getTestUser(superuser);
         Group newGroup = null;
         Group newGroup2 = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
-            newGroup2 = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
+            newGroup2 = userMgr.createGroup(createGroupId());
             superuser.save();
 
             newGroup.addMember(newGroup2);
             superuser.save();
             assertTrue(newGroup.isMember(newGroup2));
 
-            newGroup2.addMember(auth);
+            newGroup2.addMember(user);
             superuser.save();
 
             // testuser must not be declared member of 'newGroup'
-            assertFalseIsMember(newGroup.getDeclaredMembers(), auth);
-            assertFalseMemberOfContainsGroup(auth.declaredMemberOf(), newGroup);
+            assertFalseIsMember(newGroup.getDeclaredMembers(), user);
+            assertFalseMemberOfContainsGroup(user.declaredMemberOf(), newGroup);
 
             // testuser must however be member of 'newGroup' (indirect).
-            assertTrueIsMember(newGroup.getMembers(), auth);
-            assertTrueMemberOfContainsGroup(auth.memberOf(), newGroup);
+            assertTrueIsMember(newGroup.getMembers(), user);
+            assertTrueMemberOfContainsGroup(user.memberOf(), newGroup);
 
             // testuser cannot be removed from 'newGroup'
-            assertFalse(newGroup.removeMember(auth));
+            assertFalse(newGroup.removeMember(user));
             superuser.save();
         } finally {
             if (newGroup != null) {
@@ -427,7 +425,7 @@ public class GroupTest extends AbstractU
                 superuser.save();
             }
             if (newGroup2 != null) {
-                newGroup2.removeMember(auth);
+                newGroup2.removeMember(user);
                 newGroup2.remove();
                 superuser.save();
             }
@@ -440,8 +438,8 @@ public class GroupTest extends AbstractU
         Group newGroup = null;
         Group newGroup2 = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
-            newGroup2 = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
+            newGroup2 = userMgr.createGroup(createGroupId());
             superuser.save();
 
             newGroup.addMember(newGroup2);
@@ -480,12 +478,12 @@ public class GroupTest extends AbstractU
         Set<Group> groups = new HashSet<Group>();
         try {
             User auth = getTestUser(superuser);
-            Group topGroup = userMgr.createGroup(getTestPrincipal());
+            Group topGroup = userMgr.createGroup(createGroupId());
 
             // Create chain of nested groups with auth member of bottom group
             Group bottomGroup = topGroup;
             for (int k = 0; k < 100; k++) {
-                Group g = userMgr.createGroup(getTestPrincipal());
+                Group g = userMgr.createGroup(createGroupId());
                 groups.add(g);
                 bottomGroup.addMember(g);
                 bottomGroup = g;
@@ -518,13 +516,13 @@ public class GroupTest extends AbstractU
     public void testInheritedMembers() throws Exception {
         Set<Authorizable> authorizables = new HashSet<Authorizable>();
         try {
-            User testUser = userMgr.createUser(getTestPrincipal().getName(), "pw");
+            User testUser = userMgr.createUser(createUserId(), "pw");
             authorizables.add(testUser);
-            Group group1 = userMgr.createGroup(getTestPrincipal());
+            Group group1 = userMgr.createGroup(createGroupId());
             authorizables.add(group1);
-            Group group2 = userMgr.createGroup(getTestPrincipal());
+            Group group2 = userMgr.createGroup(createGroupId());
             authorizables.add(group2);
-            Group group3 = userMgr.createGroup(getTestPrincipal());
+            Group group3 = userMgr.createGroup(createGroupId());
 
             group1.addMember(testUser);
             group2.addMember(testUser);
@@ -552,9 +550,9 @@ public class GroupTest extends AbstractU
         Group group2 = null;
         Group group3 = null;
         try {
-            group1 = userMgr.createGroup(getTestPrincipal());
-            group2 = userMgr.createGroup(getTestPrincipal());
-            group3 = userMgr.createGroup(getTestPrincipal());
+            group1 = userMgr.createGroup(createGroupId());
+            group2 = userMgr.createGroup(createGroupId());
+            group3 = userMgr.createGroup(createGroupId());
 
             group1.addMember(getTestUser(superuser));
             group2.addMember(getTestUser(superuser));
@@ -562,8 +560,7 @@ public class GroupTest extends AbstractU
             assertTrue(group1.addMember(group2));
             assertTrue(group2.addMember(group3));
             assertFalse(group3.addMember(group1));
-        }
-        finally {
+        } finally {
             if (group1 != null) group1.remove();
             if (group2 != null) group2.remove();
             if (group3 != null) group3.remove();
@@ -575,7 +572,7 @@ public class GroupTest extends AbstractU
         User auth = getTestUser(superuser);
         Group newGroup = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertTrue(newGroup.addMember(auth));
@@ -596,7 +593,7 @@ public class GroupTest extends AbstractU
     public void testAddItselfAsMember() throws RepositoryException, NotExecutableException {
         Group newGroup = null;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
 
             assertFalse(newGroup.addMember(newGroup));
@@ -617,7 +614,7 @@ public class GroupTest extends AbstractU
         String newGroupId = null;
 
         try {
-            Group newGroup = userMgr.createGroup(getTestPrincipal());
+            Group newGroup = userMgr.createGroup(createGroupId());
             superuser.save();
             newGroupId = newGroup.getID();
 
@@ -640,7 +637,7 @@ public class GroupTest extends AbstractU
         Group newGroup = null;
         String groupId;
         try {
-            newGroup = userMgr.createGroup(getTestPrincipal());
+            newGroup = userMgr.createGroup(createGroupId());
             groupId = newGroup.getID();
             superuser.save();
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java Tue Oct  9 16:44:52 2012
@@ -38,44 +38,48 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.apache.jackrabbit.test.NotExecutableException;
-import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore // FIXME
 public class UserManagerTest extends AbstractUserTest {
 
-    private String getTestUserId(Principal p) throws RepositoryException {
-        String hint = "UID" + p.getName();
-        String userId = hint;
-        int i = 0;
-        while (userMgr.getAuthorizable(userId) != null) {
-            userId = hint + i++;
-        }
-        return userId;
-    }
-
     @Test
     public void testGetNewAuthorizable() throws RepositoryException, NotExecutableException {
-        String uid = "testGetNewAuthorizable";
-        User user = userMgr.createUser(uid, uid);
+        String uid = createUserId();
+        User user = null;
 
-        assertEquals(uid, user.getID());
-        assertNotNull(userMgr.getAuthorizable(uid));
-        assertEquals(user,  userMgr.getAuthorizable(uid));
+        try {
+            user = userMgr.createUser(uid, uid);
+            assertEquals(uid, user.getID());
+            assertNotNull(userMgr.getAuthorizable(uid));
+            assertEquals(user,  userMgr.getAuthorizable(uid));
 
-        assertNotNull(getNode(user, superuser));
+            assertNotNull(getNode(user, superuser));
+        } finally {
+            if (user != null) {
+                user.remove();
+            }
+        }
     }
 
+    @Test
     public void testGetAuthorizable() throws RepositoryException, NotExecutableException {
-        String uid = "testGetNewAuthorizable";
-        User user = userMgr.createUser(uid, uid);
-        superuser.save();
-
-        assertEquals(uid, user.getID());
-        assertNotNull(userMgr.getAuthorizable(uid));
-        assertEquals(user,  userMgr.getAuthorizable(uid));
+        String uid = createUserId();
+        User user = null;
+
+        try {
+            user = userMgr.createUser(uid, uid);
+            superuser.save();
 
-        assertNotNull(getNode(user, superuser));
+            assertEquals(uid, user.getID());
+            assertNotNull(userMgr.getAuthorizable(uid));
+            assertEquals(user,  userMgr.getAuthorizable(uid));
+
+            assertNotNull(getNode(user, superuser));
+        } finally {
+            if (user != null) {
+                user.remove();
+            }
+        }
     }
 
     @Test
@@ -97,14 +101,14 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testPrincipalNameEqualsUserID() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
         User u = null;
         try {
-            u = userMgr.createUser(p.getName(), "pw");
+            String uid = createUserId();
+            u = userMgr.createUser(uid, "pw");
             superuser.save();
 
             String msg = "User.getID() must return the userID pass to createUser.";
-            assertEquals(msg, u.getID(), p.getName());
+            assertEquals(msg, uid, u.getID());
         } finally {
             if (u != null) {
                 u.remove();
@@ -115,11 +119,10 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testUserIDFromSession() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
         User u = null;
         Session uSession = null;
         try {
-            String uid = p.getName();
+            String uid = createUserId();
             u = userMgr.createUser(uid, "pw");
             superuser.save();
 
@@ -138,12 +141,12 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateUserIdDifferentFromPrincipalName() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = getTestUserId(p);
-
         User u = null;
         Session uSession = null;
         try {
+            Principal p = getTestPrincipal();
+            String uid = createUserId();
+
             u = userMgr.createUser(uid, "pw", p, null);
             superuser.save();
 
@@ -220,16 +223,14 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupWithId() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = p.getName();
-
         Group gr = null;
         try {
+            String id = createGroupId();
 
         	// assert group creation with exact ID
-            gr = userMgr.createGroup(uid);
+            gr = userMgr.createGroup(id);
             superuser.save();
-            assertEquals("Expect group with exact ID", uid, gr.getID());
+            assertEquals("Expect group with exact ID", id, gr.getID());
 
         } finally {
             if (gr != null) {
@@ -241,11 +242,10 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupWithIdAndPrincipal() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = p.getName();
-
         Group gr = null;
         try {
+            Principal p = getTestPrincipal();
+            String uid = p.getName();
 
         	// assert group creation with exact ID
             gr = userMgr.createGroup(uid, p, null);
@@ -264,9 +264,10 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupIdDifferentFromPrincipalName() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
         Group g = null;
         try {
+            Principal p = getTestPrincipal();
+
             g = userMgr.createGroup("testGroup", p, null);
             superuser.save();
 
@@ -285,12 +286,12 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupWithExistingPrincipal() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = p.getName();
-
         User u = null;
         try {
-        	// create a user with the given ID
+            Principal p = getTestPrincipal();
+            String uid = p.getName();
+
+            // create a user with the given ID
             u = userMgr.createUser(uid, "pw", p, null);
             superuser.save();
 
@@ -319,7 +320,7 @@ public class UserManagerTest extends Abs
     @Test
     public void testCreateGroupWithExistingPrincipal2() throws RepositoryException, NotExecutableException {
         Principal p = getTestPrincipal();
-        String uid = getTestUserId(p);
+        String uid = createUserId();
 
         assertFalse(uid.equals(p.getName()));
 
@@ -354,7 +355,7 @@ public class UserManagerTest extends Abs
     @Test
     public void testCreateGroupWithExistingPrincipal3() throws RepositoryException, NotExecutableException {
         Principal p = getTestPrincipal();
-        String uid = getTestUserId(p);
+        String uid = createUserId();
 
         assertFalse(uid.equals(p.getName()));
 
@@ -367,7 +368,7 @@ public class UserManagerTest extends Abs
             // assert AuthorizableExistsException for principal that is already in use
             Group gr = null;
             try {
-            	gr = userMgr.createGroup(getTestPrincipal().getName(), p, null);
+            	gr = userMgr.createGroup(createGroupId(), p, null);
             	fail("Principal " + p.getName() + " is already in use -> must throw AuthorizableExistsException.");
             } catch (AuthorizableExistsException aee) {
             	// expected this
@@ -388,13 +389,12 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupWithExistingUserID() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = getTestUserId(p);
-
         User u = null;
         try {
+            String uid = createUserId();
+
         	// create a user with the given ID
-            u = userMgr.createUser(uid, "pw", p, null);
+            u = userMgr.createUser(uid, "pw");
             superuser.save();
 
             // assert AuthorizableExistsException for id that is already in use
@@ -421,20 +421,19 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupWithExistingGroupID() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = getTestUserId(p);
-
         Group g = null;
         try {
+            String id = createGroupId();
+
         	// create a user with the given ID
-            g = userMgr.createGroup(uid);
+            g = userMgr.createGroup(id);
             superuser.save();
 
             // assert AuthorizableExistsException for id that is already in use
             Group gr = null;
             try {
-            	gr = userMgr.createGroup(uid);
-            	fail("ID " + uid + " is already in use -> must throw AuthorizableExistsException.");
+            	gr = userMgr.createGroup(id);
+            	fail("ID " + id + " is already in use -> must throw AuthorizableExistsException.");
             } catch (AuthorizableExistsException aee) {
             	// expected this
             } finally {
@@ -454,20 +453,20 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testCreateGroupWithExistingGroupID2() throws RepositoryException, NotExecutableException {
-        Principal p = getTestPrincipal();
-        String uid = getTestUserId(p);
 
         Group g = null;
         try {
-        	// create a user with the given ID
-            g = userMgr.createGroup(uid, p, null);
+            String id = createGroupId();
+
+        	// create a group with the given ID
+            g = userMgr.createGroup(id);
             superuser.save();
 
             // assert AuthorizableExistsException for id that is already in use
             Group gr = null;
             try {
-            	gr = userMgr.createGroup(uid, getTestPrincipal(), null);
-            	fail("ID " + uid + " is already in use -> must throw AuthorizableExistsException.");
+            	gr = userMgr.createGroup(id, getTestPrincipal(), null);
+            	fail("ID " + id + " is already in use -> must throw AuthorizableExistsException.");
             } catch (AuthorizableExistsException aee) {
             	// expected this
             } finally {
@@ -485,7 +484,6 @@ public class UserManagerTest extends Abs
         }
     }
 
-    @Ignore // TODO
     @Test
     public void testFindAuthorizableByAddedProperty() throws RepositoryException, NotExecutableException {
         Principal p = getTestPrincipal();
@@ -571,7 +569,8 @@ public class UserManagerTest extends Abs
         User u = null;
         try {
             Principal p = getTestPrincipal();
-            String uid = "UID" + p.getName();
+            String uid = createUserId();
+
             u = userMgr.createUser(uid, "pw", p, null);
             superuser.save();
 
@@ -667,7 +666,7 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testNewUserCanLogin() throws RepositoryException, NotExecutableException {
-        String uid = getTestPrincipal().getName();
+        String uid = createUserId();
         User u = null;
         Session s = null;
         try {
@@ -689,7 +688,7 @@ public class UserManagerTest extends Abs
 
     @Test
     public void testUnknownUserLogin() throws RepositoryException {
-        String uid = getTestPrincipal().getName();
+        String uid = createUserId();
         assertNull(userMgr.getAuthorizable(uid));
         try {
             Session s = superuser.getRepository().login(new SimpleCredentials(uid, uid.toCharArray()));

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java Tue Oct  9 16:44:52 2012
@@ -34,10 +34,8 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.Query;
 import org.apache.jackrabbit.api.security.user.QueryBuilder;
 import org.apache.jackrabbit.api.security.user.User;
-import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore //FIXME: requires UserManager#findAuthorizables
 public class UserQueryTest extends AbstractUserTest {
 
     private User kangaroo;

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java?rev=1396104&r1=1396103&r2=1396104&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java Tue Oct  9 16:44:52 2012
@@ -31,7 +31,6 @@ import org.junit.Test;
 /**
  * UserTest...
  */
-@Ignore // FIXME: enable again
 public class UserTest extends AbstractUserTest {
 
     @Test



Mime
View raw message