From 30569e3339a5d74864b4061a506de1a490f3c0b7 Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Tue, 20 Sep 2016 11:41:20 +0300 Subject: [PATCH 1/2] RM-3993: fixed integration test --- .../test/integration/issue/RM3993Test.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java index cefa23a8a0..9a635533d5 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java @@ -31,6 +31,8 @@ import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.FileToAction; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; @@ -187,8 +189,22 @@ public class RM3993Test extends BaseRMTestCase throw exception; } - List allContained = filePlanService.getAllContained(nodeRefCategory1, true); - assertTrue(allContained.size() == 2002); + Integer numberOfRecords = AuthenticationUtil.runAsSystem(new RunAsWork() + { + + @Override + public Integer doWork() throws Exception + { + List containedRecordFolders = filePlanService.getContainedRecordFolders(nodeRefCategory1); + int numberOfRecords = 0; + for(NodeRef recordFolder : containedRecordFolders) + { + numberOfRecords = numberOfRecords + fileFolderService.list(recordFolder).size(); + } + return numberOfRecords; + } + }); + assertTrue(numberOfRecords == 2000); } private NodeRef createFile(NodeRef parentNodeRef, String name, String descrption, QName typeQName) From 4386673eb7a01475d5bd0e28327856f0cd06bf9b Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Tue, 20 Sep 2016 14:29:01 +0300 Subject: [PATCH 2/2] RM-3993: change after review --- .../test/integration/issue/RM3993Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java index 9a635533d5..3a03eb3f23 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java @@ -204,7 +204,7 @@ public class RM3993Test extends BaseRMTestCase return numberOfRecords; } }); - assertTrue(numberOfRecords == 2000); + assertTrue(numberOfRecords == NUMBER_OF_BATCHES * NUMBER_IN_BATCH); } private NodeRef createFile(NodeRef parentNodeRef, String name, String descrption, QName typeQName)