inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-766 (Rule property substitutions missing)

Browse Source 
- Fixed failing test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@53595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-08-04 11:41:30 +00:00
parent ffc533fd5b
commit a53f6f6907
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
/** Services */ /** Services */
protected ActionService dmActionService; protected ActionService dmActionService;
protected PermissionService dmPermissionService; 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";
@@ -46,7 +46,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
public static final String RECORD_ONLY_ACTION = "recordOnlyAction"; public static final String RECORD_ONLY_ACTION = "recordOnlyAction";
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 @Override
protected void initServices() protected void initServices()
@@ -66,7 +66,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
{ {
return true; return true;
} }
@Override @Override
protected boolean isRecordTest() protected boolean isRecordTest()
{ {
@@ -74,7 +74,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
} }
// NOTE: temporarily disabled test ... now that RM actions are no longer registered with the action service, aplicability // NOTE: temporarily disabled test ... now that RM actions are no longer registered with the action service, aplicability
// may no longer be relevant ... possibly something to back out?? // may no longer be relevant ... possibly something to back out??
public void xtestAvailableActions() public void xtestAvailableActions()
{ {
doTestInTransaction(new Test<Void>() doTestInTransaction(new Test<Void>()
@@ -89,7 +89,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertTrue(containsAction(result, RECORD_ONLY_ACTION)); assertTrue(containsAction(result, RECORD_ONLY_ACTION));
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 = dmActionService.getActionDefinitions(rmFolder);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
@@ -98,7 +98,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertFalse(containsAction(result, RECORD_ONLY_ACTION)); assertFalse(containsAction(result, RECORD_ONLY_ACTION));
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 = dmActionService.getActionDefinitions(rmContainer);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
@@ -107,7 +107,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertFalse(containsAction(result, RECORD_ONLY_ACTION)); assertFalse(containsAction(result, RECORD_ONLY_ACTION));
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 = dmActionService.getActionDefinitions(dmDocument);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
@@ -116,7 +116,7 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertFalse(containsAction(result, RECORD_ONLY_ACTION)); assertFalse(containsAction(result, RECORD_ONLY_ACTION));
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 = dmActionService.getActionDefinitions(dmFolder);
assertNotNull(result); assertNotNull(result);
assertFalse(containsAction(result, TEST_ACTION)); assertFalse(containsAction(result, TEST_ACTION));
@@ -125,16 +125,16 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
assertFalse(containsAction(result, RECORD_ONLY_ACTION)); assertFalse(containsAction(result, RECORD_ONLY_ACTION));
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));
return null; return null;
} }
}); });
} }
private boolean containsAction(List<ActionDefinition> list, String actionName) private boolean containsAction(List<ActionDefinition> list, String actionName)
{ {
boolean result = false; boolean result = false;
for (ActionDefinition actionDefinition : list) for (ActionDefinition actionDefinition : list)
{ {
if (actionDefinition.getName().equals(actionName) == true) if (actionDefinition.getName().equals(actionName) == true)
@@ -143,10 +143,10 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
break; break;
} }
} }
return result; return result;
} }
public void testActionPropertySubstitution() throws Exception public void testActionPropertySubstitution() throws Exception
{ {
doTestInTransaction(new Test<Void>() doTestInTransaction(new Test<Void>()
@@ -154,19 +154,19 @@ public class ExtendedActionServiceTest extends BaseRMTestCase
public Void run() public Void run()
{ {
Action action = dmActionService.createAction(TestActionPropertySubs.NAME); Action action = dmActionService.createAction(TestActionPropertySubs.NAME);
action.setParameterValue("longMonth", "${date.month.long}"); action.setParameterValue("longMonth", "${date.month.long}");
action.setParameterValue("shortMonth", "${date.month}"); action.setParameterValue("shortMonth", "${date.month}");
action.setParameterValue("year", "${date.year}"); action.setParameterValue("year", "${date.year.long}");
action.setParameterValue("name", "${node.cm:name}"); action.setParameterValue("name", "${node.cm:name}");
action.setParameterValue("company", "${message.test.company}"); action.setParameterValue("company", "${message.test.company}");
action.setParameterValue("combo", "${date.year}/${date.month.short}/${node.cm:name}-${message.test.company}.txt"); action.setParameterValue("combo", "${date.year}/${date.month.short}/${node.cm:name}-${message.test.company}.txt");
dmActionService.executeAction(action, rmFolder); dmActionService.executeAction(action, rmFolder);
return null; return null;
} }
}); });