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

Added extra checks on MLText and null values

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-08-26 12:17:34 +00:00
parent 8bfd2bdd97
commit 68a681dcfe
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,14 +121,32 @@ public class FullNodeServiceTest extends BaseNodeServiceTest
public void testNullMLText() throws Exception public void testNullMLText() throws Exception
{ {
Map<QName, Serializable> properties = nodeService.getProperties(rootNodeRef);
// Set an ML value to null // Set an ML value to null
properties.put(BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, null);
nodeService.setProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, null); nodeService.setProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, null);
// Get them again // Get them again
Serializable mlTextSer = nodeService.getProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE); Serializable mlTextSer = nodeService.getProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE);
MLText mlText = DefaultTypeConverter.INSTANCE.convert(MLText.class, mlTextSer); MLText mlText = DefaultTypeConverter.INSTANCE.convert(MLText.class, mlTextSer);
assertNull("Value returned is not null", mlText); assertNull("Value returned is not null", mlText);
// Now create an MLText object with a null entry
mlText = new MLText(null);
nodeService.setProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, null);
MLText mlTextCheck = (MLText) nodeService.getProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE);
assertNull("MLText value should have been converted to a null String", mlTextCheck);
// Do the same as ML-aware
MLPropertyInterceptor.setMLAware(true);
try
{
mlText = new MLText(null);
nodeService.setProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, null);
mlTextCheck = (MLText) nodeService.getProperty(rootNodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE);
assertEquals("MLText value was not pulled out the same as it went in", mlText, mlTextCheck);
}
finally
{
MLPropertyInterceptor.setMLAware(false); // Don't mess up the thread
}
} }
public void testMLValuesOnCreate() throws Exception public void testMLValuesOnCreate() throws Exception
@@ -335,10 +353,6 @@ public class FullNodeServiceTest extends BaseNodeServiceTest
assertEquals("First collection incorrect", 2, ((Collection)checkValues.get(0)).size()); assertEquals("First collection incorrect", 2, ((Collection)checkValues.get(0)).size());
assertEquals("Second collection incorrect", 2, ((Collection)checkValues.get(1)).size()); assertEquals("Second collection incorrect", 2, ((Collection)checkValues.get(1)).size());
} }
catch (DictionaryException e)
{
// expected
}
finally finally
{ {
try { txn.rollback(); } catch (Throwable e) {} try { txn.rollback(); } catch (Throwable e) {}