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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
65738: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65639: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65624 : MNT-10477 : Lock on document being edited online persists when updating name of document
            - LockableAspectInterceptor checks for EPHEMERAL locks if they exists. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 22:13:54 +00:00
parent 5d4d86cf1d
commit 3caceb54e3
3 changed files with 162 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java
View File

@@ -367,6 +367,124 @@ public class LockServiceImplTest extends BaseSpringTest
assertFalse(rs.getNodeRefs().contains(noAspectNode));
}
/* MNT-10477 related test */
@Test
public void testEphemeralLockModifyNode()
{
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
// Check that the node is not currently locked
assertEquals(LockStatus.NO_LOCK, lockService.getLockStatus(noAspectNode));
// Check that there really is no lockable aspect
assertEquals(false, nodeService.hasAspect(noAspectNode, ContentModel.ASPECT_LOCKABLE));
// Lock the node
lockService.lock(noAspectNode, LockType.WRITE_LOCK, 86400, Lifetime.EPHEMERAL, "some extra data");
// get bad user
TestWithUserUtils.authenticateUser(BAD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
assertEquals(LockStatus.LOCKED, lockService.getLockStatus(noAspectNode));
NodeService fullNodeService = (NodeService) applicationContext.getBean("nodeService");
/* addProperties test */
try
{
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(ContentModel.PROP_DESCRIPTION, "descr" + System.currentTimeMillis());
props.put(ContentModel.PROP_TITLE, "title" + System.currentTimeMillis());
fullNodeService.addProperties(noAspectNode, props);
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
/* setProperty test */
try
{
fullNodeService.setProperty(noAspectNode, ContentModel.PROP_DESCRIPTION, "descr" + System.currentTimeMillis());
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
/* setProperties test */
try
{
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(ContentModel.PROP_DESCRIPTION, "descr" + System.currentTimeMillis());
props.put(ContentModel.PROP_TITLE, "title" + System.currentTimeMillis());
fullNodeService.setProperties(noAspectNode, props);
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
/* removeProperty test */
try
{
fullNodeService.removeProperty(noAspectNode, ContentModel.PROP_DESCRIPTION);
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
/* addAspect test */
try
{
fullNodeService.addAspect(noAspectNode, ContentModel.ASPECT_AUTHOR , null);
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
/* removeAspect test */
try
{
fullNodeService.removeAspect(noAspectNode, ContentModel.ASPECT_AUTHOR);
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
/* setType test */
try
{
fullNodeService.setType(noAspectNode, ContentModel.TYPE_CMOBJECT);
fail();
}
catch(NodeLockedException e)
{
// it's ok - node supposed to be locked
}
TestWithUserUtils.authenticateUser(GOOD_USER_NAME, PWD, rootNodeRef, this.authenticationService);
lockService.unlock(noAspectNode);
assertEquals(LockStatus.NO_LOCK, lockService.getLockStatus(noAspectNode));
}
public void testLockRevertedOnRollback() throws NotSupportedException, SystemException
{
// Preconditions of test