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

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

Browse Source 
75057: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72389: Disabled the testPublishEvent test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:13:32 +00:00
parent 5ceca11a7b
commit ed740060a4
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/test-java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java
View File

@@ -19,15 +19,11 @@
package org.alfresco.repo.webdav; package org.alfresco.repo.webdav;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.alfresco.events.types.ContentReadEvent;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.events.EventPublisherForTestingOnly;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
@@ -36,10 +32,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.FileFilterMode.Client;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@@ -56,7 +50,7 @@ public class WebDAVHelperIntegrationTest
private NodeRef rootNodeRef; private NodeRef rootNodeRef;
private NodeRef rootFolder; private NodeRef rootFolder;
private NodeService nodeService; private NodeService nodeService;
private EventPublisherForTestingOnly eventPublisher; // private EventPublisherForTestingOnly eventPublisher;
@BeforeClass @BeforeClass
public static void setUpSpring() public static void setUpSpring()
@@ -79,7 +73,7 @@ public class WebDAVHelperIntegrationTest
rootFolder = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, rootFolder = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN,
ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_FOLDER).getChildRef(); ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_FOLDER).getChildRef();
eventPublisher = (EventPublisherForTestingOnly) ctx.getBean("eventPublisher"); //eventPublisher = (EventPublisherForTestingOnly) ctx.getBean("eventPublisher");
} }
@Test @Test
@@ -139,9 +133,8 @@ public class WebDAVHelperIntegrationTest
FileInfo found = webDAVHelper.getNodeForPath(rootFolder, "/"); FileInfo found = webDAVHelper.getNodeForPath(rootFolder, "/");
assertEquals(rootFolder, found.getNodeRef()); assertEquals(rootFolder, found.getNodeRef());
} }
/*
@Test @Test
@Ignore
public void testPublishEvent() public void testPublishEvent()
{ {
FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER); FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER);
@@ -162,4 +155,5 @@ public class WebDAVHelperIntegrationTest
} }
assertTrue(found); assertTrue(found);
} }
*/
} }