From 015d229618a60a849144bb23e010fb2d96bb4796 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 00:41:59 +0000 Subject: [PATCH] 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 --- .../org/alfresco/repo/publishing/PublishingTestHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingTestHelper.java b/source/test-java/org/alfresco/repo/publishing/PublishingTestHelper.java index 4859caf768..e7f457fdb6 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingTestHelper.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingTestHelper.java @@ -170,6 +170,7 @@ public class PublishingTestHelper { channelType = mock(AbstractChannelType.class); when(channelType.getId()).thenReturn(channelTypeId); + when(channelType.getTitle()).thenReturn(channelTypeId); channelService.register(channelType); } when(channelType.getChannelNodeType()).thenReturn(TYPE_DELIVERY_CHANNEL);