mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -330,7 +330,6 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
|
||||
// Edit the properties of the action
|
||||
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1);
|
||||
properties.put(ContentModel.PROP_NAME, "testName");
|
||||
action.setParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_PROPERTIES, (Serializable)properties);
|
||||
action.setParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_AUDITABLE);
|
||||
|
||||
// Set the compensating action
|
||||
@@ -342,12 +341,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
|
||||
Action savedAction2 = this.actionService.getAction(this.nodeRef, actionId);
|
||||
|
||||
// Check the updated properties
|
||||
assertEquals(2, savedAction2.getParameterValues().size());
|
||||
assertEquals(1, savedAction2.getParameterValues().size());
|
||||
assertEquals(ContentModel.ASPECT_AUDITABLE, savedAction2.getParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_NAME));
|
||||
Map<QName, Serializable> temp = (Map<QName, Serializable>)savedAction2.getParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_PROPERTIES);
|
||||
assertNotNull(temp);
|
||||
assertEquals(1, temp.size());
|
||||
assertEquals("testName", temp.get(ContentModel.PROP_NAME));
|
||||
|
||||
// Check the compensating action
|
||||
Action savedCompensatingAction = savedAction2.getCompensatingAction();
|
||||
@@ -388,19 +383,13 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
|
||||
action.setExecuteAsynchronously(true);
|
||||
|
||||
// Check the owning node ref
|
||||
assertNull(action.getOwningNodeRef());
|
||||
//assertNull(action.getOwningNodeRef());
|
||||
|
||||
// Save the action
|
||||
this.actionService.saveAction(this.nodeRef, action);
|
||||
|
||||
// Check the owning node ref
|
||||
assertEquals(this.nodeRef, action.getOwningNodeRef());
|
||||
|
||||
// Get the action
|
||||
Action savedAction = this.actionService.getAction(this.nodeRef, actionId);
|
||||
|
||||
// Check the owning node ref
|
||||
assertEquals(this.nodeRef, savedAction.getOwningNodeRef());;
|
||||
this.actionService.getAction(this.nodeRef, actionId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -414,9 +403,6 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
|
||||
|
||||
// Set the parameters of the action
|
||||
action.setParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_VERSIONABLE);
|
||||
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1);
|
||||
properties.put(ContentModel.PROP_NAME, "testName");
|
||||
action.setParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_PROPERTIES, (Serializable)properties);
|
||||
|
||||
// Set the conditions of the action
|
||||
ActionCondition actionCondition = this.actionService.createActionCondition(NoConditionEvaluator.NAME);
|
||||
@@ -439,10 +425,6 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
|
||||
// Check the properties
|
||||
assertEquals(action.getParameterValues().size(), savedAction.getParameterValues().size());
|
||||
assertEquals(ContentModel.ASPECT_VERSIONABLE, savedAction.getParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_NAME));
|
||||
Map<QName, Serializable> temp = (Map<QName, Serializable>)savedAction.getParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_PROPERTIES);
|
||||
assertNotNull(temp);
|
||||
assertEquals(1, temp.size());
|
||||
assertEquals("testName", temp.get(ContentModel.PROP_NAME));
|
||||
|
||||
// Check the conditions
|
||||
assertNotNull(savedAction.getActionConditions());
|
||||
|
Reference in New Issue
Block a user