From ba7d22e65d16fd23f2c50960ae450f74bc79a39b Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Mon, 17 Aug 2009 09:12:34 +0000 Subject: [PATCH] Build fix git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/forms/FormServiceImplTest.java | 10 ++++++---- .../org/alfresco/repo/forms/script/test_formService.js | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/repo/forms/FormServiceImplTest.java b/source/java/org/alfresco/repo/forms/FormServiceImplTest.java index 17c95ccb60..26042a0670 100644 --- a/source/java/org/alfresco/repo/forms/FormServiceImplTest.java +++ b/source/java/org/alfresco/repo/forms/FormServiceImplTest.java @@ -316,7 +316,7 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest LABEL_REFERENCES, referencesField.getLabel()); // check details of name field - assertEquals("Expecting cm:name type to be d:text", "d:text", nameField.getDataType()); + assertEquals("Expecting cm:name type to be text", "text", nameField.getDataType()); assertTrue("Expecting cm:name to be mandatory", nameField.isMandatory()); assertFalse("Expecting cm:name to be single valued", nameField.isRepeating()); @@ -332,7 +332,7 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest assertNotNull("Expecting an 'requiresMatch' constraint parameter", params.get("requiresMatch")); // check details of the addressees field - assertEquals("Expecting cm:addressees type to be d:text", "d:text", addresseesField.getDataType()); + assertEquals("Expecting cm:addressees type to be text", "text", addresseesField.getDataType()); assertFalse("Expecting cm:addressees to be mandatory", addresseesField.isMandatory()); assertTrue("Expecting cm:addressees to be multi valued", addresseesField.isRepeating()); assertNull("Expecting constraints for cm:addressees to be null", addresseesField.getConstraints()); @@ -462,7 +462,7 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest LABEL_REFERENCES, referencesField.getLabel()); // check the details of the modified field - assertEquals("Expecting cm:modified type to be d:datetime", "d:datetime", modifiedField.getDataType()); + assertEquals("Expecting cm:modified type to be datetime", "datetime", modifiedField.getDataType()); assertTrue("Expecting cm:modified to be mandatory", modifiedField.isMandatory()); assertFalse("Expecting cm:modified to be single valued", modifiedField.isRepeating()); @@ -669,7 +669,7 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest LABEL_CONTAINS, containsField.getLabel()); // check details of name field - assertEquals("Expecting cm:name type to be d:text", "d:text", nameField.getDataType()); + assertEquals("Expecting cm:name type to be text", "text", nameField.getDataType()); assertTrue("Expecting cm:name to be mandatory", nameField.isMandatory()); assertFalse("Expecting cm:name to be single valued", nameField.isRepeating()); @@ -939,9 +939,11 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest this.nodeService.hasAspect(this.document, ContentModel.ASPECT_TITLED)); // test different forms of itemId's + data.addFieldData(TypeFormProcessor.DESTINATION, this.folder.toString()); newNode = (NodeRef)this.formService.saveForm(new Item(TYPE_FORM_ITEM_KIND, "cm_content"), data); assertNotNull("Expected new node to be created using itemId cm_content", newNode); + data.addFieldData(TypeFormProcessor.DESTINATION, this.folder.toString()); newNode = (NodeRef)this.formService.saveForm(new Item(TYPE_FORM_ITEM_KIND, ContentModel.TYPE_CONTENT.toString()), data); assertNotNull("Expected new node to be created using itemId " + ContentModel.TYPE_CONTENT.toString(), newNode); } diff --git a/source/java/org/alfresco/repo/forms/script/test_formService.js b/source/java/org/alfresco/repo/forms/script/test_formService.js index b0f611799a..2fef098487 100644 --- a/source/java/org/alfresco/repo/forms/script/test_formService.js +++ b/source/java/org/alfresco/repo/forms/script/test_formService.js @@ -76,7 +76,7 @@ function testGetFormForContentNode() test.assertEquals("References", referencesField.label); // check details of name field - test.assertEquals("d:text", nameField.dataType); + test.assertEquals("text", nameField.dataType); test.assertTrue(nameField.mandatory); // Expecting cm:name to be single-valued. test.assertFalse(nameField.repeating, "nameField.repeating was not false."); @@ -93,7 +93,7 @@ function testGetFormForContentNode() test.assertNotNull(params["requiresMatch"], "params['requiresMatch'] should not be null."); // check details of the addressees field - test.assertEquals("d:text", addresseesField.dataType); + test.assertEquals("text", addresseesField.dataType); test.assertFalse(addresseesField.mandatory, "addresseesField.mandatory was not false."); // Expecting cm:addressees to be multi-valued. test.assertTrue(addresseesField.repeating); @@ -177,7 +177,7 @@ function testGetFormForFolderNode() test.assertEquals("Contains", containsField.label); // check details of name field - test.assertEquals("d:text", nameField.dataType); + test.assertEquals("text", nameField.dataType); test.assertTrue(nameField.mandatory); // Expecting cm:name to be single-valued. test.assertFalse(nameField.repeating, "nameField.repeating was not false.");