Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:

35751: Addendum to fix for ALF-11923. Fixing failing test case by tightening up delete behaviour.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2012-04-26 09:27:53 +00:00
parent 4d9e699858
commit 4ee3384c37

View File

@@ -162,11 +162,19 @@ public class RuleServiceTest extends BaseWebScriptTest
@Override @Override
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
nodeService.deleteNode(testNodeRef2); deleteNodeIfExists(testNodeRef2);
nodeService.deleteNode(testNodeRef); deleteNodeIfExists(testNodeRef);
nodeService.deleteNode(testWorkNodeRef); deleteNodeIfExists(testWorkNodeRef);
return null; return null;
} }
private void deleteNodeIfExists(NodeRef nodeRef)
{
if (nodeService.exists(nodeRef))
{
nodeService.deleteNode(nodeRef);
}
}
}; };
this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback); this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback);
this.authenticationComponent.clearCurrentSecurityContext(); this.authenticationComponent.clearCurrentSecurityContext();