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

59028: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58961: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.
      In PublishingTestHelper.mockChannelType(String) was added: when(channelType.getTitle()).thenReturn(channelTypeId).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:41:59 +00:00
parent b7edcb4e99
commit 015d229618

View File

@@ -170,6 +170,7 @@ public class PublishingTestHelper
{ {
channelType = mock(AbstractChannelType.class); channelType = mock(AbstractChannelType.class);
when(channelType.getId()).thenReturn(channelTypeId); when(channelType.getId()).thenReturn(channelTypeId);
when(channelType.getTitle()).thenReturn(channelTypeId);
channelService.register(channelType); channelService.register(channelType);
} }
when(channelType.getChannelNodeType()).thenReturn(TYPE_DELIVERY_CHANNEL); when(channelType.getChannelNodeType()).thenReturn(TYPE_DELIVERY_CHANNEL);