Merged HEAD (5.1) to 5.1.N (5.1.1)

112631 gjames: Better Null handling, ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-09-23 10:56:22 +00:00
parent 561fbcf4a0
commit 9f209f804b
6 changed files with 103 additions and 14 deletions

View File

@@ -405,7 +405,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_LOCKABLE));
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_VERSIONABLE));
}
public void testGetAndGetAllWithNoActions()
{
assertNull(this.actionService.getAction(this.nodeRef, AddFeaturesActionExecuter.NAME));
@@ -413,6 +413,13 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertNotNull(actions);
assertEquals(0, actions.size());
}
public void testExecuteActionWithNoParameterDef()
{
Action action = this.actionService.createAction("empty-action");
this.actionService.executeAction(action, this.nodeRef);
assertTrue("If we got here then the test is successful", true);
}
/**
* Test saving an action with no conditions. Includes testing storage and retrieval