From cd02df033af6bd0266a315ad984f1abee7de34dd Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 00:27:25 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    58885:
 Tweaking the tests and handling null better

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/dictionary/types/period/PeriodTest.java  | 3 +--
 .../alfresco/repo/download/DownloadServiceIntegrationTest.java | 3 +--
 .../test-java/org/alfresco/repo/node/BaseNodeServiceTest.java  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java b/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
index da3a303dbe..e871eafa21 100644
--- a/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
@@ -28,7 +28,6 @@ import junit.framework.TestCase;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.Period;
 import org.alfresco.service.cmr.repository.PeriodProvider;
-import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.CachingDateFormat;
@@ -42,7 +41,7 @@ import org.junit.runners.MethodSorters;
  * @author andyh
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class PeriodTest extends TestCase
 {
 
diff --git a/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
index 2e0606d9d6..80382c6de5 100644
--- a/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
@@ -48,7 +48,6 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.test.junitrules.AlfrescoPerson;
 import org.alfresco.util.test.junitrules.ApplicationContextInit;
@@ -69,7 +68,7 @@ import org.junit.rules.RuleChain;
  *
  * @author Alex Miller
  */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class DownloadServiceIntegrationTest 
 {
     public static final long MAX_TIME = 5000;
diff --git a/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
index e649109f93..c83c90d716 100644
--- a/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
+++ b/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
@@ -3240,7 +3240,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
             Map<QName, Serializable> after)
     {
         behaviourExecuted = true;       
-        assertFalse(before.get(ContentModel.PROP_TITLE).toString().equals(after.get(ContentModel.PROP_TITLE).toString()));
+        assertFalse(String.valueOf(before.get(ContentModel.PROP_TITLE)).equals(String.valueOf(after.get(ContentModel.PROP_TITLE))));
         
         System.out.print("Before values: ");
         for (Map.Entry<QName, Serializable> entry : before.entrySet())