inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API

Browse Source 
- remove duplicated code from various locations to use the new methods
- add sanity checks to Lock*Test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2016-08-22 14:20:52 +00:00
parent 8679372a42
commit cc97515300
14 changed files with 591 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
source/test-java/org/alfresco/repo/lock/LockBehaviourImplTest.java
View File

@@ -1,28 +1,28 @@
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.repo.lock;
import java.io.Serializable;
@@ -191,14 +191,24 @@ public class LockBehaviourImplTest extends BaseSpringTest
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
this.lockService.checkForLock(this.nodeRef);
assertFalse(lockService.isLocked(nodeRef));
this.lockService.checkForLock(this.noAspectNode);
assertFalse(lockService.isLocked(noAspectNode));
// Give the node a write lock (as the good user)
this.lockService.lock(this.nodeRef, LockType.WRITE_LOCK);
this.lockService.checkForLock(this.nodeRef);
this.lockService.lock(this.nodeRef, LockType.WRITE_LOCK);
// Give the node a read only lock (as the good user)
this.lockService.checkForLock(this.nodeRef);
assertTrue(lockService.isLocked(nodeRef));
assertFalse(lockService.isLockedAndReadOnly(nodeRef));
// Unlock
this.lockService.unlock(this.nodeRef);
assertFalse(lockService.isLocked(nodeRef));
assertFalse(lockService.isLockedAndReadOnly(nodeRef));
// Give the node a read only lock (as the good user)
this.lockService.lock(this.nodeRef, LockType.READ_ONLY_LOCK);
try
{
@@ -209,15 +219,21 @@ public class LockBehaviourImplTest extends BaseSpringTest
{
// Correct behaviour
}
assertTrue(lockService.isLocked(nodeRef));
assertTrue(lockService.isLockedAndReadOnly(nodeRef));
// Give the node a write lock (as the bad user)
// Unlock
this.lockService.unlock(this.nodeRef);
assertFalse(lockService.isLocked(nodeRef));
assertFalse(lockService.isLockedAndReadOnly(nodeRef));
// Give the node a write lock (as the bad user)
TestWithUserUtils.authenticateUser(BAD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
this.lockService.lock(this.nodeRef, LockType.WRITE_LOCK);
this.lockService.lock(this.nodeRef, LockType.WRITE_LOCK);
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
try
{
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
this.lockService.checkForLock(this.nodeRef);
fail("The node locked exception should have been raised");
}
@@ -225,14 +241,21 @@ public class LockBehaviourImplTest extends BaseSpringTest
{
// Correct behaviour
}
assertTrue(lockService.isLocked(nodeRef));
assertTrue(lockService.isLockedAndReadOnly(nodeRef));
// Give the node a read only lock (as the bad user)
TestWithUserUtils.authenticateUser(BAD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
this.lockService.unlock(this.nodeRef);
this.lockService.lock(this.nodeRef, LockType.READ_ONLY_LOCK);
assertFalse(lockService.isLocked(nodeRef));
assertFalse(lockService.isLockedAndReadOnly(nodeRef));
this.lockService.lock(this.nodeRef, LockType.READ_ONLY_LOCK);
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
try
{
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
this.lockService.checkForLock(this.nodeRef);
fail("The node locked exception should have been raised");
}
@@ -240,6 +263,9 @@ public class LockBehaviourImplTest extends BaseSpringTest
{
// Correct behaviour
}
assertTrue(lockService.isLocked(nodeRef));
assertTrue(lockService.isLockedAndReadOnly(nodeRef));
}
public void testCheckForLockWhenExpired()
@@ -256,11 +282,17 @@ public class LockBehaviourImplTest extends BaseSpringTest
{
// Expected
}
assertTrue(lockService.isLocked(nodeRef));
assertTrue(lockService.isLockedAndReadOnly(nodeRef));
try {Thread.sleep(2*1000); } catch (Exception e) {};
// Should now have expired so the node should no longer appear to be locked
this.lockService.checkForLock(this.nodeRef);
assertFalse(lockService.isLocked(nodeRef));
assertFalse(lockService.isLockedAndReadOnly(nodeRef));
}
/**
@@ -592,6 +624,8 @@ public class LockBehaviourImplTest extends BaseSpringTest
{
fail("Should not be locked for GoodUser : " + nodeToCheck);
}
assertTrue(lockService.isLocked(nodeToCheck));
assertFalse(lockService.isLockedAndReadOnly(nodeToCheck));
TestWithUserUtils.authenticateUser(BAD_USER_WITH_ALL_PERMS_NAME, PWD, rootNodeRef, this.authenticationService);
try
@@ -603,6 +637,8 @@ public class LockBehaviourImplTest extends BaseSpringTest
{
// It's Ok
}
assertTrue(lockService.isLocked(nodeToCheck));
assertTrue(lockService.isLockedAndReadOnly(nodeToCheck));
TestWithUserUtils.authenticateUser(currentUserName, PWD, rootNodeRef, this.authenticationService);
}