From ed740060a405fc3af7dae1b7c62f7f77f2b71099 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Tue, 1 Jul 2014 15:13:32 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 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 --- .../repo/webdav/WebDAVHelperIntegrationTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/source/test-java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java b/source/test-java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java index 42fd661feb..433e1fddb7 100644 --- a/source/test-java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java +++ b/source/test-java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java @@ -19,15 +19,11 @@ package org.alfresco.repo.webdav; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.List; import java.util.UUID; -import org.alfresco.events.types.ContentReadEvent; import org.alfresco.model.ContentModel; -import org.alfresco.repo.events.EventPublisherForTestingOnly; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.model.FileFolderService; 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.StoreRef; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.FileFilterMode.Client; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; @@ -56,7 +50,7 @@ public class WebDAVHelperIntegrationTest private NodeRef rootNodeRef; private NodeRef rootFolder; private NodeService nodeService; - private EventPublisherForTestingOnly eventPublisher; +// private EventPublisherForTestingOnly eventPublisher; @BeforeClass public static void setUpSpring() @@ -79,7 +73,7 @@ public class WebDAVHelperIntegrationTest rootFolder = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_FOLDER).getChildRef(); - eventPublisher = (EventPublisherForTestingOnly) ctx.getBean("eventPublisher"); + //eventPublisher = (EventPublisherForTestingOnly) ctx.getBean("eventPublisher"); } @Test @@ -139,9 +133,8 @@ public class WebDAVHelperIntegrationTest FileInfo found = webDAVHelper.getNodeForPath(rootFolder, "/"); assertEquals(rootFolder, found.getNodeRef()); } - + /* @Test - @Ignore public void testPublishEvent() { FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER); @@ -162,4 +155,5 @@ public class WebDAVHelperIntegrationTest } assertTrue(found); } + */ }