From ddef482f7e7eb149035c8994d47d52198346513b Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Wed, 3 Sep 2014 12:19:55 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 78498: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 76654: MNT-10226: Web Script - Status 500 error on 'Edit Properties' page after adding 'Restrictable' aspect through CMIS 1.1 API Fix unit test failures: now webscripts return values with appropriate type, so in tests it should be compared with value of the expected type. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../processor/workflow/WorkflowFormProcessorTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java b/source/test-java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java index c21a8f6c03..0b590a28d9 100644 --- a/source/test-java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java +++ b/source/test-java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java @@ -159,14 +159,14 @@ public class WorkflowFormProcessorTest extends TestCase String fieldName = PRIORITY_NAME.toPrefixString(namespaceService); List fields = Arrays.asList(fieldName); Form form = processForm(fields); - checkSingleProperty(form, fieldName, "2"); + checkSingleProperty(form, fieldName, 2); // Check Status field is added to Form, when explicitly typed as a // property. String fullPropertyName = "prop:" + fieldName; fields = Arrays.asList(fullPropertyName); form = processForm(fields); - checkSingleProperty(form, fieldName, "2"); + checkSingleProperty(form, fieldName, 2); checkPackageActionGroups(form.getFormData()); } @@ -194,7 +194,7 @@ public class WorkflowFormProcessorTest extends TestCase String priorityField = PRIORITY_NAME.toPrefixString(namespaceService); List fields = Arrays.asList(fakeFieldName, priorityField); Form form = processForm(fields); - checkSingleProperty(form, priorityField, "2"); + checkSingleProperty(form, priorityField, 2); checkPackageActionGroups(form.getFormData()); } @@ -219,7 +219,7 @@ public class WorkflowFormProcessorTest extends TestCase FormData formData = form.getFormData(); assertEquals(fieldData, formData.getFieldData("assoc_bpm_assignee").getValue()); checkPackageActionGroups(formData); - assertEquals("2", formData.getFieldData("prop_bpm_workflowPriority").getValue()); + assertEquals(2, formData.getFieldData("prop_bpm_workflowPriority").getValue()); } public void testGeneratePackageItems() throws Exception