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

90779: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90654: Merged DEV to V4.2-BUG-FIX (4.2.4)
         88809: MNT-12502: Updating parent node (folder) fails using CMIS, if any of contained children is locked
            Check if HiddenAspect and IndexControlAspect exist on folder items before actually remove aspects.
            Apply cascade of the (un-)hide to children even if a child is locked. Add unit test for case.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:01:39 +00:00
parent 46244028c5
commit 549257843e
3 changed files with 100 additions and 6 deletions

View File

@@ -2,6 +2,7 @@ package org.alfresco.repo.model.filefolder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -30,13 +31,14 @@ import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
import org.alfresco.service.cmr.lock.NodeLockedException;
import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
import org.alfresco.service.cmr.repository.MLText;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -76,6 +78,7 @@ public class HiddenAspectTest
private FileFolderService fileFolderService;
private MutableAuthenticationService authenticationService;
private PermissionService permissionService;
private CheckOutCheckInService cociService;
private UserTransaction txn;
private SearchService searchService;
@@ -106,6 +109,7 @@ public class HiddenAspectTest
hiddenAspect = (HiddenAspect) ctx.getBean("hiddenAspect");
interceptor = (FilenameFilteringInterceptor) ctx.getBean("filenameFilteringInterceptor");
namespacePrefixResolver = (DictionaryNamespaceComponent) ctx.getBean("namespaceService");
cociService = (CheckOutCheckInService) ctx.getBean("checkOutCheckInService");
imapService = serviceRegistry.getImapService();
personService = serviceRegistry.getPersonService();
searchService = serviceRegistry.getSearchService();
@@ -574,6 +578,58 @@ public class HiddenAspectTest
}
}
@Test
public void testFolderRename()
{
FileFilterMode.setClient(Client.cmis);
NodeRef workingCopyNodeRef = null;
try
{
String guid = GUID.generate();
String nodeName = "MyFolder" + guid;
String newName = "AnotherFolder" + guid;
NodeRef node = fileFolderService.create(topNodeRef, nodeName, ContentModel.TYPE_FOLDER).getNodeRef();
NodeRef checkedOutNode = fileFolderService.create(node, guid + ".lockedchild", ContentModel.TYPE_CONTENT).getNodeRef();
ResultSet results = searchForName(nodeName);
assertEquals("", 1, results.length());
workingCopyNodeRef = cociService.checkout(checkedOutNode);
assertNotNull(workingCopyNodeRef);
assertTrue(nodeService.hasAspect(checkedOutNode, ContentModel.ASPECT_CHECKED_OUT));
assertTrue(nodeService.hasAspect(checkedOutNode, ContentModel.ASPECT_LOCKABLE));
try
{
fileFolderService.rename(node, newName);
}
catch (NodeLockedException e)
{
fail("It should be possible to rename folder with locked items");
}
catch (FileExistsException e)
{
fail();
}
catch (FileNotFoundException e)
{
fail();
}
results = searchForName(nodeName);
assertEquals("File with old name should not be found", 0, results.length());
results = searchForName(newName);
assertEquals("File with new name should be found", 1, results.length());
}
finally
{
cociService.cancelCheckout(workingCopyNodeRef);
FileFilterMode.clearClient();
}
}
@Test
public void testHiddenFilesBasicClient()
{