From 798f24963d696eb49b6ec4f905c68a07d1ffc451 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 2 Apr 2014 20:06:48 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 64839: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud) 64771: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66200 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 e7f457fdb6..51c402a0d7 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingTestHelper.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingTestHelper.java @@ -165,6 +165,7 @@ public class PublishingTestHelper { reset(channelType); when(channelType.getId()).thenReturn(channelTypeId); + when(channelType.getTitle()).thenReturn(channelTypeId); } else {