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

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
128192 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128165 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         128151 rneamtu: MNT-15855 : Restoring a site or a folder with a locked for offline edit file does not work
            - restored associations between working copy and original node after a parent node is deleted
            - added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-21 11:06:09 +00:00
parent 8faec771c6
commit ecadec2d73
5 changed files with 296 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
source/test-java/org/alfresco/repo/site/SiteServiceImplMoreTest.java
View File

@@ -1,14 +1,14 @@
/*
* #%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:
*
* #%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
@@ -393,8 +393,8 @@ public class SiteServiceImplMoreTest
* This test also checks that after restore the locks are restored correctly for all the locked
* files;
*
* TODO in MNT-15855:
* It should also checks the case when there is a working copy (simulate lock for offline edit)
* MNT-15855:
* Checks the case when there is a working copy (simulate lock for offline edit)
*
* @throws Exception
*/
@@ -443,6 +443,7 @@ public class SiteServiceImplMoreTest
* |-- [folder] fileFolderPrefix + "subfolder"
* |
* |-- [cm:content] fileFolderPrefix + "fileInSubfolder.txt"
* --- [cm:content] fileFolderPrefix + "fileEditOfline.txt"
*/
String fileFolderPrefix = "TESTLOCK_";
String componentId = "doclib";
@@ -479,10 +480,10 @@ public class SiteServiceImplMoreTest
ContentWriter writer3 = FILE_FOLDER_SERVICE.getWriter(fileInfo3.getNodeRef());
writer3.putContent("Just some old content that doesn't mean anything");
// make sure there are no locks on the fileInfo yet
// Make sure there are no locks on the fileInfo yet
assertEquals(LockStatus.NO_LOCK, LOCK_SERVICE.getLockStatus(fileInfo.getNodeRef()));
// lock a file as userOwner
// Lock a file as userOwner
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
@@ -492,15 +493,15 @@ public class SiteServiceImplMoreTest
}
});
// make sure we have a lock now
// Make sure we have a lock now
assertEquals(LockStatus.LOCK_OWNER, LOCK_SERVICE.getLockStatus(fileInfo.getNodeRef()));
checkThatNonMembersCanNotCreateFiles(userCollaborator, fileFolderPrefix, folder2Info);
// make sure we are running as userOwner
// Make sure we are running as userOwner
AUTHENTICATION_COMPONENT.setCurrentUser(userOwner);
// make userCollaborator a member of the site
// Make userCollaborator a member of the site
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
@@ -510,7 +511,7 @@ public class SiteServiceImplMoreTest
}
});
// now, as userCollaborator create a file and lock it
// Now, as userCollaborator create a file and lock it
AUTHENTICATION_COMPONENT.setCurrentUser(userCollaborator);
final FileInfo fileInfoForCollaboratorUser = FILE_FOLDER_SERVICE.create(
@@ -536,7 +537,32 @@ public class SiteServiceImplMoreTest
// Test valid lock
assertEquals(LockStatus.LOCK_OWNER, LOCK_SERVICE.getLockStatus(fileInfoForCollaboratorUser.getNodeRef()));
// switch back to userOwner so we can call delete the site
// Create a file to test Edit offline
final FileInfo fileEditOffline = FILE_FOLDER_SERVICE.create(
siteContainer,
fileFolderPrefix + "fileEditOfline.txt",
ContentModel.TYPE_CONTENT);
ContentWriter writerEO = FILE_FOLDER_SERVICE.getWriter(fileEditOffline.getNodeRef());
writerEO.putContent("Just some old content that doesn't mean anything");
//Make sure there are no locks on the fileEditOffline yet
assertEquals(LockStatus.NO_LOCK, LOCK_SERVICE.getLockStatus(fileEditOffline.getNodeRef()));
// Check out the document - simulate Edit offline
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
NodeRef workingCopy = COCI_SERVICE.checkout(fileEditOffline.getNodeRef());
assertNotNull(workingCopy);
return null;
}
});
// Make sure we have a lock now on fileEditOffline
assertEquals(LockStatus.LOCK_OWNER, LOCK_SERVICE.getLockStatus(fileEditOffline.getNodeRef()));
// Switch back to userOwner so we can call delete the site
AUTHENTICATION_COMPONENT.setCurrentUser(userOwner);
// Delete the site
@@ -553,7 +579,7 @@ public class SiteServiceImplMoreTest
}
});
// restore the site
// Restore the site
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
@@ -573,14 +599,18 @@ public class SiteServiceImplMoreTest
}
});
// check that the files have been restored and all the locks are present
// Check that the files have been restored and all the locks are present
AUTHENTICATION_COMPONENT.setCurrentUser(userCollaborator);
assertEquals(LockStatus.LOCK_OWNER, LOCK_SERVICE.getLockStatus(fileInfoForCollaboratorUser.getNodeRef()));
// Check that the file for edit offline has been restored and has the expected lock owner
assertEquals(LockStatus.LOCK_OWNER, LOCK_SERVICE.getLockStatus(fileEditOffline.getNodeRef()));
AUTHENTICATION_COMPONENT.setCurrentUser(userOwner);
assertEquals(LockStatus.LOCK_OWNER, LOCK_SERVICE.getLockStatus(fileInfo.getNodeRef()));
// Check that the file for edit offline has been restored and is locked
assertEquals(LockStatus.LOCKED, LOCK_SERVICE.getLockStatus(fileEditOffline.getNodeRef()));
// remove site completely
// Remove site completely
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable