Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

77099: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73031: ACE-956 - fixes to other unit tests affected by the change of interface.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:13:26 +00:00
parent f989d6fa2d
commit 90712bd712
3 changed files with 14 additions and 0 deletions

View File

@@ -26,6 +26,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.i18n.MessageService;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.tenant.TenantAdminService;
import org.alfresco.service.cmr.dictionary.DictionaryException;
import org.alfresco.service.cmr.dictionary.ModelDefinition;
@@ -96,6 +97,8 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
/** The message service */
private MessageService messageService;
private PolicyComponent policyComponent;
/**
* @see org.springframework.test.AbstractTransactionalSpringContextTests#onSetUpInTransaction()
*/
@@ -113,6 +116,8 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
this.tenantAdminService = (TenantAdminService)this.applicationContext.getBean("tenantAdminService");
this.namespaceService = (NamespaceService)this.applicationContext.getBean("namespaceService");
this.messageService = (MessageService)this.applicationContext.getBean("messageService");
this.policyComponent = (PolicyComponent)this.applicationContext.getBean("policyComponent");
this.bootstrap = new DictionaryRepositoryBootstrap();
this.bootstrap.setContentService(this.contentService);
@@ -122,6 +127,7 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
this.bootstrap.setNodeService(this.nodeService);
this.bootstrap.setNamespaceService(this.namespaceService);
this.bootstrap.setMessageService(this.messageService);
this.bootstrap.setPolicyComponent(this.policyComponent);
RepositoryLocation location = new RepositoryLocation();
location.setStoreProtocol(this.storeRef.getProtocol());