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

Fixed publishing tests to use public service beans ('ChannelService' and 'PublishingService')

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-11-24 12:52:52 +00:00
parent 69623f9978
commit 9e7c10abd0
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/publishing/ChannelServiceImpl.java
View File

@@ -51,7 +51,7 @@ import org.alfresco.util.collections.Filter;
*/ */
public class ChannelServiceImpl implements ChannelService public class ChannelServiceImpl implements ChannelService
{ {
public static final String NAME = "channelService"; public static final String NAME = "ChannelService";
private final Map<String, ChannelType> channelTypes = new TreeMap<String, ChannelType>(); private final Map<String, ChannelType> channelTypes = new TreeMap<String, ChannelType>();
private NodeService nodeService; private NodeService nodeService;

8
source/java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java
View File

@@ -29,12 +29,11 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.annotation.Resource;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.cmr.publishing.channels.Channel; import org.alfresco.service.cmr.publishing.channels.Channel;
import org.alfresco.service.cmr.publishing.channels.ChannelService;
import org.alfresco.service.cmr.publishing.channels.ChannelType; import org.alfresco.service.cmr.publishing.channels.ChannelType;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
@@ -52,8 +51,7 @@ public class ChannelServiceImplIntegratedTest extends AbstractPublishingIntegrat
{ {
private static final String channelName = GUID.generate(); private static final String channelName = GUID.generate();
@Resource(name="channelService") private ChannelService channelService;
private ChannelServiceImpl channelService;
@Test @Test
public void testCreateChannel() throws Exception public void testCreateChannel() throws Exception
@@ -295,7 +293,7 @@ public class ChannelServiceImplIntegratedTest extends AbstractPublishingIntegrat
public void onSetUp() throws Exception public void onSetUp() throws Exception
{ {
super.onSetUp(); super.onSetUp();
this.channelService = (ChannelServiceImpl) getApplicationContext().getBean("channelService"); this.channelService = (ChannelService) getApplicationContext().getBean("ChannelService");
testHelper.mockChannelType(channelTypeId); testHelper.mockChannelType(channelTypeId);
} }
} }

2
source/java/org/alfresco/repo/publishing/PublishServiceImpl.java
View File

@@ -38,7 +38,7 @@ import org.alfresco.util.ParameterCheck;
*/ */
public class PublishServiceImpl implements PublishingService public class PublishServiceImpl implements PublishingService
{ {
public static final String NAME = "publishingService"; public static final String NAME = "PublishingService";
private PublishingEventHelper publishingEventHelper; private PublishingEventHelper publishingEventHelper;
private PublishingRootObject rootObject; private PublishingRootObject rootObject;

12
source/java/org/alfresco/repo/publishing/PublishingIntegratedTest.java
View File

@@ -37,9 +37,9 @@ import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.publishing.PublishingDetails; import org.alfresco.service.cmr.publishing.PublishingDetails;
import org.alfresco.service.cmr.publishing.PublishingEvent; import org.alfresco.service.cmr.publishing.PublishingEvent;
import org.alfresco.service.cmr.publishing.PublishingPackageEntry; import org.alfresco.service.cmr.publishing.PublishingPackageEntry;
import org.alfresco.service.cmr.publishing.PublishingQueue; import org.alfresco.service.cmr.publishing.PublishingService;
import org.alfresco.service.cmr.publishing.channels.Channel; import org.alfresco.service.cmr.publishing.channels.Channel;
import org.alfresco.service.cmr.publishing.channels.ChannelType; import org.alfresco.service.cmr.publishing.channels.ChannelService;
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.NodeService;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
@@ -64,8 +64,8 @@ public class PublishingIntegratedTest extends BaseSpringTest
protected WorkflowService workflowService; protected WorkflowService workflowService;
protected FileFolderService fileFolderService; protected FileFolderService fileFolderService;
protected SiteService siteService; protected SiteService siteService;
private ChannelServiceImpl channelService; private ChannelService channelService;
private PublishServiceImpl publishingService; private PublishingService publishingService;
protected AuthenticationComponent authenticationComponent; protected AuthenticationComponent authenticationComponent;
private String siteId; private String siteId;
@@ -150,8 +150,8 @@ public class PublishingIntegratedTest extends BaseSpringTest
nodeService = serviceRegistry.getNodeService(); nodeService = serviceRegistry.getNodeService();
siteService = serviceRegistry.getSiteService(); siteService = serviceRegistry.getSiteService();
channelService = (ChannelServiceImpl) applicationContext.getBean("channelService"); channelService = (ChannelService) applicationContext.getBean("ChannelService");
publishingService = (PublishServiceImpl) applicationContext.getBean("publishingService"); publishingService = (PublishingService) applicationContext.getBean("PublishingService");
siteId = GUID.generate(); siteId = GUID.generate();
siteService.createSite("test", siteId, "Test site created by ChannelServiceImplIntegratedTest", siteService.createSite("test", siteId, "Test site created by ChannelServiceImplIntegratedTest",
"Test site created by PublishingIntegratedTest", SiteVisibility.PUBLIC); "Test site created by PublishingIntegratedTest", SiteVisibility.PUBLIC);