From 1e8074b637215b1081eb0a8a5d7c059c56e881f6 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 09:44:43 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 59942: Better handling of no message for tests, ALF-20739 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/forms/processor/workflow/TaskFormProcessorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java b/source/test-java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java index a298e5d4dc..8ff65bbd0d 100644 --- a/source/test-java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java +++ b/source/test-java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java @@ -246,7 +246,7 @@ public class TaskFormProcessorTest extends TestCase public void testGenerateMessage() throws Exception { - String message = null; + String message = "(No Message)"; String fieldName = MessageFieldProcessor.KEY; Form form = processForm(fieldName); checkSingleProperty(form, fieldName, message); @@ -557,7 +557,7 @@ public class TaskFormProcessorTest extends TestCase String dataKey = fieldDef.getDataKeyName(); assertEquals(expDataKey, dataKey); FieldData data = form.getFormData().getFieldData(dataKey); - if (fieldData != null) + if (fieldData != null && data != null) { assertEquals(fieldData, data.getValue()); }