inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-16 17:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixing to handle the property interceptor ML changes

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley 2007-05-29 19:07:08 +00:00
parent 21742933ec
commit aa046ff09b
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
View File

@ -1110,7 +1110,35 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
} }
/** /**
* Check that properties go in and come out in the correct format * Apply any changes to the PROP_QNAME_XXX_VALUE used for checking the following:
* <pre>
properties.put(PROP_QNAME_BOOLEAN_VALUE, true);
properties.put(PROP_QNAME_INTEGER_VALUE, 123);
properties.put(PROP_QNAME_LONG_VALUE, 123L);
properties.put(PROP_QNAME_FLOAT_VALUE, 123.0F);
properties.put(PROP_QNAME_DOUBLE_VALUE, 123.0);
properties.put(PROP_QNAME_STRING_VALUE, "123.0");
properties.put(PROP_QNAME_ML_TEXT_VALUE, new MLText("This is ML text in the default language"));
properties.put(PROP_QNAME_DATE_VALUE, new Date());
properties.put(PROP_QNAME_SERIALIZABLE_VALUE, "456");
properties.put(PROP_QNAME_NODEREF_VALUE, rootNodeRef);
properties.put(PROP_QNAME_QNAME_VALUE, TYPE_QNAME_TEST_CONTENT);
properties.put(PROP_QNAME_PATH_VALUE, pathProperty);
properties.put(PROP_QNAME_CONTENT_VALUE, new ContentData("url", "text/plain", 88L, "UTF-8"));
properties.put(PROP_QNAME_CATEGORY_VALUE, rootNodeRef);
properties.put(PROP_QNAME_LOCALE_VALUE, Locale.CHINESE);
properties.put(PROP_QNAME_NULL_VALUE, null);
properties.put(PROP_QNAME_MULTI_VALUE, listProperty);
</pre>
*/
protected void getExpectedPropertyValues(Map<QName, Serializable> checkProperties)
{
// Do nothing with them by default
}
/**
* Check that properties go in and come out in the correct format.
* @see #getCheckPropertyValues(Map)
*/ */
public void testPropertyTypes() throws Exception public void testPropertyTypes() throws Exception
{ {
@ -1139,6 +1167,9 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
properties.put(PROP_QNAME_LOCALE_VALUE, Locale.CHINESE); properties.put(PROP_QNAME_LOCALE_VALUE, Locale.CHINESE);
properties.put(PROP_QNAME_NULL_VALUE, null); properties.put(PROP_QNAME_NULL_VALUE, null);
properties.put(PROP_QNAME_MULTI_VALUE, listProperty); properties.put(PROP_QNAME_MULTI_VALUE, listProperty);
// Get the check values
Map<QName, Serializable> expectedProperties = new HashMap<QName, Serializable>(properties);
getExpectedPropertyValues(expectedProperties);
// create a new node // create a new node
NodeRef nodeRef = nodeService.createNode( NodeRef nodeRef = nodeService.createNode(
@ -1154,9 +1185,9 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
// get the properties back // get the properties back
Map<QName, Serializable> checkProperties = nodeService.getProperties(nodeRef); Map<QName, Serializable> checkProperties = nodeService.getProperties(nodeRef);
// check // check
for (QName qname : properties.keySet()) for (QName qname : expectedProperties.keySet())
{ {
Serializable value = properties.get(qname); Serializable value = expectedProperties.get(qname);
Serializable checkValue = checkProperties.get(qname); Serializable checkValue = checkProperties.get(qname);
assertEquals("Property mismatch - " + qname, value, checkValue); assertEquals("Property mismatch - " + qname, value, checkValue);
} }

12
source/java/org/alfresco/repo/node/FullNodeServiceTest.java
View File

@ -84,4 +84,16 @@ public class FullNodeServiceTest extends BaseNodeServiceTest
mlTextProperty.getValue(Locale.ENGLISH), mlTextProperty.getValue(Locale.ENGLISH),
propertiesFiltered.get(BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE)); propertiesFiltered.get(BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE));
} }
/**
* {@inheritDoc}
*
* This instance modifies the ML text value to be just the default locale string.
*/
protected void getExpectedPropertyValues(Map<QName, Serializable> checkProperties)
{
MLText mlTextValue = (MLText) checkProperties.get(PROP_QNAME_ML_TEXT_VALUE);
String strValue = mlTextValue.getDefaultValue();
checkProperties.put(PROP_QNAME_ML_TEXT_VALUE, strValue);
}
} }