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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2014-02-12 00:27:25 +00:00
parent 995821ee71
commit cd02df033a
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
View File

@@ -28,7 +28,6 @@ import junit.framework.TestCase;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.Period;
import org.alfresco.service.cmr.repository.PeriodProvider; import org.alfresco.service.cmr.repository.PeriodProvider;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.CachingDateFormat; import org.alfresco.util.CachingDateFormat;
@@ -42,7 +41,7 @@ import org.junit.runners.MethodSorters;
* @author andyh * @author andyh
*/ */
@FixMethodOrder(MethodSorters.NAME_ASCENDING) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@Category(BaseSpringTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class PeriodTest extends TestCase public class PeriodTest extends TestCase
{ {

3
source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
View File

@@ -48,7 +48,6 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.test.junitrules.AlfrescoPerson; import org.alfresco.util.test.junitrules.AlfrescoPerson;
import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.alfresco.util.test.junitrules.ApplicationContextInit;
@@ -69,7 +68,7 @@ import org.junit.rules.RuleChain;
* *
* @author Alex Miller * @author Alex Miller
*/ */
@Category(BaseSpringTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class DownloadServiceIntegrationTest public class DownloadServiceIntegrationTest
{ {
public static final long MAX_TIME = 5000; public static final long MAX_TIME = 5000;

2
source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
View File

@@ -3240,7 +3240,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
Map<QName, Serializable> after) Map<QName, Serializable> after)
{ {
behaviourExecuted = true; 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: "); System.out.print("Before values: ");
for (Map.Entry<QName, Serializable> entry : before.entrySet()) for (Map.Entry<QName, Serializable> entry : before.entrySet())