mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Reverse merged 5.2.N (5.2.1)
131742 rneamtu: SHA-1629 : Creating a link to file in a different location - Added support for multiple files in doclink.post webscript git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -25,38 +25,37 @@
|
||||
*/
|
||||
package org.alfresco.repo.doclink;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.transaction.Status;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.model.ApplicationModel;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||
import org.alfresco.repo.security.permissions.AccessDeniedException;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.repository.DeleteLinksStatusReport;
|
||||
import org.alfresco.service.cmr.repository.DocumentLinkService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.cmr.security.PersonService;
|
||||
import org.alfresco.service.cmr.site.SiteService;
|
||||
import org.alfresco.service.cmr.site.SiteVisibility;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.ApplicationContextHelper;
|
||||
import org.alfresco.util.GUID;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.extensions.surf.util.I18NUtil;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.transaction.Status;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.model.ApplicationModel;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||
import org.alfresco.repo.security.permissions.AccessDeniedException;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.repository.DeleteLinksStatusReport;
|
||||
import org.alfresco.service.cmr.repository.DocumentLinkService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.cmr.security.PersonService;
|
||||
import org.alfresco.service.cmr.site.SiteService;
|
||||
import org.alfresco.service.cmr.site.SiteVisibility;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.ApplicationContextHelper;
|
||||
import org.alfresco.util.GUID;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
|
||||
/**
|
||||
* Test cases for {@link DocumentLinkServiceImpl}.
|
||||
*
|
||||
@@ -173,9 +172,8 @@ public class DocumentLinkServiceImplTest extends TestCase
|
||||
NodeRef linkNodeRef = documentLinkService.createDocumentLink(site1File1, site1Folder2);
|
||||
assertNotNull(linkNodeRef);
|
||||
|
||||
// test if the link node is listed as a child of site1Folder2
|
||||
String site1File1LinkName = I18NUtil.getMessage("doclink_service.link_to_label", (site1File1Name + ".url"));
|
||||
NodeRef linkNodeRef2 = fileFolderService.searchSimple(site1Folder2, site1File1LinkName);
|
||||
// test if the link node is listed as a child of site1Folder2
|
||||
NodeRef linkNodeRef2 = fileFolderService.searchSimple(site1Folder2, site1File1Name);
|
||||
assertNotNull(linkNodeRef2);
|
||||
assertEquals(linkNodeRef, linkNodeRef2);
|
||||
|
||||
@@ -199,10 +197,9 @@ public class DocumentLinkServiceImplTest extends TestCase
|
||||
NodeRef linkNodeRef = documentLinkService.createDocumentLink(site1Folder1, site1Folder2);
|
||||
assertNotNull(linkNodeRef);
|
||||
|
||||
// test if the link node is listed as a child of site1Folder2
|
||||
String site1Folder1LinkName = I18NUtil.getMessage("doclink_service.link_to_label", (site1Folder1Name + ".url"));
|
||||
NodeRef linkNodeRef2 = fileFolderService.searchSimple(site1Folder2, site1Folder1LinkName);
|
||||
assertNotNull(linkNodeRef2);
|
||||
// test if the link node is listed as a child of site1Folder2
|
||||
NodeRef linkNodeRef2 = fileFolderService.searchSimple(site1Folder2, site1Folder1Name);
|
||||
assertNotNull(linkNodeRef2);
|
||||
assertEquals(linkNodeRef, linkNodeRef2);
|
||||
|
||||
// check the type of the link
|
||||
|
Reference in New Issue
Block a user