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

Removed applicationContext from the java classes where possible and used dependency injection instead.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@58099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-11-21 18:09:49 +00:00
parent 65e6b0038c
commit 335a5b87a4
20 changed files with 522 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
View File

@@ -34,16 +34,11 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionalResourceHelper; import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/** /**
* Records managment entry voter. * Records managment entry voter.
@@ -51,7 +46,7 @@ import org.springframework.context.ApplicationContextAware;
* @author Roy Wetherall, Andy Hind * @author Roy Wetherall, Andy Hind
*/ */
public class RMEntryVoter extends RMSecurityCommon public class RMEntryVoter extends RMSecurityCommon
implements AccessDecisionVoter, InitializingBean, ApplicationContextAware, PolicyRegister implements AccessDecisionVoter, InitializingBean, PolicyRegister
{ {
/** Logger */ /** Logger */
private static Log logger = LogFactory.getLog(RMEntryVoter.class); private static Log logger = LogFactory.getLog(RMEntryVoter.class);
@@ -59,30 +54,12 @@ public class RMEntryVoter extends RMSecurityCommon
/** Namespace resolver */ /** Namespace resolver */
private NamespacePrefixResolver nspr; private NamespacePrefixResolver nspr;
/** Search service */
private SearchService searchService;
/** Ownable service */
private OwnableService ownableService;
/** Capability Service */ /** Capability Service */
private CapabilityService capabilityService; private CapabilityService capabilityService;
/** Policy map */ /** Policy map */
private HashMap<String, Policy> policies = new HashMap<String, Policy>(); private HashMap<String, Policy> policies = new HashMap<String, Policy>();
/** Application context */
private ApplicationContext applicationContext;
/**
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.applicationContext = applicationContext;
}
/** /**
* @param capabilityService capability service * @param capabilityService capability service
*/ */
@@ -91,30 +68,6 @@ public class RMEntryVoter extends RMSecurityCommon
this.capabilityService = capabilityService; this.capabilityService = capabilityService;
} }
/**
* @return search service
*/
public SearchService getSearchService()
{
if (searchService == null)
{
searchService = (SearchService)applicationContext.getBean("SearchService");
}
return searchService;
}
/**
* @return ownable service
*/
public OwnableService getOwnableService()
{
if (ownableService == null)
{
ownableService = (OwnableService)applicationContext.getBean("ownableService");
}
return ownableService;
}
/** /**
* @param nspr namespace prefix resolver * @param nspr namespace prefix resolver
*/ */

27
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
View File

@@ -22,9 +22,7 @@ import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
/** /**
* Record service implementation unit test. * Record service implementation unit test.
@@ -33,19 +31,6 @@ import org.alfresco.service.cmr.security.PermissionService;
*/ */
public class CreateRecordActionTest extends BaseRMTestCase public class CreateRecordActionTest extends BaseRMTestCase
{ {
/** Services */
protected ActionService dmActionService;
protected PermissionService dmPermissionService;
@Override
protected void initServices()
{
super.initServices();
dmActionService = (ActionService)applicationContext.getBean("ActionService");
dmPermissionService = (PermissionService)applicationContext.getBean("PermissionService");
}
@Override @Override
protected boolean isUserTest() protected boolean isUserTest()
{ {
@@ -64,13 +49,13 @@ public class CreateRecordActionTest extends BaseRMTestCase
{ {
public Void run() public Void run()
{ {
assertEquals(AccessStatus.DENIED, dmPermissionService.hasPermission(dmDocument, RMPermissionModel.READ_RECORDS)); assertEquals(AccessStatus.DENIED, permissionService.hasPermission(dmDocument, RMPermissionModel.READ_RECORDS));
assertEquals(AccessStatus.DENIED, dmPermissionService.hasPermission(filePlan, RMPermissionModel.VIEW_RECORDS)); assertEquals(AccessStatus.DENIED, permissionService.hasPermission(filePlan, RMPermissionModel.VIEW_RECORDS));
Action action = dmActionService.createAction(CreateRecordAction.NAME); Action action = actionService.createAction(CreateRecordAction.NAME);
action.setParameterValue(CreateRecordAction.PARAM_HIDE_RECORD, false); action.setParameterValue(CreateRecordAction.PARAM_HIDE_RECORD, false);
action.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan); action.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan);
dmActionService.executeAction(action, dmDocument); actionService.executeAction(action, dmDocument);
return null; return null;
} }
@@ -79,8 +64,8 @@ public class CreateRecordActionTest extends BaseRMTestCase
{ {
assertTrue(recordService.isRecord(dmDocument)); assertTrue(recordService.isRecord(dmDocument));
assertEquals(AccessStatus.ALLOWED, dmPermissionService.hasPermission(dmDocument, RMPermissionModel.READ_RECORDS)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(dmDocument, RMPermissionModel.READ_RECORDS));
assertEquals(AccessStatus.ALLOWED, dmPermissionService.hasPermission(filePlan, RMPermissionModel.VIEW_RECORDS)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(filePlan, RMPermissionModel.VIEW_RECORDS));
}; };
}, },
dmCollaborator); dmCollaborator);

22
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java
View File

@@ -29,7 +29,6 @@ import org.alfresco.module.org_alfresco_module_rm.action.impl.FileToAction;
import org.alfresco.module.org_alfresco_module_rm.capability.Capability; import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
@@ -50,15 +49,6 @@ public class FileToActionTest extends BaseRMTestCase
private static final String PATH_SUB1 = "rmcontainer/${node.cm:title}"; private static final String PATH_SUB1 = "rmcontainer/${node.cm:title}";
protected ActionService dmActionService;
@Override
protected void initServices()
{
super.initServices();
dmActionService = (ActionService) applicationContext.getBean("ActionService");
}
@Override @Override
protected boolean isCollaborationSiteTest() protected boolean isCollaborationSiteTest()
{ {
@@ -92,7 +82,7 @@ public class FileToActionTest extends BaseRMTestCase
params.put(FileToAction.PARAM_DESTINATION_RECORD_FOLDER, rmFolder); params.put(FileToAction.PARAM_DESTINATION_RECORD_FOLDER, rmFolder);
// execute file-to action // execute file-to action
actionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params);
// check things have gone according to plan // check things have gone according to plan
assertTrue(recordService.isRecord(dmDocument)); assertTrue(recordService.isRecord(dmDocument));
@@ -144,7 +134,7 @@ public class FileToActionTest extends BaseRMTestCase
params.put(FileToAction.PARAM_PATH, PATH); params.put(FileToAction.PARAM_PATH, PATH);
// execute file-to action // execute file-to action
actionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params);
// check things have gone according to plan // check things have gone according to plan
assertTrue(recordService.isRecord(dmDocument)); assertTrue(recordService.isRecord(dmDocument));
@@ -172,7 +162,7 @@ public class FileToActionTest extends BaseRMTestCase
params.put(FileToAction.PARAM_PATH, PATH2); params.put(FileToAction.PARAM_PATH, PATH2);
// execute file-to action // execute file-to action
actionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params);
// check things have gone according to plan // check things have gone according to plan
assertTrue(recordService.isRecord(dmDocument)); assertTrue(recordService.isRecord(dmDocument));
@@ -222,7 +212,7 @@ public class FileToActionTest extends BaseRMTestCase
params.put(FileToAction.PARAM_CREATE_RECORD_FOLDER, true); params.put(FileToAction.PARAM_CREATE_RECORD_FOLDER, true);
// execute file-to action // execute file-to action
actionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params);
// show the folder has now been created // show the folder has now been created
createdRecordFolder = fileFolderService.resolveNamePath(filePlan, new ArrayList<String>(Arrays.asList(pathValues)), false); createdRecordFolder = fileFolderService.resolveNamePath(filePlan, new ArrayList<String>(Arrays.asList(pathValues)), false);
@@ -277,7 +267,7 @@ public class FileToActionTest extends BaseRMTestCase
params.put(FileToAction.PARAM_PATH, PATH_BAD); params.put(FileToAction.PARAM_PATH, PATH_BAD);
// execute file-to action // execute file-to action
actionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params);
} }
}); });
@@ -295,7 +285,7 @@ public class FileToActionTest extends BaseRMTestCase
params.put(FileToAction.PARAM_PATH, PATH_CREATE); params.put(FileToAction.PARAM_PATH, PATH_CREATE);
// execute file-to action // execute file-to action
actionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params);
} }
}); });

20
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java
View File

@@ -25,7 +25,6 @@ import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; 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;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
/** /**
@@ -36,17 +35,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/ */
public class HideRecordActionTest extends BaseRMTestCase public class HideRecordActionTest extends BaseRMTestCase
{ {
/** Services */
protected ActionService dmActionService;
@Override
protected void initServices()
{
super.initServices();
dmActionService = (ActionService) applicationContext.getBean("ActionService");
}
@Override @Override
protected boolean isUserTest() protected boolean isUserTest()
{ {
@@ -82,9 +70,9 @@ public class HideRecordActionTest extends BaseRMTestCase
NodeRef doc = fileFolderService.create(dmFolder, "testfile.txt", ContentModel.TYPE_CONTENT).getNodeRef(); NodeRef doc = fileFolderService.create(dmFolder, "testfile.txt", ContentModel.TYPE_CONTENT).getNodeRef();
// Create a record from that document // Create a record from that document
Action createAction = dmActionService.createAction(CreateRecordAction.NAME); Action createAction = actionService.createAction(CreateRecordAction.NAME);
createAction.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan); createAction.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan);
dmActionService.executeAction(createAction, doc); actionService.executeAction(createAction, doc);
// Check if the document is a record now // Check if the document is a record now
assertTrue(recordService.isRecord(doc)); assertTrue(recordService.isRecord(doc));
@@ -96,8 +84,8 @@ public class HideRecordActionTest extends BaseRMTestCase
assertTrue(nodeService.getParentAssocs(doc).size() == 2); assertTrue(nodeService.getParentAssocs(doc).size() == 2);
// Hide the document. The user has the write permissions so he should be able to hide it // Hide the document. The user has the write permissions so he should be able to hide it
Action hideAction = dmActionService.createAction(HideRecordAction.NAME); Action hideAction = actionService.createAction(HideRecordAction.NAME);
dmActionService.executeAction(hideAction, doc); actionService.executeAction(hideAction, doc);
// The document should be removed from the collaboration site // The document should be removed from the collaboration site
assertTrue(nodeService.getParentAssocs(doc).size() == 1); assertTrue(nodeService.getParentAssocs(doc).size() == 1);

27
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java
View File

@@ -20,10 +20,8 @@ package org.alfresco.module.org_alfresco_module_rm.test.action;
import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction; import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService;
/** /**
* Reject Action Unit Test * Reject Action Unit Test
@@ -33,22 +31,9 @@ import org.alfresco.service.cmr.action.ActionService;
*/ */
public class RejectActionTest extends BaseRMTestCase public class RejectActionTest extends BaseRMTestCase
{ {
/** Services */
protected ActionService rmActionService;
protected ExtendedSecurityService extendedSecurityService;
/** Reject reason */ /** Reject reason */
private final String REJECT_REASON = "rejectReason:Not valid!£$%^&*()_+"; private final String REJECT_REASON = "rejectReason:Not valid!£$%^&*()_+";
@Override
protected void initServices()
{
super.initServices();
rmActionService = (ActionService) applicationContext.getBean("ActionService");
extendedSecurityService = (ExtendedSecurityService) applicationContext.getBean("ExtendedSecurityService");
}
@Override @Override
protected boolean isUserTest() protected boolean isUserTest()
{ {
@@ -68,9 +53,9 @@ public class RejectActionTest extends BaseRMTestCase
public Void run() public Void run()
{ {
// Create a record from the document // Create a record from the document
Action createAction = rmActionService.createAction(CreateRecordAction.NAME); Action createAction = actionService.createAction(CreateRecordAction.NAME);
createAction.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan); createAction.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan);
rmActionService.executeAction(createAction, dmDocument); actionService.executeAction(createAction, dmDocument);
// Check if the document is a record now // Check if the document is a record now
assertTrue(recordService.isRecord(dmDocument)); assertTrue(recordService.isRecord(dmDocument));
@@ -91,8 +76,8 @@ public class RejectActionTest extends BaseRMTestCase
public void run() public void run()
{ {
// The test should fail if the reject reason is not supplied // The test should fail if the reject reason is not supplied
Action rejectAction = rmActionService.createAction(RejectAction.NAME); Action rejectAction = actionService.createAction(RejectAction.NAME);
rmActionService.executeAction(rejectAction, dmDocument); actionService.executeAction(rejectAction, dmDocument);
} }
}, },
dmCollaborator); dmCollaborator);
@@ -102,9 +87,9 @@ public class RejectActionTest extends BaseRMTestCase
public Void run() public Void run()
{ {
// Create the reject action and add the reject reason // Create the reject action and add the reject reason
Action rejectAction = rmActionService.createAction(RejectAction.NAME); Action rejectAction = actionService.createAction(RejectAction.NAME);
rejectAction.setParameterValue(RejectAction.PARAM_REASON, REJECT_REASON); rejectAction.setParameterValue(RejectAction.PARAM_REASON, REJECT_REASON);
rmActionService.executeAction(rejectAction, dmDocument); actionService.executeAction(rejectAction, dmDocument);
// The "record" aspect should be removed // The "record" aspect should be removed
assertFalse(nodeService.hasAspect(dmDocument, ASPECT_RECORD)); assertFalse(nodeService.hasAspect(dmDocument, ASPECT_RECORD));

10
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1008Test.java
View File

@@ -48,12 +48,6 @@ public class RM1008Test extends BaseRMTestCase
{ {
private String myUser; private String myUser;
@Override
protected void initServices()
{
super.initServices();
}
@Override @Override
protected boolean isRecordTest() protected boolean isRecordTest()
{ {
@@ -260,8 +254,8 @@ public class RM1008Test extends BaseRMTestCase
@Override @Override
public NodeRef run() public NodeRef run()
{ {
actionService.executeRecordsManagementAction(transferFolder, "cutoff"); rmActionService.executeRecordsManagementAction(transferFolder, "cutoff");
actionService.executeRecordsManagementAction(transferFolder, "transfer"); rmActionService.executeRecordsManagementAction(transferFolder, "transfer");
NodeRef transferContainer = filePlanService.getTransferContainer(filePlan); NodeRef transferContainer = filePlanService.getTransferContainer(filePlan);
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(transferContainer, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(transferContainer, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);

4
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java
View File

@@ -156,10 +156,10 @@ public class RM1039Test extends BaseRMTestCase
// complete event // complete event
Map<String, Serializable> params = new HashMap<String, Serializable>(1); Map<String, Serializable> params = new HashMap<String, Serializable>(1);
params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME);
actionService.executeRecordsManagementAction(testFolder, CompleteEventAction.NAME, params); rmActionService.executeRecordsManagementAction(testFolder, CompleteEventAction.NAME, params);
// cutoff folder // cutoff folder
actionService.executeRecordsManagementAction(testFolder, CutOffAction.NAME); rmActionService.executeRecordsManagementAction(testFolder, CutOffAction.NAME);
// take a look at the move capability // take a look at the move capability
Capability moveCapability = capabilityService.getCapability("Move"); Capability moveCapability = capabilityService.getCapability("Move");

28
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java
View File

@@ -24,8 +24,6 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.module.org_alfresco_module_rm.test.util.TestActionPropertySubs; import org.alfresco.module.org_alfresco_module_rm.test.util.TestActionPropertySubs;
import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionDefinition; import org.alfresco.service.cmr.action.ActionDefinition;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.security.PermissionService;
/** /**
* Extended action service test. * Extended action service test.
@@ -35,10 +33,6 @@ import org.alfresco.service.cmr.security.PermissionService;
*/ */
public class ExtendedActionServiceTest extends BaseRMTestCase public class ExtendedActionServiceTest extends BaseRMTestCase
{ {
/** Services */
protected ActionService dmActionService;
protected PermissionService dmPermissionService;
/** Action names */ /** Action names */
public static final String TEST_ACTION = "testAction"; public static final String TEST_ACTION = "testAction";
public static final String TEST_ACTION_2 = "testAction2"; public static final String TEST_ACTION_2 = "testAction2";
@@ -47,14 +41,6 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
public static final String RECORD_AND_FOLDER_ONLY_ACTION = "recordandFolderOnlyAction"; public static final String RECORD_AND_FOLDER_ONLY_ACTION = "recordandFolderOnlyAction";
public static final String DELEGATE_ACTION = "rmDelegateAction"; public static final String DELEGATE_ACTION = "rmDelegateAction";
@Override
protected void initServices()
{
super.initServices();
dmActionService = (ActionService) applicationContext.getBean("ActionService");
}
@Override @Override
protected boolean isUserTest() protected boolean isUserTest()
{ {
@@ -81,7 +67,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
{ {
public Void run() public Void run()
{ {
List<ActionDefinition> result = dmActionService.getActionDefinitions(recordOne); List<ActionDefinition> result = actionService.getActionDefinitions(recordOne);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
assertTrue(containsAction(result, TEST_ACTION_2)); assertTrue(containsAction(result, TEST_ACTION_2));
@@ -90,7 +76,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertTrue(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION)); assertTrue(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION));
assertTrue(containsAction(result, DELEGATE_ACTION)); assertTrue(containsAction(result, DELEGATE_ACTION));
result = dmActionService.getActionDefinitions(rmFolder); result = actionService.getActionDefinitions(rmFolder);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
assertTrue(containsAction(result, TEST_ACTION_2)); assertTrue(containsAction(result, TEST_ACTION_2));
@@ -99,7 +85,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertTrue(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION)); assertTrue(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION));
assertFalse(containsAction(result, DELEGATE_ACTION)); assertFalse(containsAction(result, DELEGATE_ACTION));
result = dmActionService.getActionDefinitions(rmContainer); result = actionService.getActionDefinitions(rmContainer);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
assertTrue(containsAction(result, TEST_ACTION_2)); assertTrue(containsAction(result, TEST_ACTION_2));
@@ -108,7 +94,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertFalse(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION)); assertFalse(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION));
assertFalse(containsAction(result, DELEGATE_ACTION)); assertFalse(containsAction(result, DELEGATE_ACTION));
result = dmActionService.getActionDefinitions(dmDocument); result = actionService.getActionDefinitions(dmDocument);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
assertFalse(containsAction(result, TEST_ACTION_2)); assertFalse(containsAction(result, TEST_ACTION_2));
@@ -117,7 +103,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertFalse(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION)); assertFalse(containsAction(result, RECORD_AND_FOLDER_ONLY_ACTION));
assertFalse(containsAction(result, DELEGATE_ACTION)); assertFalse(containsAction(result, DELEGATE_ACTION));
result = dmActionService.getActionDefinitions(dmFolder); result = actionService.getActionDefinitions(dmFolder);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
assertFalse(containsAction(result, TEST_ACTION_2)); assertFalse(containsAction(result, TEST_ACTION_2));
@@ -153,7 +139,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
{ {
public Void run() public Void run()
{ {
Action action = dmActionService.createAction(TestActionPropertySubs.NAME); Action action = actionService.createAction(TestActionPropertySubs.NAME);
action.setParameterValue("dayShort", "${date.day.short}"); action.setParameterValue("dayShort", "${date.day.short}");
action.setParameterValue("dayShort2", "${date.day}"); action.setParameterValue("dayShort2", "${date.day}");
@@ -177,7 +163,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
action.setParameterValue("combo", "${date.year.long}/${date.month.short}/${node.cm:name}-${message.test.company}.txt"); action.setParameterValue("combo", "${date.year.long}/${date.month.short}/${node.cm:name}-${message.test.company}.txt");
dmActionService.executeAction(action, rmFolder); actionService.executeAction(action, rmFolder);
return null; return null;
} }

11
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java
View File

@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; 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;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -36,8 +35,6 @@ import org.alfresco.util.GUID;
*/ */
public class ExtendedSecurityServiceImplTest extends BaseRMTestCase public class ExtendedSecurityServiceImplTest extends BaseRMTestCase
{ {
private ExtendedSecurityService extendedSecurityService;
private NodeRef record; private NodeRef record;
private NodeRef recordToo; private NodeRef recordToo;
private NodeRef moveRecordCategory; private NodeRef moveRecordCategory;
@@ -49,14 +46,6 @@ public class ExtendedSecurityServiceImplTest extends BaseRMTestCase
return true; return true;
} }
@Override
protected void initServices()
{
super.initServices();
extendedSecurityService = (ExtendedSecurityService)applicationContext.getBean("ExtendedSecurityService");
}
@Override @Override
protected void setupTestDataImpl() protected void setupTestDataImpl()
{ {

45
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java
View File

@@ -31,18 +31,15 @@ import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService; import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
import org.alfresco.module.org_alfresco_module_rm.role.Role; import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedReaderDynamicAuthority; import org.alfresco.module.org_alfresco_module_rm.security.ExtendedReaderDynamicAuthority;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedWriterDynamicAuthority; import org.alfresco.module.org_alfresco_module_rm.security.ExtendedWriterDynamicAuthority;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
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.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
@@ -55,26 +52,6 @@ import org.alfresco.util.GUID;
*/ */
public class RecordServiceImplTest extends BaseRMTestCase public class RecordServiceImplTest extends BaseRMTestCase
{ {
/** Services */
protected ActionService dmActionService;
protected PermissionService dmPermissionService;
protected ExtendedSecurityService extendedSecurityService;
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices()
*/
@Override
protected void initServices()
{
super.initServices();
dmActionService = (ActionService) applicationContext.getBean("ActionService");
dmPermissionService = (PermissionService) applicationContext.getBean("PermissionService");
extendedSecurityService = (ExtendedSecurityService) applicationContext.getBean("ExtendedSecurityService");
}
/** /**
* This is a user test * This is a user test
* *
@@ -308,7 +285,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
AccessStatus.DENIED, // record folder AccessStatus.DENIED, // record folder
AccessStatus.DENIED); // doc/record AccessStatus.DENIED); // doc/record
assertEquals(AccessStatus.DENIED, dmPermissionService.hasPermission(filePlan, assertEquals(AccessStatus.DENIED, permissionService.hasPermission(filePlan,
RMPermissionModel.VIEW_RECORDS)); RMPermissionModel.VIEW_RECORDS));
checkPermissions(FILING, AccessStatus.DENIED, // file plan checkPermissions(FILING, AccessStatus.DENIED, // file plan
@@ -328,7 +305,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
permissionReport(); permissionReport();
assertEquals(AccessStatus.ALLOWED, dmPermissionService.hasPermission(filePlan, assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(filePlan,
RMPermissionModel.VIEW_RECORDS)); RMPermissionModel.VIEW_RECORDS));
checkPermissions(FILING, AccessStatus.DENIED, // file plan checkPermissions(FILING, AccessStatus.DENIED, // file plan
@@ -426,9 +403,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
System.out.println(" ... " + assignedUser); System.out.println(" ... " + assignedUser);
} }
PermissionService ps = (PermissionService)applicationContext.getBean("permissionService"); Set<AccessPermission> perms = permissionService.getAllSetPermissions(filePlan);
Set<AccessPermission> perms = ps.getAllSetPermissions(filePlan);
for (AccessPermission perm : perms) for (AccessPermission perm : perms)
{ {
if (perm.getPermission().contains(RMPermissionModel.EDIT_NON_RECORD_METADATA)) if (perm.getPermission().contains(RMPermissionModel.EDIT_NON_RECORD_METADATA))
@@ -475,7 +450,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
AccessStatus.DENIED, // record folder AccessStatus.DENIED, // record folder
AccessStatus.DENIED); // doc/record AccessStatus.DENIED); // doc/record
assertEquals(AccessStatus.DENIED, dmPermissionService.hasPermission(filePlan, assertEquals(AccessStatus.DENIED, permissionService.hasPermission(filePlan,
RMPermissionModel.VIEW_RECORDS)); RMPermissionModel.VIEW_RECORDS));
checkPermissions(FILING, AccessStatus.DENIED, // file plan checkPermissions(FILING, AccessStatus.DENIED, // file plan
@@ -492,7 +467,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
AccessStatus.DENIED, // record folder AccessStatus.DENIED, // record folder
AccessStatus.DENIED); // doc/record AccessStatus.DENIED); // doc/record
assertEquals(AccessStatus.DENIED, dmPermissionService.hasPermission(filePlan, assertEquals(AccessStatus.DENIED, permissionService.hasPermission(filePlan,
RMPermissionModel.VIEW_RECORDS)); RMPermissionModel.VIEW_RECORDS));
checkPermissions(FILING, AccessStatus.DENIED, // file plan checkPermissions(FILING, AccessStatus.DENIED, // file plan
@@ -614,11 +589,11 @@ public class RecordServiceImplTest extends BaseRMTestCase
private void checkPermissions(String permission, AccessStatus filePlanExpected, AccessStatus unfiledExpected, private void checkPermissions(String permission, AccessStatus filePlanExpected, AccessStatus unfiledExpected,
AccessStatus recordCatExpected, AccessStatus recordFolderExpected, AccessStatus recordExpected) AccessStatus recordCatExpected, AccessStatus recordFolderExpected, AccessStatus recordExpected)
{ {
assertEquals(filePlanExpected, dmPermissionService.hasPermission(filePlan, permission)); assertEquals(filePlanExpected, permissionService.hasPermission(filePlan, permission));
assertEquals(unfiledExpected, dmPermissionService.hasPermission(unfiledContainer, permission)); assertEquals(unfiledExpected, permissionService.hasPermission(unfiledContainer, permission));
assertEquals(recordCatExpected, dmPermissionService.hasPermission(rmContainer, permission)); assertEquals(recordCatExpected, permissionService.hasPermission(rmContainer, permission));
assertEquals(recordFolderExpected, dmPermissionService.hasPermission(rmFolder, permission)); assertEquals(recordFolderExpected, permissionService.hasPermission(rmFolder, permission));
assertEquals(recordExpected, dmPermissionService.hasPermission(dmDocument, permission)); assertEquals(recordExpected, permissionService.hasPermission(dmDocument, permission));
} }
private String createUserWithCapabilties(final String... capabiltyNames) private String createUserWithCapabilties(final String... capabiltyNames)

96
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
View File

@@ -108,12 +108,12 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
for (QName createdCustomProperty : createdCustomProperties) for (QName createdCustomProperty : createdCustomProperties)
{ {
adminService.removeCustomPropertyDefinition(createdCustomProperty); rmAdminService.removeCustomPropertyDefinition(createdCustomProperty);
} }
for (QName customisable : madeCustomisable) for (QName customisable : madeCustomisable)
{ {
adminService.unmakeCustomisable(customisable); rmAdminService.unmakeCustomisable(customisable);
} }
return null; return null;
@@ -134,7 +134,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public Void run() throws Exception public Void run() throws Exception
{ {
Set<QName> list = adminService.getCustomisable(); Set<QName> list = rmAdminService.getCustomisable();
assertNotNull(list); assertNotNull(list);
assertTrue(list.containsAll( assertTrue(list.containsAll(
CollectionUtils.arrayToList(new QName[] CollectionUtils.arrayToList(new QName[]
@@ -160,10 +160,10 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public Void run() throws Exception public Void run() throws Exception
{ {
assertFalse(adminService.isCustomisable(TYPE_CONTENT)); assertFalse(rmAdminService.isCustomisable(TYPE_CONTENT));
assertFalse(adminService.isCustomisable(ASPECT_DUBLINCORE)); assertFalse(rmAdminService.isCustomisable(ASPECT_DUBLINCORE));
assertTrue(adminService.isCustomisable(TYPE_RECORD_FOLDER)); assertTrue(rmAdminService.isCustomisable(TYPE_RECORD_FOLDER));
assertTrue(adminService.isCustomisable(ASPECT_RECORD)); assertTrue(rmAdminService.isCustomisable(ASPECT_RECORD));
return null; return null;
} }
@@ -184,9 +184,9 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
public QName run() throws Exception public QName run() throws Exception
{ {
// Check the property does not exist // Check the property does not exist
assertFalse(adminService.existsCustomProperty(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"))); assertFalse(rmAdminService.existsCustomProperty(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1")));
return adminService.addCustomPropertyDefinition( return rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"),
ASPECT_RECORD, ASPECT_RECORD,
"Label1", "Label1",
@@ -203,10 +203,10 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Check the property QName is correct // Check the property QName is correct
assertNotNull(result); assertNotNull(result);
assertEquals(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"), result); assertEquals(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"), result);
assertTrue(adminService.existsCustomProperty(result)); assertTrue(rmAdminService.existsCustomProperty(result));
// Check that property is available as a custom property // Check that property is available as a custom property
Map<QName, PropertyDefinition> propDefs = adminService.getCustomPropertyDefinitions(ASPECT_RECORD); Map<QName, PropertyDefinition> propDefs = rmAdminService.getCustomPropertyDefinitions(ASPECT_RECORD);
assertNotNull(propDefs); assertNotNull(propDefs);
assertTrue(propDefs.containsKey(result)); assertTrue(propDefs.containsKey(result));
@@ -231,7 +231,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public QName run() throws Exception public QName run() throws Exception
{ {
return adminService.addCustomPropertyDefinition( return rmAdminService.addCustomPropertyDefinition(
null, null,
ASPECT_RECORD, ASPECT_RECORD,
"Label2", "Label2",
@@ -248,10 +248,10 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Check the property QName is correct // Check the property QName is correct
assertNotNull(result); assertNotNull(result);
assertEquals(RecordsManagementCustomModel.RM_CUSTOM_URI, result.getNamespaceURI()); assertEquals(RecordsManagementCustomModel.RM_CUSTOM_URI, result.getNamespaceURI());
assertTrue(adminService.existsCustomProperty(result)); assertTrue(rmAdminService.existsCustomProperty(result));
// Check that property is available as a custom property // Check that property is available as a custom property
Map<QName, PropertyDefinition> propDefs = adminService.getCustomPropertyDefinitions(ASPECT_RECORD); Map<QName, PropertyDefinition> propDefs = rmAdminService.getCustomPropertyDefinitions(ASPECT_RECORD);
assertNotNull(propDefs); assertNotNull(propDefs);
assertTrue(propDefs.containsKey(result)); assertTrue(propDefs.containsKey(result));
@@ -276,7 +276,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public QName run() throws Exception public QName run() throws Exception
{ {
return adminService.addCustomPropertyDefinition( return rmAdminService.addCustomPropertyDefinition(
null, null,
ASPECT_RECORD, ASPECT_RECORD,
"Label3", "Label3",
@@ -298,10 +298,10 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Check the property QName is correct // Check the property QName is correct
assertNotNull(result); assertNotNull(result);
assertEquals(RecordsManagementCustomModel.RM_CUSTOM_URI, result.getNamespaceURI()); assertEquals(RecordsManagementCustomModel.RM_CUSTOM_URI, result.getNamespaceURI());
assertTrue(adminService.existsCustomProperty(result)); assertTrue(rmAdminService.existsCustomProperty(result));
// Check that property is available as a custom property // Check that property is available as a custom property
Map<QName, PropertyDefinition> propDefs = adminService.getCustomPropertyDefinitions(ASPECT_RECORD); Map<QName, PropertyDefinition> propDefs = rmAdminService.getCustomPropertyDefinitions(ASPECT_RECORD);
assertNotNull(propDefs); assertNotNull(propDefs);
//assertEquals(3, propDefs.size()); //assertEquals(3, propDefs.size());
assertTrue(propDefs.containsKey(result)); assertTrue(propDefs.containsKey(result));
@@ -336,7 +336,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public void run() throws Exception public void run() throws Exception
{ {
adminService.addCustomPropertyDefinition( rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myRecordProp1"),
ASPECT_RECORD, ASPECT_RECORD,
"Label1", "Label1",
@@ -356,7 +356,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public void run() throws Exception public void run() throws Exception
{ {
adminService.addCustomPropertyDefinition( rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myContentProp"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myContentProp"),
TYPE_CONTENT, TYPE_CONTENT,
"Label1", "Label1",
@@ -378,13 +378,13 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
public QName run() throws Exception public QName run() throws Exception
{ {
// Make a type customisable // Make a type customisable
assertFalse(adminService.isCustomisable(TYPE_CUSTOM_TYPE)); assertFalse(rmAdminService.isCustomisable(TYPE_CUSTOM_TYPE));
adminService.makeCustomisable(TYPE_CUSTOM_TYPE); rmAdminService.makeCustomisable(TYPE_CUSTOM_TYPE);
madeCustomisable.add(TYPE_CUSTOM_TYPE); madeCustomisable.add(TYPE_CUSTOM_TYPE);
assertTrue(adminService.isCustomisable(TYPE_CUSTOM_TYPE)); assertTrue(rmAdminService.isCustomisable(TYPE_CUSTOM_TYPE));
// Add a custom property // Add a custom property
return adminService.addCustomPropertyDefinition( return rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewProperty"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewProperty"),
TYPE_CUSTOM_TYPE, TYPE_CUSTOM_TYPE,
"Label", "Label",
@@ -399,10 +399,10 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Check the property QName is correct // Check the property QName is correct
assertNotNull(result); assertNotNull(result);
assertEquals(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewProperty"), result); assertEquals(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewProperty"), result);
assertTrue(adminService.existsCustomProperty(result)); assertTrue(rmAdminService.existsCustomProperty(result));
// Check that property is available as a custom property // Check that property is available as a custom property
Map<QName, PropertyDefinition> propDefs = adminService.getCustomPropertyDefinitions(TYPE_CUSTOM_TYPE); Map<QName, PropertyDefinition> propDefs = rmAdminService.getCustomPropertyDefinitions(TYPE_CUSTOM_TYPE);
assertNotNull(propDefs); assertNotNull(propDefs);
assertEquals(1, propDefs.size()); assertEquals(1, propDefs.size());
assertTrue(propDefs.containsKey(result)); assertTrue(propDefs.containsKey(result));
@@ -423,13 +423,13 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
public QName run() throws Exception public QName run() throws Exception
{ {
// Make an aspect customisable // Make an aspect customisable
assertFalse(adminService.isCustomisable(ASPECT_CUSTOM_ASPECT)); assertFalse(rmAdminService.isCustomisable(ASPECT_CUSTOM_ASPECT));
adminService.makeCustomisable(ASPECT_CUSTOM_ASPECT); rmAdminService.makeCustomisable(ASPECT_CUSTOM_ASPECT);
madeCustomisable.add(ASPECT_CUSTOM_ASPECT); madeCustomisable.add(ASPECT_CUSTOM_ASPECT);
assertTrue(adminService.isCustomisable(ASPECT_CUSTOM_ASPECT)); assertTrue(rmAdminService.isCustomisable(ASPECT_CUSTOM_ASPECT));
// Add a custom property // Add a custom property
return adminService.addCustomPropertyDefinition( return rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewAspectProperty"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewAspectProperty"),
ASPECT_CUSTOM_ASPECT, ASPECT_CUSTOM_ASPECT,
"Label", "Label",
@@ -444,10 +444,10 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Check the property QName is correct // Check the property QName is correct
assertNotNull(result); assertNotNull(result);
assertEquals(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewAspectProperty"), result); assertEquals(QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewAspectProperty"), result);
assertTrue(adminService.existsCustomProperty(result)); assertTrue(rmAdminService.existsCustomProperty(result));
// Check that property is available as a custom property // Check that property is available as a custom property
Map<QName, PropertyDefinition> propDefs = adminService.getCustomPropertyDefinitions(ASPECT_CUSTOM_ASPECT); Map<QName, PropertyDefinition> propDefs = rmAdminService.getCustomPropertyDefinitions(ASPECT_CUSTOM_ASPECT);
assertNotNull(propDefs); assertNotNull(propDefs);
assertEquals(1, propDefs.size()); assertEquals(1, propDefs.size());
assertTrue(propDefs.containsKey(result)); assertTrue(propDefs.containsKey(result));
@@ -470,18 +470,18 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
@Override @Override
public QName run() throws Exception public QName run() throws Exception
{ {
adminService.makeCustomisable(TYPE_CUSTOM_TYPE); rmAdminService.makeCustomisable(TYPE_CUSTOM_TYPE);
madeCustomisable.add(TYPE_CUSTOM_TYPE); madeCustomisable.add(TYPE_CUSTOM_TYPE);
adminService.addCustomPropertyDefinition( rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewProperty"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewProperty"),
TYPE_CUSTOM_TYPE, TYPE_CUSTOM_TYPE,
"Label", "Label",
DataTypeDefinition.TEXT, DataTypeDefinition.TEXT,
"Title", "Title",
"Description"); "Description");
adminService.makeCustomisable(ASPECT_CUSTOM_ASPECT); rmAdminService.makeCustomisable(ASPECT_CUSTOM_ASPECT);
madeCustomisable.add(ASPECT_CUSTOM_ASPECT); madeCustomisable.add(ASPECT_CUSTOM_ASPECT);
adminService.addCustomPropertyDefinition( rmAdminService.addCustomPropertyDefinition(
QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewAspectProperty"), QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, "myNewAspectProperty"),
ASPECT_CUSTOM_ASPECT, ASPECT_CUSTOM_ASPECT,
"Label", "Label",
@@ -577,12 +577,12 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
if (label != null) if (label != null)
{ {
// A bidirectional reference // A bidirectional reference
qNameResult = adminService.addCustomAssocDefinition(label); qNameResult = rmAdminService.addCustomAssocDefinition(label);
} }
else else
{ {
// A parent/child reference // A parent/child reference
qNameResult = adminService.addCustomChildAssocDefinition(source, target); qNameResult = rmAdminService.addCustomChildAssocDefinition(source, target);
} }
System.out.println("Creating new " + refType + " reference definition: " + qNameResult); System.out.println("Creating new " + refType + " reference definition: " + qNameResult);
System.out.println(" params- label: '" + label + "' source: '" + source + "' target: '" + target + "'"); System.out.println(" params- label: '" + label + "' source: '" + source + "' target: '" + target + "'");
@@ -596,7 +596,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
// Confirm the custom reference is included in the list from adminService. // Confirm the custom reference is included in the list from adminService.
Map<QName, AssociationDefinition> customRefDefinitions = adminService.getCustomReferenceDefinitions(); Map<QName, AssociationDefinition> customRefDefinitions = rmAdminService.getCustomReferenceDefinitions();
AssociationDefinition retrievedRefDefn = customRefDefinitions.get(generatedQName); AssociationDefinition retrievedRefDefn = customRefDefinitions.get(generatedQName);
assertNotNull("Custom reference definition from adminService was null.", retrievedRefDefn); assertNotNull("Custom reference definition from adminService was null.", retrievedRefDefn);
assertEquals(generatedQName, retrievedRefDefn.getName()); assertEquals(generatedQName, retrievedRefDefn.getName());
@@ -674,7 +674,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
{ {
// Just dump them out for visual inspection // Just dump them out for visual inspection
System.out.println("Available custom properties:"); System.out.println("Available custom properties:");
Map<QName, PropertyDefinition> props = adminService.getCustomPropertyDefinitions(); Map<QName, PropertyDefinition> props = rmAdminService.getCustomPropertyDefinitions();
for (QName prop : props.keySet()) for (QName prop : props.keySet())
{ {
System.out.println(" - " + prop.toString()); System.out.println(" - " + prop.toString());
@@ -697,7 +697,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
{ {
// Just dump them out for visual inspection // Just dump them out for visual inspection
System.out.println("Available custom references:"); System.out.println("Available custom references:");
Map<QName, AssociationDefinition> references = adminService.getCustomReferenceDefinitions(); Map<QName, AssociationDefinition> references = rmAdminService.getCustomReferenceDefinitions();
for (QName reference : references.keySet()) for (QName reference : references.keySet())
{ {
System.out.println(" - " + reference.toString()); System.out.println(" - " + reference.toString());
@@ -716,7 +716,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
{ {
// Just dump them out for visual inspection // Just dump them out for visual inspection
System.out.println("Available custom constraints:"); System.out.println("Available custom constraints:");
List<ConstraintDefinition> constraints = adminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL); List<ConstraintDefinition> constraints = rmAdminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL);
for (ConstraintDefinition constraint : constraints) for (ConstraintDefinition constraint : constraints)
{ {
System.out.println(" - " + constraint.getName()); System.out.println(" - " + constraint.getName());
@@ -770,7 +770,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
assertFalse(beforeMarker); assertFalse(beforeMarker);
assertFalse(onMarker); assertFalse(onMarker);
adminService.addCustomReference(testRecord1, testRecord2, CUSTOM_REF_VERSIONS); rmAdminService.addCustomReference(testRecord1, testRecord2, CUSTOM_REF_VERSIONS);
assertTrue(beforeMarker); assertTrue(beforeMarker);
assertTrue(onMarker); assertTrue(onMarker);
@@ -801,7 +801,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
{ {
public Integer execute() throws Throwable public Integer execute() throws Throwable
{ {
List<ConstraintDefinition> result = adminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL); List<ConstraintDefinition> result = rmAdminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL);
assertNotNull(result); assertNotNull(result);
return result.size(); return result.size();
} }
@@ -821,7 +821,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
final QName result = QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, conLocalName); final QName result = QName.createQName(RecordsManagementCustomModel.RM_CUSTOM_URI, conLocalName);
adminService.addCustomConstraintDefinition(result, conTitle, true, allowedValues, MatchLogic.AND); rmAdminService.addCustomConstraintDefinition(result, conTitle, true, allowedValues, MatchLogic.AND);
return result; return result;
} }
}); });
@@ -834,7 +834,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
{ {
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
List<ConstraintDefinition> customConstraintDefs = adminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL); List<ConstraintDefinition> customConstraintDefs = rmAdminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL);
assertEquals(beforeCnt+1, customConstraintDefs.size()); assertEquals(beforeCnt+1, customConstraintDefs.size());
boolean found = false; boolean found = false;
@@ -871,7 +871,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
allowedValues.add("RED"); allowedValues.add("RED");
allowedValues.add("YELLOW"); allowedValues.add("YELLOW");
adminService.changeCustomConstraintValues(testCon, allowedValues); rmAdminService.changeCustomConstraintValues(testCon, allowedValues);
return null; return null;
} }
}); });
@@ -883,7 +883,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
{ {
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
List<ConstraintDefinition> customConstraintDefs = adminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL); List<ConstraintDefinition> customConstraintDefs = rmAdminService.getCustomConstraintDefinitions(RecordsManagementCustomModel.RM_CUSTOM_MODEL);
assertEquals(beforeCnt+1, customConstraintDefs.size()); assertEquals(beforeCnt+1, customConstraintDefs.size());
boolean found = false; boolean found = false;
@@ -927,7 +927,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
boolean mandatory = false; boolean mandatory = false;
boolean isProtected = false; boolean isProtected = false;
QName propName = adminService.addCustomPropertyDefinition(null, ASPECT_RECORD, propLocalName, dataType, propTitle, description, defaultValue, multiValued, mandatory, isProtected, testCon); QName propName = rmAdminService.addCustomPropertyDefinition(null, ASPECT_RECORD, propLocalName, dataType, propTitle, description, defaultValue, multiValued, mandatory, isProtected, testCon);
createdCustomProperties.add(propName); createdCustomProperties.add(propName);
return null; return null;
} }

49
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java
View File

@@ -50,9 +50,6 @@ import org.alfresco.util.Pair;
public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
implements RMPermissionModel implements RMPermissionModel
{ {
/** Records management audit service */
private RecordsManagementAuditService auditService;
/** Test record */ /** Test record */
private NodeRef record; private NodeRef record;
@@ -76,30 +73,18 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
testStartTime = new Date(); testStartTime = new Date();
// Stop and clear the log // Stop and clear the log
auditService.stopAuditLog(filePlan); rmAuditService.stopAuditLog(filePlan);
auditService.clearAuditLog(filePlan); rmAuditService.clearAuditLog(filePlan);
auditService.startAuditLog(filePlan); rmAuditService.startAuditLog(filePlan);
// check that audit service is started // check that audit service is started
assertTrue(auditService.isAuditLogEnabled(filePlan)); assertTrue(rmAuditService.isAuditLogEnabled(filePlan));
return null; return null;
} }
}); });
} }
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices()
*/
@Override
protected void initServices()
{
super.initServices();
// get the audit service
auditService = (RecordsManagementAuditService)applicationContext.getBean("RecordsManagementAuditService");
}
/** /**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#isUserTest() * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#isUserTest()
*/ */
@@ -143,7 +128,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
@Override @Override
public Void run() throws Exception public Void run() throws Exception
{ {
List<AuditEvent> events = auditService.getAuditEvents(); List<AuditEvent> events = rmAuditService.getAuditEvents();
System.out.println("Found audit events:"); System.out.println("Found audit events:");
for (AuditEvent event : events) for (AuditEvent event : events)
@@ -271,7 +256,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
public void testAdminMethods() throws InterruptedException public void testAdminMethods() throws InterruptedException
{ {
// Stop the audit // Stop the audit
auditService.stopAuditLog(filePlan); rmAuditService.stopAuditLog(filePlan);
Thread.sleep(5000); Thread.sleep(5000);
@@ -291,7 +276,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
result1.size(), result2.size()); result1.size(), result2.size());
// repeat with a start // repeat with a start
auditService.startAuditLog(filePlan); rmAuditService.startAuditLog(filePlan);
updateTitle(filePlan, rmAdminName); updateTitle(filePlan, rmAdminName);
Thread.sleep(5000); Thread.sleep(5000);
@@ -305,8 +290,8 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
Thread.sleep(5000); Thread.sleep(5000);
// Stop and delete all entries // Stop and delete all entries
auditService.stopAuditLog(filePlan); rmAuditService.stopAuditLog(filePlan);
auditService.clearAuditLog(filePlan); rmAuditService.clearAuditLog(filePlan);
// There should be no entries // There should be no entries
List<RecordsManagementAuditEntry> result4 = getAuditTrail(rmAdminName); List<RecordsManagementAuditEntry> result4 = getAuditTrail(rmAdminName);
@@ -324,9 +309,9 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
public void xtestAuditAuthentication() public void xtestAuditAuthentication()
{ {
auditService.stopAuditLog(filePlan); rmAuditService.stopAuditLog(filePlan);
auditService.clearAuditLog(filePlan); rmAuditService.clearAuditLog(filePlan);
auditService.startAuditLog(filePlan); rmAuditService.startAuditLog(filePlan);
//MutableAuthenticationService authenticationService = serviceRegistry.getAuthenticationService(); //MutableAuthenticationService authenticationService = serviceRegistry.getAuthenticationService();
//PersonService personService = serviceRegistry.getPersonService(); //PersonService personService = serviceRegistry.getPersonService();
@@ -356,7 +341,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
{ {
AuthenticationUtil.popAuthentication(); AuthenticationUtil.popAuthentication();
} }
auditService.stopAuditLog(filePlan); rmAuditService.stopAuditLog(filePlan);
List<RecordsManagementAuditEntry> result1 = getAuditTrail(rmAdminName); List<RecordsManagementAuditEntry> result1 = getAuditTrail(rmAdminName);
// Check that the username is reflected correctly in the results // Check that the username is reflected correctly in the results
assertFalse("No audit results were generated for the failed login.", result1.isEmpty()); assertFalse("No audit results were generated for the failed login.", result1.isEmpty());
@@ -389,8 +374,8 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
personProperties.put(ContentModel.PROP_LASTNAME, "Dickons"); personProperties.put(ContentModel.PROP_LASTNAME, "Dickons");
personService.createPerson(personProperties); personService.createPerson(personProperties);
auditService.clearAuditLog(filePlan); rmAuditService.clearAuditLog(filePlan);
auditService.startAuditLog(filePlan); rmAuditService.startAuditLog(filePlan);
try try
{ {
AuthenticationUtil.pushAuthentication(); AuthenticationUtil.pushAuthentication();
@@ -400,7 +385,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
{ {
AuthenticationUtil.popAuthentication(); AuthenticationUtil.popAuthentication();
} }
auditService.stopAuditLog(filePlan); rmAuditService.stopAuditLog(filePlan);
List<RecordsManagementAuditEntry> result2 = getAuditTrail(rmAdminName); List<RecordsManagementAuditEntry> result2 = getAuditTrail(rmAdminName);
found = false; found = false;
for (RecordsManagementAuditEntry entry : result2) for (RecordsManagementAuditEntry entry : result2)
@@ -435,7 +420,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
@Override @Override
public List<RecordsManagementAuditEntry> run() throws Exception public List<RecordsManagementAuditEntry> run() throws Exception
{ {
return auditService.getAuditTrail(params); return rmAuditService.getAuditTrail(params);
} }
@Override @Override

3
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java
View File

@@ -21,7 +21,6 @@ package org.alfresco.module.org_alfresco_module_rm.test.service;
import java.util.List; import java.util.List;
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEvent; import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEvent;
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventType; import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventType;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
@@ -38,7 +37,6 @@ public class RecordsManagementEventServiceImplTest extends BaseRMTestCase implem
{ {
protected static StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"); protected static StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
private RecordsManagementEventService rmEventService;
private RetryingTransactionHelper transactionHelper; private RetryingTransactionHelper transactionHelper;
@Override @Override
@@ -47,7 +45,6 @@ public class RecordsManagementEventServiceImplTest extends BaseRMTestCase implem
super.setUp(); super.setUp();
// Get the service required in the tests // Get the service required in the tests
this.rmEventService = (RecordsManagementEventService)this.applicationContext.getBean("RecordsManagementEventService");
this.transactionHelper = (RetryingTransactionHelper)this.applicationContext.getBean("retryingTransactionHelper"); this.transactionHelper = (RetryingTransactionHelper)this.applicationContext.getBean("retryingTransactionHelper");
// Set the current security context as admin // Set the current security context as admin

4
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java
View File

@@ -60,8 +60,6 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
private NodeRef recordFive; private NodeRef recordFive;
private NodeRef recordSix; private NodeRef recordSix;
private MutableAuthenticationService authenticationService;
private int numberOfReports; private int numberOfReports;
/** /**
@@ -72,8 +70,6 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
{ {
super.setupTestData(); super.setupTestData();
authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
doTestInTransaction(new Test<Void>() doTestInTransaction(new Test<Void>()
{ {
@Override @Override

22
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java
View File

@@ -23,13 +23,11 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
import org.alfresco.module.org_alfresco_module_rm.action.impl.CompleteEventAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.CompleteEventAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction;
import org.alfresco.module.org_alfresco_module_rm.report.Report; import org.alfresco.module.org_alfresco_module_rm.report.Report;
import org.alfresco.module.org_alfresco_module_rm.report.ReportModel; import org.alfresco.module.org_alfresco_module_rm.report.ReportModel;
import org.alfresco.module.org_alfresco_module_rm.report.ReportService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -42,24 +40,12 @@ import org.alfresco.service.namespace.QName;
*/ */
public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel
{ {
private ReportService reportService;
private RecordsManagementActionService recordsManagementActionService;
@Override @Override
protected boolean isRecordTest() protected boolean isRecordTest()
{ {
return false; return false;
} }
@Override
protected void initServices()
{
super.initServices();
reportService = (ReportService)applicationContext.getBean("ReportService");
recordsManagementActionService = (RecordsManagementActionService)applicationContext.getBean("RecordsManagementActionService");
}
public void testGetReportTypes() throws Exception public void testGetReportTypes() throws Exception
{ {
doTestInTransaction(new Test<Void>() doTestInTransaction(new Test<Void>()
@@ -128,10 +114,10 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel
{ {
Map<String, Serializable> params = new HashMap<String, Serializable>(1); Map<String, Serializable> params = new HashMap<String, Serializable>(1);
params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME);
recordsManagementActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params); rmActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params);
recordsManagementActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME); rmActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME);
recordsManagementActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME); rmActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME);
recordsManagementActionService.executeRecordsManagementAction(rmFolder, "fileDestructionReport"); rmActionService.executeRecordsManagementAction(rmFolder, "fileDestructionReport");
return null; return null;
} }
}); });

9
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java
View File

@@ -28,9 +28,6 @@ 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;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
@@ -47,9 +44,6 @@ public class NotificationServiceHelperSystemTest extends BaseRMTestCase
/** Services */ /** Services */
private RecordsManagementNotificationHelper notificationHelper; private RecordsManagementNotificationHelper notificationHelper;
private MutableAuthenticationService authenticationService;
private PersonService personService;
private AuthorityService authorityService;
/** Test data */ /** Test data */
private NodeRef record; private NodeRef record;
@@ -64,9 +58,6 @@ public class NotificationServiceHelperSystemTest extends BaseRMTestCase
// Get the notification helper // Get the notification helper
notificationHelper = (RecordsManagementNotificationHelper)applicationContext.getBean("recordsManagementNotificationHelper"); notificationHelper = (RecordsManagementNotificationHelper)applicationContext.getBean("recordsManagementNotificationHelper");
authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
authorityService = (AuthorityService)applicationContext.getBean("AuthorityService");
personService = (PersonService)applicationContext.getBean("PersonService");
} }
@Override @Override

24
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
View File

@@ -26,6 +26,7 @@ import java.util.Set;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService; import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService; import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService; import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService; import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService;
@@ -38,8 +39,10 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RmSiteType; import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RmSiteType;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService; import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
import org.alfresco.module.org_alfresco_module_rm.report.ReportService;
import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService; import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
import org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService; import org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService;
import org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService; import org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService;
import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService; import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService;
@@ -51,6 +54,7 @@ import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.site.SiteServiceImpl; import org.alfresco.repo.site.SiteServiceImpl;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
@@ -122,12 +126,13 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected FileFolderService fileFolderService; protected FileFolderService fileFolderService;
protected PermissionService permissionService; protected PermissionService permissionService;
protected TaggingService taggingService; protected TaggingService taggingService;
protected ActionService actionService;
/** RM Services */ /** RM Services */
protected DispositionService dispositionService; protected DispositionService dispositionService;
protected RecordsManagementEventService eventService; protected RecordsManagementEventService rmEventService;
protected RecordsManagementAdminService adminService; protected RecordsManagementAdminService rmAdminService;
protected RecordsManagementActionService actionService; protected RecordsManagementActionService rmActionService;
protected RecordsManagementSearchService rmSearchService; protected RecordsManagementSearchService rmSearchService;
protected FilePlanRoleService filePlanRoleService; protected FilePlanRoleService filePlanRoleService;
protected FilePlanPermissionService filePlanPermissionService; protected FilePlanPermissionService filePlanPermissionService;
@@ -139,6 +144,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected FilePlanService filePlanService; protected FilePlanService filePlanService;
protected FilePlanAuthenticationService filePlanAuthenticationService; protected FilePlanAuthenticationService filePlanAuthenticationService;
protected RecordFolderService recordFolderService; protected RecordFolderService recordFolderService;
protected ExtendedSecurityService extendedSecurityService;
protected ReportService reportService;
protected RecordsManagementAuditService rmAuditService;
/** test data */ /** test data */
protected String siteId; protected String siteId;
@@ -356,12 +364,13 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
fileFolderService = (FileFolderService)applicationContext.getBean("FileFolderService"); fileFolderService = (FileFolderService)applicationContext.getBean("FileFolderService");
permissionService = (PermissionService)applicationContext.getBean("PermissionService"); permissionService = (PermissionService)applicationContext.getBean("PermissionService");
taggingService = (TaggingService)applicationContext.getBean("TaggingService"); taggingService = (TaggingService)applicationContext.getBean("TaggingService");
actionService = (ActionService)applicationContext.getBean("ActionService");
// Get RM services // Get RM services
dispositionService = (DispositionService)applicationContext.getBean("DispositionService"); dispositionService = (DispositionService)applicationContext.getBean("DispositionService");
eventService = (RecordsManagementEventService)applicationContext.getBean("RecordsManagementEventService"); rmEventService = (RecordsManagementEventService)applicationContext.getBean("RecordsManagementEventService");
adminService = (RecordsManagementAdminService)applicationContext.getBean("RecordsManagementAdminService"); rmAdminService = (RecordsManagementAdminService)applicationContext.getBean("RecordsManagementAdminService");
actionService = (RecordsManagementActionService)this.applicationContext.getBean("RecordsManagementActionService"); rmActionService = (RecordsManagementActionService)this.applicationContext.getBean("RecordsManagementActionService");
rmSearchService = (RecordsManagementSearchService)this.applicationContext.getBean("RecordsManagementSearchService"); rmSearchService = (RecordsManagementSearchService)this.applicationContext.getBean("RecordsManagementSearchService");
filePlanRoleService = (FilePlanRoleService)this.applicationContext.getBean("FilePlanRoleService"); filePlanRoleService = (FilePlanRoleService)this.applicationContext.getBean("FilePlanRoleService");
filePlanPermissionService = (FilePlanPermissionService)this.applicationContext.getBean("FilePlanPermissionService"); filePlanPermissionService = (FilePlanPermissionService)this.applicationContext.getBean("FilePlanPermissionService");
@@ -373,6 +382,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService"); filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
filePlanAuthenticationService = (FilePlanAuthenticationService) applicationContext.getBean("FilePlanAuthenticationService"); filePlanAuthenticationService = (FilePlanAuthenticationService) applicationContext.getBean("FilePlanAuthenticationService");
recordFolderService = (RecordFolderService) applicationContext.getBean("RecordFolderService"); recordFolderService = (RecordFolderService) applicationContext.getBean("RecordFolderService");
extendedSecurityService = (ExtendedSecurityService) applicationContext.getBean("ExtendedSecurityService");
reportService = (ReportService) applicationContext.getBean("ReportService");
rmAuditService = (RecordsManagementAuditService) applicationContext.getBean("RecordsManagementAuditService");
} }
/** /**

3
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java
View File

@@ -27,6 +27,7 @@ import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction
import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService; import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService; import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService; import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService; import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
@@ -108,6 +109,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
protected VitalRecordService vitalRecordService; protected VitalRecordService vitalRecordService;
protected FilePlanService filePlanService; protected FilePlanService filePlanService;
protected RecordFolderService recordFolderService; protected RecordFolderService recordFolderService;
protected RMCaveatConfigService caveatConfigService;
/** test data */ /** test data */
protected String siteId; protected String siteId;
@@ -181,6 +183,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
vitalRecordService = (VitalRecordService)applicationContext.getBean("VitalRecordService"); vitalRecordService = (VitalRecordService)applicationContext.getBean("VitalRecordService");
filePlanService = (FilePlanService)applicationContext.getBean("FilePlanService"); filePlanService = (FilePlanService)applicationContext.getBean("FilePlanService");
recordFolderService = (RecordFolderService)applicationContext.getBean("RecordFolderService"); recordFolderService = (RecordFolderService)applicationContext.getBean("RecordFolderService");
caveatConfigService = (RMCaveatConfigService)applicationContext.getBean("CaveatConfigService");
} }
/** /**

10
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
View File

@@ -45,21 +45,11 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
{ {
private RMCaveatConfigService caveatConfigService;
protected final static String RM_LIST = "rmc:smListTest"; protected final static String RM_LIST = "rmc:smListTest";
protected final static String RM_LIST_URI_ELEM = "rmc_smListTest"; protected final static String RM_LIST_URI_ELEM = "rmc_smListTest";
private static final String URL_RM_CONSTRAINTS = "/api/rma/admin/rmconstraints"; private static final String URL_RM_CONSTRAINTS = "/api/rma/admin/rmconstraints";
@Override
protected void initServices()
{
super.initServices();
this.caveatConfigService = (RMCaveatConfigService)getServer().getApplicationContext().getBean("CaveatConfigService");
}
public void testGetRMConstraints() throws Exception public void testGetRMConstraints() throws Exception
{ {
{ {

11
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java
View File

@@ -21,7 +21,6 @@ package org.alfresco.module.org_alfresco_module_rm.test.webscript;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.json.JSONObject; import org.json.JSONObject;
@@ -36,21 +35,11 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*/ */
public class RMConstraintScriptTest extends BaseRMWebScriptTestCase public class RMConstraintScriptTest extends BaseRMWebScriptTestCase
{ {
private RMCaveatConfigService caveatConfigService;
protected final static String RM_LIST = "rmc:smListTest"; protected final static String RM_LIST = "rmc:smListTest";
protected final static String RM_LIST_URI_ELEM = "rmc_smListTest"; protected final static String RM_LIST_URI_ELEM = "rmc_smListTest";
private static final String URL_RM_CONSTRAINTS = "/api/rma/rmconstraints"; private static final String URL_RM_CONSTRAINTS = "/api/rma/rmconstraints";
@Override
protected void initServices()
{
super.initServices();
this.caveatConfigService = (RMCaveatConfigService)getServer().getApplicationContext().getBean("CaveatConfigService");
}
/** /**
* *
* @throws Exception * @throws Exception