mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Support for sub-types of folder in site.getContainer() - to allow for specialised types of component folder and backwards compatibility with existing models such as forum.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -29,9 +29,12 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.model.ApplicationModel;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.jscript.ClasspathScriptLocation;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.ScriptLocation;
|
||||
import org.alfresco.service.cmr.repository.ScriptService;
|
||||
import org.alfresco.util.BaseAlfrescoSpringTest;
|
||||
@@ -55,6 +58,7 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
|
||||
|
||||
private SiteService siteService;
|
||||
private ScriptService scriptService;
|
||||
private NodeService nodeService;
|
||||
private AuthenticationComponent authenticationComponent;
|
||||
|
||||
/**
|
||||
@@ -67,6 +71,7 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
|
||||
// Get the required services
|
||||
this.siteService = (SiteService)this.applicationContext.getBean("siteService");
|
||||
this.scriptService = (ScriptService)this.applicationContext.getBean("ScriptService");
|
||||
this.nodeService = (NodeService)this.applicationContext.getBean("NodeService");
|
||||
this.authenticationComponent = (AuthenticationComponent)this.applicationContext.getBean("authenticationComponent");
|
||||
|
||||
// Do the test's as userOne
|
||||
@@ -342,20 +347,35 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
|
||||
|
||||
boolean hasContainer = this.siteService.hasContainer(siteInfo.getShortName(), "folder.component");
|
||||
assertFalse(hasContainer);
|
||||
NodeRef container1 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component");
|
||||
NodeRef container1 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component", null);
|
||||
assertNotNull(container1);
|
||||
NodeRef container2 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component");
|
||||
NodeRef container2 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component", null);
|
||||
assertNotNull(container2);
|
||||
assertTrue(container1.equals(container2));
|
||||
boolean hasContainer2 = this.siteService.hasContainer(siteInfo.getShortName(), "folder.component");
|
||||
assertTrue(hasContainer2);
|
||||
boolean hasContainer3 = this.siteService.hasContainer(siteInfo.getShortName(), "folder.component2");
|
||||
assertFalse(hasContainer3);
|
||||
NodeRef container3 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component2");
|
||||
NodeRef container3 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component2", null);
|
||||
assertNotNull(container3);
|
||||
assertFalse(container1.equals(container3));
|
||||
boolean hasContainer4 = this.siteService.hasContainer(siteInfo.getShortName(), "folder.component2");
|
||||
assertTrue(hasContainer4);
|
||||
boolean hasContainer5 = this.siteService.hasContainer(siteInfo.getShortName(), "folder.component3");
|
||||
assertFalse(hasContainer5);
|
||||
NodeRef container5 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component3", ContentModel.TYPE_FOLDER);
|
||||
assertNotNull(container5);
|
||||
NodeRef container6 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component3", null);
|
||||
assertNotNull(container6);
|
||||
assertTrue(container5.equals(container6));
|
||||
assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(container6));
|
||||
NodeRef container7 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component3", ApplicationModel.TYPE_PROJECTSPACE);
|
||||
assertNotNull(container7);
|
||||
assertTrue(container5.equals(container7));
|
||||
assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(container7));
|
||||
NodeRef container8 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component4", ApplicationModel.TYPE_PROJECTSPACE);
|
||||
assertNotNull(container8);
|
||||
assertEquals(ApplicationModel.TYPE_PROJECTSPACE, nodeService.getType(container8));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user