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

RM-1099 (Refactor Transfer and Accession reports)

Browse Source 
* Fixed failing tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@58684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-12-07 21:42:07 +00:00
parent 18e5d098a5
commit 7e75cf975f
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.apache.commons.lang.StringUtils;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
/** /**
@@ -43,13 +44,13 @@ import org.springframework.context.ApplicationContext;
*/ */
public class CommonRMTestUtils implements RecordsManagementModel public class CommonRMTestUtils implements RecordsManagementModel
{ {
private DispositionService dispositionService; private DispositionService dispositionService;
private NodeService nodeService; private NodeService nodeService;
private ContentService contentService; private ContentService contentService;
private RecordsManagementActionService actionService; private RecordsManagementActionService actionService;
private ModelSecurityService modelSecurityService; private ModelSecurityService modelSecurityService;
private FilePlanRoleService filePlanRoleService; private FilePlanRoleService filePlanRoleService;
private CapabilityService capabilityService; private CapabilityService capabilityService;
/** test values */ /** test values */
public static final String DEFAULT_DISPOSITION_AUTHORITY = "disposition authority"; public static final String DEFAULT_DISPOSITION_AUTHORITY = "disposition authority";
@@ -59,16 +60,16 @@ public class CommonRMTestUtils implements RecordsManagementModel
public static final String PERIOD_NONE = "none|0"; public static final String PERIOD_NONE = "none|0";
public static final String PERIOD_IMMEDIATELY = "immediately|0"; public static final String PERIOD_IMMEDIATELY = "immediately|0";
public CommonRMTestUtils(ApplicationContext applicationContext) public CommonRMTestUtils(ApplicationContext applicationContext)
{ {
dispositionService = (DispositionService)applicationContext.getBean("DispositionService"); dispositionService = (DispositionService)applicationContext.getBean("DispositionService");
nodeService = (NodeService)applicationContext.getBean("NodeService"); nodeService = (NodeService)applicationContext.getBean("NodeService");
contentService = (ContentService)applicationContext.getBean("ContentService"); contentService = (ContentService)applicationContext.getBean("ContentService");
actionService = (RecordsManagementActionService)applicationContext.getBean("RecordsManagementActionService"); actionService = (RecordsManagementActionService)applicationContext.getBean("RecordsManagementActionService");
modelSecurityService = (ModelSecurityService)applicationContext.getBean("ModelSecurityService"); modelSecurityService = (ModelSecurityService)applicationContext.getBean("ModelSecurityService");
filePlanRoleService = (FilePlanRoleService)applicationContext.getBean("FilePlanRoleService"); filePlanRoleService = (FilePlanRoleService)applicationContext.getBean("FilePlanRoleService");
capabilityService = (CapabilityService)applicationContext.getBean("CapabilityService"); capabilityService = (CapabilityService)applicationContext.getBean("CapabilityService");
} }
/** /**
* *
@@ -137,10 +138,11 @@ public class CommonRMTestUtils implements RecordsManagementModel
if (extendedDispositionSchedule == true) if (extendedDispositionSchedule == true)
{ {
adParams = new HashMap<QName, Serializable>(3); adParams = new HashMap<QName, Serializable>(4);
adParams.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); adParams.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME);
adParams.put(PROP_DISPOSITION_DESCRIPTION, DEFAULT_DISPOSITION_DESCRIPTION); adParams.put(PROP_DISPOSITION_DESCRIPTION, DEFAULT_DISPOSITION_DESCRIPTION);
adParams.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); adParams.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY);
adParams.put(PROP_DISPOSITION_LOCATION, StringUtils.EMPTY);
dispositionService.addDispositionActionDefinition(dispositionSchedule, adParams); dispositionService.addDispositionActionDefinition(dispositionSchedule, adParams);
} }
@@ -169,12 +171,12 @@ public class CommonRMTestUtils implements RecordsManagementModel
} }
public NodeRef createRecord(NodeRef recordFolder, String name, Map<QName, Serializable> properties, String content) public NodeRef createRecord(NodeRef recordFolder, String name, Map<QName, Serializable> properties, String content)
{ {
// Create the document // Create the document
if (properties == null) if (properties == null)
{ {
properties = new HashMap<QName, Serializable>(1); properties = new HashMap<QName, Serializable>(1);
} }
if (properties.containsKey(ContentModel.PROP_NAME) == false) if (properties.containsKey(ContentModel.PROP_NAME) == false)
{ {
properties.put(ContentModel.PROP_NAME, name); properties.put(ContentModel.PROP_NAME, name);
@@ -192,7 +194,7 @@ public class CommonRMTestUtils implements RecordsManagementModel
writer.putContent(content); writer.putContent(content);
return recordOne; return recordOne;
} }
public void declareRecord(final NodeRef record) public void declareRecord(final NodeRef record)
{ {