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
This commit is contained in:
Alan Davis
2014-02-12 09:44:43 +00:00
parent 1785ab9818
commit 1e8074b637

View File

@@ -246,7 +246,7 @@ public class TaskFormProcessorTest extends TestCase
public void testGenerateMessage() throws Exception public void testGenerateMessage() throws Exception
{ {
String message = null; String message = "(No Message)";
String fieldName = MessageFieldProcessor.KEY; String fieldName = MessageFieldProcessor.KEY;
Form form = processForm(fieldName); Form form = processForm(fieldName);
checkSingleProperty(form, fieldName, message); checkSingleProperty(form, fieldName, message);
@@ -557,7 +557,7 @@ public class TaskFormProcessorTest extends TestCase
String dataKey = fieldDef.getDataKeyName(); String dataKey = fieldDef.getDataKeyName();
assertEquals(expDataKey, dataKey); assertEquals(expDataKey, dataKey);
FieldData data = form.getFormData().getFieldData(dataKey); FieldData data = form.getFormData().getFieldData(dataKey);
if (fieldData != null) if (fieldData != null && data != null)
{ {
assertEquals(fieldData, data.getValue()); assertEquals(fieldData, data.getValue());
} }