Merged DEV to HEAD

52182: MT: Remove some unused code and add @Override for DAO methods
   52183: ALF-19172: Disable sys:undeletable aspect while deleting test's tenants
   52274: Allow post-test tenant deletion by implementing hacks against ALF-19155


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-07-09 13:45:58 +00:00
parent 437ba4e516
commit e4cd0465bb
4 changed files with 20 additions and 25 deletions

View File

@@ -1895,13 +1895,14 @@ public class DiscussionServiceImplTest
public Void execute() throws Throwable
{
// TODO: WARNING: HACK for ALF-19155: MT deleteTenant does not work
// MultiTNodeServiceInterceptor.exists does not work is tenant has been deleted.
// beforeCommit code breaks on NodeService.exists calls
// PersonService prevents 'guest' authorities from being deleted
{
return null;
BehaviourFilter behaviourFilter = (BehaviourFilter) testContext.getBean("policyBehaviourFilter");
behaviourFilter.disableBehaviour(ContentModel.TYPE_PERSON);
behaviourFilter.disableBehaviour(ContentModel.ASPECT_UNDELETABLE);
}
// TENANT_ADMIN_SERVICE.deleteTenant(TENANT_DOMAIN);
// return null;
TENANT_ADMIN_SERVICE.deleteTenant(TENANT_DOMAIN);
return null;
}
});
}