inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/V3.4 to HEAD:

Browse Source 
23712: Fixed up fault in unit test introduced by earlier tweaks to the transfer service

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-11-16 21:18:51 +00:00
parent 06a204c13f
commit ad0104be9b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java
View File

@@ -40,7 +40,9 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MLText;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.transfer.TransferService; import org.alfresco.service.cmr.transfer.TransferService;
@@ -59,6 +61,7 @@ public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
private TransferService transferService; private TransferService transferService;
private PermissionService permissionService; private PermissionService permissionService;
private ContentService contentService; private ContentService contentService;
private NodeService mlAwareNodeService;
/** /**
* Called during the transaction setup * Called during the transaction setup
@@ -71,6 +74,7 @@ public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
this.transferService = (TransferService)this.applicationContext.getBean("TransferService"); this.transferService = (TransferService)this.applicationContext.getBean("TransferService");
this.contentService = (ContentService)this.applicationContext.getBean("ContentService"); this.contentService = (ContentService)this.applicationContext.getBean("ContentService");
this.permissionService = (PermissionService)this.applicationContext.getBean("PermissionService"); this.permissionService = (PermissionService)this.applicationContext.getBean("PermissionService");
this.mlAwareNodeService = (NodeService) this.applicationContext.getBean("mlAwareNodeService");
} }
public void testSnapshot() throws Exception public void testSnapshot() throws Exception
@@ -97,6 +101,7 @@ public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
TransferManifestNodeFactoryImpl nodeFactory = new TransferManifestNodeFactoryImpl(); TransferManifestNodeFactoryImpl nodeFactory = new TransferManifestNodeFactoryImpl();
nodeFactory.setNodeService(nodeService); nodeFactory.setNodeService(nodeService);
nodeFactory.setPermissionService(permissionService); nodeFactory.setPermissionService(permissionService);
nodeFactory.setMlAwareNodeService(mlAwareNodeService);
/** /**
* Create our transfer target * Create our transfer target
@@ -212,7 +217,7 @@ public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
assertEquals("content data wrong size", data.getSize(), CONTENT_STRING.length()); assertEquals("content data wrong size", data.getSize(), CONTENT_STRING.length());
assertEquals("content locale wrong", data.getLocale(), CONTENT_LOCALE); assertEquals("content locale wrong", data.getLocale(), CONTENT_LOCALE);
String childTitle = (String)readNode.getProperties().get(ContentModel.PROP_TITLE); String childTitle = ((MLText)readNode.getProperties().get(ContentModel.PROP_TITLE)).getDefaultValue();
assertEquals("content title wrong", childTitle, CONTENT_TITLE); assertEquals("content title wrong", childTitle, CONTENT_TITLE);
String childName = (String)readNode.getProperties().get(ContentModel.PROP_NAME); String childName = (String)readNode.getProperties().get(ContentModel.PROP_NAME);