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

Removed the siteId from all PublishingService and ChannelService methods. These services are no longer tied to a Share site.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-07-21 16:10:17 +00:00
parent dd7facf14a
commit 2c3c17229b
35 changed files with 778 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
source/java/org/alfresco/repo/publishing/EnvironmentImplTest.java
View File

@@ -19,86 +19,71 @@
package org.alfresco.repo.publishing;
import java.util.Calendar;
import java.util.Map;
import javax.annotation.Resource;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.publishing.MutablePublishingPackage;
import org.alfresco.service.cmr.publishing.NodePublishStatus;
import org.alfresco.service.cmr.publishing.NodePublishStatus.Status;
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.repository.NodeRef;
import org.alfresco.util.GUID;
import org.junit.Test;
/**
* @author Nick Smith
* @since 4.0
*
*/
public class EnvironmentImplTest extends AbstractPublishingIntegrationTest
public class EnvironmentImplTest //extends AbstractPublishingIntegrationTest
{
private Channel channel1;
private Channel channel2;
@Resource(name="channelService")
private ChannelService channelService;
@Test
public void testCheckPublishStatus()
{
NodeRef first = fileFolderService.create(docLib, "first", ContentModel.TYPE_CONTENT).getNodeRef();
NodeRef second = fileFolderService.create(docLib, "second", ContentModel.TYPE_CONTENT).getNodeRef();
Map<NodeRef, NodePublishStatus> results = environment.checkPublishStatus(channel1.getId(), first);
assertEquals(1, results.size());
checkNodeStatus(first, Status.NOT_PUBLISHED, results);
// Schedule first Node for publishing.
Calendar schedule = Calendar.getInstance();
schedule.add(Calendar.YEAR, 1);
MutablePublishingPackage pckg =queue.createPublishingPackage();
pckg.addNodesToPublish(first);
queue.scheduleNewEvent(pckg, channel1.getId(), schedule, null, null);
results = environment.checkPublishStatus(channel1.getId(), first, second);
assertEquals(2, results.size());
checkNodeStatus(first, Status.ON_QUEUE, results);
checkNodeStatus(second, Status.NOT_PUBLISHED, results);
results = environment.checkPublishStatus(channel2.getId(), first, second);
assertEquals(2, results.size());
checkNodeStatus(first, Status.NOT_PUBLISHED, results);
checkNodeStatus(second, Status.NOT_PUBLISHED, results);
}
private void checkNodeStatus(NodeRef node, Status expStatus, Map<NodeRef, NodePublishStatus> results)
{
NodePublishStatus nodeStatus = results.get(node);
assertEquals(node, nodeStatus.getNodeRef());
assertEquals(expStatus, nodeStatus.getStatus());
}
/**
* {@inheritDoc}
*/
@Override
public void onSetUp() throws Exception
{
super.onSetUp();
channelService = (ChannelServiceImpl) getApplicationContext().getBean("channelService");
ChannelType channelType = mockChannelType();
if (channelService.getChannelType(channelType.getId()) == null)
{
channelService.register(channelType);
}
this.channel1 = channelService.createChannel(siteId, channelTypeId, GUID.generate(), null);
this.channel2 = channelService.createChannel(siteId, channelTypeId, GUID.generate(), null);
}
// private Channel channel1;
// private Channel channel2;
//
// @Resource(name="channelService")
// private ChannelService channelService;
//
// @Test
// public void testCheckPublishStatus()
// {
// NodeRef first = fileFolderService.create(docLib, "first", ContentModel.TYPE_CONTENT).getNodeRef();
// NodeRef second = fileFolderService.create(docLib, "second", ContentModel.TYPE_CONTENT).getNodeRef();
//
// Map<NodeRef, NodePublishStatus> results = environment.checkPublishStatus(channel1.getId(), first);
// assertEquals(1, results.size());
// checkNodeStatus(first, Status.NOT_PUBLISHED, results);
//
// // Schedule first Node for publishing.
// Calendar schedule = Calendar.getInstance();
// schedule.add(Calendar.YEAR, 1);
// MutablePublishingPackage pckg =queue.createPublishingPackage();
// pckg.addNodesToPublish(first);
// queue.scheduleNewEvent(pckg, channel1.getId(), schedule, null, null);
//
// results = environment.checkPublishStatus(channel1.getId(), first, second);
// assertEquals(2, results.size());
// checkNodeStatus(first, Status.ON_QUEUE, results);
// checkNodeStatus(second, Status.NOT_PUBLISHED, results);
//
// results = environment.checkPublishStatus(channel2.getId(), first, second);
// assertEquals(2, results.size());
// checkNodeStatus(first, Status.NOT_PUBLISHED, results);
// checkNodeStatus(second, Status.NOT_PUBLISHED, results);
// }
//
// private void checkNodeStatus(NodeRef node, Status expStatus, Map<NodeRef, NodePublishStatus> results)
// {
// NodePublishStatus nodeStatus = results.get(node);
// assertEquals(node, nodeStatus.getNodeRef());
// assertEquals(expStatus, nodeStatus.getStatus());
// }
//
// /**
// * {@inheritDoc}
// */
// @Override
// public void onSetUp() throws Exception
// {
// super.onSetUp();
// channelService = (ChannelServiceImpl) getApplicationContext().getBean("channelService");
//
// ChannelType channelType = mockChannelType();
// if (channelService.getChannelType(channelType.getId()) == null)
// {
// channelService.register(channelType);
// }
// this.channel1 = channelService.createChannel(channelTypeId, GUID.generate(), null);
// this.channel2 = channelService.createChannel(channelTypeId, GUID.generate(), null);
// }
}