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

58
source/test-java/org/alfresco/repo/lock/LockUtilsTest.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 static org.junit.Assert.*;
@@ -41,6 +41,7 @@ import org.mockito.runners.MockitoJUnitRunner;
* Tests for the {@link LockUtils} class.
*
* @author Matt Ward
* @deprecated essentially obsolete (isLockedAndReadOnly is now part of LockService)
*/
@RunWith(MockitoJUnitRunner.class)
public class LockUtilsTest
@@ -53,6 +54,7 @@ public class LockUtilsTest
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(null);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(true);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
@@ -63,6 +65,7 @@ public class LockUtilsTest
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(LockType.WRITE_LOCK);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(false);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(false, returnedVal);
@@ -73,6 +76,7 @@ public class LockUtilsTest
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(LockType.NODE_LOCK);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(true);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
@@ -83,6 +87,7 @@ public class LockUtilsTest
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(LockType.READ_ONLY_LOCK);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(true);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
@@ -92,6 +97,7 @@ public class LockUtilsTest
public void testIsLockedAndReadOnly_ForNoLock()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.NO_LOCK);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(false);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(false, returnedVal);
@@ -101,6 +107,7 @@ public class LockUtilsTest
public void testIsLockedAndReadOnly_ForExpiredLock()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_EXPIRED);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(false);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(false, returnedVal);
@@ -110,6 +117,7 @@ public class LockUtilsTest
public void testIsLockedAndReadOnly_ForLock()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCKED);
when(lockService.isLockedAndReadOnly(nodeRef)).thenReturn(true);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);