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
This commit is contained in:
Erik Winlof
2014-09-03 12:19:55 +00:00
parent c532a2288d
commit ddef482f7e

View File

@@ -159,14 +159,14 @@ public class WorkflowFormProcessorTest extends TestCase
String fieldName = PRIORITY_NAME.toPrefixString(namespaceService); String fieldName = PRIORITY_NAME.toPrefixString(namespaceService);
List<String> fields = Arrays.asList(fieldName); List<String> fields = Arrays.asList(fieldName);
Form form = processForm(fields); Form form = processForm(fields);
checkSingleProperty(form, fieldName, "2"); checkSingleProperty(form, fieldName, 2);
// Check Status field is added to Form, when explicitly typed as a // Check Status field is added to Form, when explicitly typed as a
// property. // property.
String fullPropertyName = "prop:" + fieldName; String fullPropertyName = "prop:" + fieldName;
fields = Arrays.asList(fullPropertyName); fields = Arrays.asList(fullPropertyName);
form = processForm(fields); form = processForm(fields);
checkSingleProperty(form, fieldName, "2"); checkSingleProperty(form, fieldName, 2);
checkPackageActionGroups(form.getFormData()); checkPackageActionGroups(form.getFormData());
} }
@@ -194,7 +194,7 @@ public class WorkflowFormProcessorTest extends TestCase
String priorityField = PRIORITY_NAME.toPrefixString(namespaceService); String priorityField = PRIORITY_NAME.toPrefixString(namespaceService);
List<String> fields = Arrays.asList(fakeFieldName, priorityField); List<String> fields = Arrays.asList(fakeFieldName, priorityField);
Form form = processForm(fields); Form form = processForm(fields);
checkSingleProperty(form, priorityField, "2"); checkSingleProperty(form, priorityField, 2);
checkPackageActionGroups(form.getFormData()); checkPackageActionGroups(form.getFormData());
} }
@@ -219,7 +219,7 @@ public class WorkflowFormProcessorTest extends TestCase
FormData formData = form.getFormData(); FormData formData = form.getFormData();
assertEquals(fieldData, formData.getFieldData("assoc_bpm_assignee").getValue()); assertEquals(fieldData, formData.getFieldData("assoc_bpm_assignee").getValue());
checkPackageActionGroups(formData); checkPackageActionGroups(formData);
assertEquals("2", formData.getFieldData("prop_bpm_workflowPriority").getValue()); assertEquals(2, formData.getFieldData("prop_bpm_workflowPriority").getValue());
} }
public void testGeneratePackageItems() throws Exception public void testGeneratePackageItems() throws Exception