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

CLOUD-2165, CLOUD-2189: unable to save document via Sharepoint or WebDAV.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-11-21 18:04:16 +00:00
parent 200a140b33
commit 963b858b02
2 changed files with 111 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/lock/LockUtils.java
View File

@@ -64,7 +64,7 @@ public class LockUtils
case LOCK_EXPIRED: case LOCK_EXPIRED:
return false; return false;
case LOCK_OWNER: case LOCK_OWNER:
return !lockService.getLockType(nodeRef).equals(LockType.WRITE_LOCK); return lockService.getLockType(nodeRef) != LockType.WRITE_LOCK;
default: default:
return true; return true;
} }

110
source/test-java/org/alfresco/repo/lock/LockUtilsTest.java Normal file
View File

@@ -0,0 +1,110 @@
/*
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* 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/>.
*/
package org.alfresco.repo.lock;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.LockStatus;
import org.alfresco.service.cmr.lock.LockType;
import org.alfresco.service.cmr.repository.NodeRef;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
/**
* Tests for the {@link LockUtils} class.
*
* @author Matt Ward
*/
@RunWith(MockitoJUnitRunner.class)
public class LockUtilsTest
{
private @Mock LockService lockService;
private final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/node-id");
@Test
public void testIsLockedAndReadOnly_ForLockOwnerWithNullLockType()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(null);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
}
@Test
public void testIsLockedAndReadOnly_ForLockOwnerWithWriteLockType()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(LockType.WRITE_LOCK);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(false, returnedVal);
}
@Test
public void testIsLockedAndReadOnly_ForLockOwnerWithNodeLockType()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(LockType.NODE_LOCK);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
}
@Test
public void testIsLockedAndReadOnly_ForLockOwnerWithReadOnlyLockType()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_OWNER);
when(lockService.getLockType(nodeRef)).thenReturn(LockType.READ_ONLY_LOCK);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
}
@Test
public void testIsLockedAndReadOnly_ForNoLock()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.NO_LOCK);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(false, returnedVal);
}
@Test
public void testIsLockedAndReadOnly_ForExpiredLock()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCK_EXPIRED);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(false, returnedVal);
}
@Test
public void testIsLockedAndReadOnly_ForLock()
{
when(lockService.getLockStatus(nodeRef)).thenReturn(LockStatus.LOCKED);
boolean returnedVal = LockUtils.isLockedAndReadOnly(nodeRef, lockService);
assertEquals(true, returnedVal);
}
}