mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-4163: added integration test for scenario provided by Roy and got the
fix from master
This commit is contained in:
@@ -230,7 +230,7 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
|
|||||||
// Do a blanket removal in case this is a contextual nodes
|
// Do a blanket removal in case this is a contextual nodes
|
||||||
attributeService.removeAttributes(CONTEXT_VALUE, nodeRef);
|
attributeService.removeAttributes(CONTEXT_VALUE, nodeRef);
|
||||||
}
|
}
|
||||||
else
|
else if(!beforeId.equals(afterId))
|
||||||
{
|
{
|
||||||
// This is a full update
|
// This is a full update
|
||||||
attributeService.updateOrCreateAttribute(
|
attributeService.updateOrCreateAttribute(
|
||||||
|
@@ -46,6 +46,7 @@ import org.alfresco.query.PagingResults;
|
|||||||
import org.alfresco.repo.security.authority.RMAuthority;
|
import org.alfresco.repo.security.authority.RMAuthority;
|
||||||
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
||||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||||
|
import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
import org.alfresco.service.cmr.security.AccessPermission;
|
import org.alfresco.service.cmr.security.AccessPermission;
|
||||||
import org.alfresco.service.cmr.security.AuthorityService;
|
import org.alfresco.service.cmr.security.AuthorityService;
|
||||||
@@ -508,7 +509,10 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
|
|||||||
String groupShortName = getIPRGroupShortName(groupNamePrefix, children, index);
|
String groupShortName = getIPRGroupShortName(groupNamePrefix, children, index);
|
||||||
|
|
||||||
// create group
|
// create group
|
||||||
String group = authorityService.createAuthority(AuthorityType.GROUP, groupShortName, groupShortName, Collections.singleton(RMAuthority.ZONE_APP_RM));
|
String group;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
group = authorityService.createAuthority(AuthorityType.GROUP, groupShortName, groupShortName, Collections.singleton(RMAuthority.ZONE_APP_RM));
|
||||||
|
|
||||||
// add root parent
|
// add root parent
|
||||||
authorityService.addAuthority(getRootIRPGroup(), group);
|
authorityService.addAuthority(getRootIRPGroup(), group);
|
||||||
@@ -525,6 +529,12 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch(DuplicateChildNodeNameException ex)
|
||||||
|
{
|
||||||
|
// the group was concurrently created
|
||||||
|
group = authorityService.getName(AuthorityType.GROUP, groupShortName);
|
||||||
|
}
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,207 @@
|
|||||||
|
/*
|
||||||
|
* #%L
|
||||||
|
* Alfresco Records Management Module
|
||||||
|
* %%
|
||||||
|
* Copyright (C) 2005 - 2017 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.module.org_alfresco_module_rm.test.integration.issue;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.alfresco.model.ContentModel;
|
||||||
|
import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
|
||||||
|
import org.alfresco.module.org_alfresco_module_rm.action.impl.FileToAction;
|
||||||
|
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||||
|
import org.alfresco.service.cmr.action.Action;
|
||||||
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||||
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
|
import org.alfresco.service.cmr.rule.Rule;
|
||||||
|
import org.alfresco.service.cmr.rule.RuleService;
|
||||||
|
import org.alfresco.service.cmr.rule.RuleType;
|
||||||
|
import org.alfresco.service.namespace.NamespaceService;
|
||||||
|
import org.alfresco.service.namespace.QName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* System test for RM-4163
|
||||||
|
*
|
||||||
|
* @author Silviu Dinuta
|
||||||
|
* @since 2.4.1
|
||||||
|
*/
|
||||||
|
public class RM4163Test extends BaseRMTestCase
|
||||||
|
{
|
||||||
|
private RuleService ruleService;
|
||||||
|
private NodeRef ruleFolder;
|
||||||
|
private NodeRef nodeRefCategory1;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void initServices()
|
||||||
|
{
|
||||||
|
super.initServices();
|
||||||
|
|
||||||
|
ruleService = (RuleService) applicationContext.getBean("RuleService");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isCollaborationSiteTest()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isRecordTest()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDeclareRecordsConcurently() throws Exception
|
||||||
|
{
|
||||||
|
doTestInTransaction(new Test<Void>()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public Void run()
|
||||||
|
{
|
||||||
|
// create the folder
|
||||||
|
ruleFolder = fileFolderService.create(documentLibrary, "mytestfolder", ContentModel.TYPE_FOLDER)
|
||||||
|
.getNodeRef();
|
||||||
|
|
||||||
|
// create record category
|
||||||
|
nodeRefCategory1 = filePlanService.createRecordCategory(filePlan, "category1");
|
||||||
|
|
||||||
|
//define declare as record rule and apply it to the created folder from documentLibrary
|
||||||
|
Action action = actionService.createAction(CreateRecordAction.NAME);
|
||||||
|
action.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan);
|
||||||
|
|
||||||
|
Rule rule = new Rule();
|
||||||
|
rule.setRuleType(RuleType.INBOUND);
|
||||||
|
rule.setTitle("declareAsRecordRule");
|
||||||
|
rule.setAction(action);
|
||||||
|
rule.setExecuteAsynchronously(true);
|
||||||
|
ruleService.saveRule(ruleFolder, rule);
|
||||||
|
|
||||||
|
//define filing rule and apply it to unfiled record container
|
||||||
|
Action fileAction = actionService.createAction(FileToAction.NAME);
|
||||||
|
fileAction.setParameterValue(FileToAction.PARAM_PATH,
|
||||||
|
"/category1/{node.cm:description}");
|
||||||
|
fileAction.setParameterValue(FileToAction.PARAM_CREATE_RECORD_PATH, true);
|
||||||
|
|
||||||
|
Rule fileRule = new Rule();
|
||||||
|
fileRule.setRuleType(RuleType.INBOUND);
|
||||||
|
fileRule.setTitle("filingRule");
|
||||||
|
fileRule.setAction(fileAction);
|
||||||
|
fileRule.setExecuteAsynchronously(true);
|
||||||
|
ruleService.saveRule(filePlanService.getUnfiledContainer(filePlan), fileRule);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void test(Void result) throws Exception
|
||||||
|
{
|
||||||
|
assertFalse(ruleService.getRules(ruleFolder).isEmpty());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
//create 4 documents in documentLibrary
|
||||||
|
List<NodeRef> documents = new ArrayList<NodeRef>(4);
|
||||||
|
documents.addAll(doTestInTransaction(new Test<List<NodeRef>>()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public List<NodeRef> run() throws Exception
|
||||||
|
{
|
||||||
|
List<NodeRef> documents = new ArrayList<NodeRef>(4);
|
||||||
|
NodeRef document = createFile(documentLibrary, "document1.txt", "desc1", ContentModel.TYPE_CONTENT);
|
||||||
|
documents.add(document);
|
||||||
|
document = createFile(documentLibrary, "document2.txt", "desc2", ContentModel.TYPE_CONTENT);
|
||||||
|
documents.add(document);
|
||||||
|
document = createFile(documentLibrary, "document3.txt", "desc1", ContentModel.TYPE_CONTENT);
|
||||||
|
documents.add(document);
|
||||||
|
document = createFile(documentLibrary, "document4.txt", "desc1", ContentModel.TYPE_CONTENT);
|
||||||
|
documents.add(document);
|
||||||
|
return documents;
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
//move created documents in the folder that has Declare as Record rule
|
||||||
|
final Iterator<NodeRef> temp = documents.iterator();
|
||||||
|
doTestInTransaction(new Test<Void>()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public Void run() throws Exception
|
||||||
|
{
|
||||||
|
while (temp.hasNext())
|
||||||
|
{
|
||||||
|
NodeRef document = temp.next();
|
||||||
|
fileFolderService.move(document, ruleFolder, null);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
//give enough time for filing all records
|
||||||
|
Thread.sleep(5000);
|
||||||
|
|
||||||
|
//check that target category has in created record folders 4 records
|
||||||
|
Integer numberOfRecords = AuthenticationUtil.runAsSystem(new RunAsWork<Integer>()
|
||||||
|
{
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Integer doWork() throws Exception
|
||||||
|
{
|
||||||
|
List<NodeRef> containedRecordFolders = filePlanService.getContainedRecordFolders(nodeRefCategory1);
|
||||||
|
int numberOfRecords = 0;
|
||||||
|
for(NodeRef recordFolder : containedRecordFolders)
|
||||||
|
{
|
||||||
|
numberOfRecords = numberOfRecords + fileFolderService.list(recordFolder).size();
|
||||||
|
}
|
||||||
|
return numberOfRecords;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
assertEquals(4, numberOfRecords.intValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
private NodeRef createFile(NodeRef parentNodeRef, String name, String descrption, QName typeQName)
|
||||||
|
{
|
||||||
|
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(11);
|
||||||
|
properties.put(ContentModel.PROP_NAME, (Serializable) name);
|
||||||
|
properties.put(ContentModel.PROP_DESCRIPTION, (Serializable) descrption);
|
||||||
|
QName assocQName = QName.createQName(
|
||||||
|
NamespaceService.CONTENT_MODEL_1_0_URI,
|
||||||
|
QName.createValidLocalName(name));
|
||||||
|
ChildAssociationRef assocRef = nodeService.createNode(
|
||||||
|
parentNodeRef,
|
||||||
|
ContentModel.ASSOC_CONTAINS,
|
||||||
|
assocQName,
|
||||||
|
typeQName,
|
||||||
|
properties);
|
||||||
|
NodeRef nodeRef = assocRef.getChildRef();
|
||||||
|
return nodeRef;
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user