From a7d55e7fe4d256549404ffec7a620924360196e4 Mon Sep 17 00:00:00 2001 From: N Smith Date: Wed, 14 Jul 2010 15:29:30 +0000 Subject: [PATCH] Fixed failing tests in TaskFormProcessorTest caused by AssociationFieldProcessor not converting the values from NodeRefs to Strings. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../forms/processor/node/AssociationFieldProcessor.java | 2 +- .../forms/processor/workflow/TaskFormProcessorTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java index 4daa908111..63d7a94f6e 100644 --- a/source/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java +++ b/source/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java @@ -72,7 +72,7 @@ public class AssociationFieldProcessor extends QNameFieldProcessor) values); } - return Collections.singletonList(values); + return Collections.singletonList(values.toString()); } private List getValues(Collection collection) diff --git a/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java b/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java index 23f51eac10..141a85620e 100644 --- a/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java +++ b/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java @@ -155,14 +155,14 @@ public class TaskFormProcessorTest extends TestCase List fields = Arrays.asList(fieldName); Form form = processForm(fields); Serializable fieldData = (Serializable) Arrays.asList(FAKE_NODE.toString()); -// checkSingleAssociation(form, fieldName, fieldData); + checkSingleAssociation(form, fieldName, fieldData); // Check Assignee field is added to Form, when explicitly typed as an // association. String fullAssociationName = "assoc:" + fieldName; fields = Arrays.asList(fullAssociationName); form = processForm(fields); -// checkSingleAssociation(form, fieldName, fieldData); + checkSingleAssociation(form, fieldName, fieldData); } public void testIgnoresUnknownFields() throws Exception @@ -187,7 +187,7 @@ public class TaskFormProcessorTest extends TestCase Serializable fieldData = (Serializable) Arrays.asList(FAKE_NODE.toString()); FormData formData = form.getFormData(); assertEquals(4, formData.getNumberOfFields()); -// assertEquals(fieldData, formData.getFieldData("assoc_bpm_assignee").getValue()); + assertEquals(fieldData, formData.getFieldData("assoc_bpm_assignee").getValue()); assertEquals(WorkflowTaskState.IN_PROGRESS, formData.getFieldData("prop_bpm_status").getValue()); }