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

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

Browse Source 
99399: Fix tests to dodge leaked security contexts from other tests in the suite and handle MLText better (BENCH-369)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-16 13:37:24 +00:00
parent 68759a226f
commit 64627b758a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/test-java/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java
View File

@@ -40,6 +40,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.MLText;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
@@ -76,6 +77,8 @@ public class FileFolderLoaderTest extends TestCase
@Override
public void setUp() throws Exception
{
// Make sure we don't get leaked threads from other tests
AuthenticationUtil.clearCurrentSecurityContext();
AuthenticationUtil.pushAuthentication();
RunAsWork<Void> setUpWork = new RunAsWork<Void>()
@@ -121,7 +124,7 @@ public class FileFolderLoaderTest extends TestCase
@Override
public void tearDown() throws Exception
{
RunAsWork<Void> setUpWork = new RunAsWork<Void>()
RunAsWork<Void> tearDownWork = new RunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
@@ -133,7 +136,7 @@ public class FileFolderLoaderTest extends TestCase
return null;
}
};
AuthenticationUtil.runAsSystem(setUpWork);
AuthenticationUtil.runAsSystem(tearDownWork);
AuthenticationUtil.popAuthentication();
}
@@ -426,12 +429,12 @@ public class FileFolderLoaderTest extends TestCase
// Check description
if (lastDescr == null)
{
lastDescr = (String) nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION);
lastDescr = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION));
assertEquals("cm:description length is incorrect. ", 256, lastDescr.getBytes().length);
}
else
{
String currentDescr = (String) nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION);
String currentDescr = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION));
assertNotEquals("All descriptions must differ due to varying seed. ", lastDescr, currentDescr);
lastDescr = currentDescr;
}
@@ -496,12 +499,12 @@ public class FileFolderLoaderTest extends TestCase
// Check description
if (lastDescr == null)
{
lastDescr = (String) nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION);
lastDescr = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION));
assertEquals("cm:description length is incorrect. ", 256, lastDescr.getBytes().length);
}
else
{
String currentDescr = (String) nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION);
String currentDescr = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION));
assertEquals("All descriptions must be identical due to varying seed. ", lastDescr, currentDescr);
lastDescr = currentDescr;
}