From 1c19e195988abcb7aa97f9f63b4d9cd1276b4eae Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Tue, 3 Oct 2017 12:13:16 +0300 Subject: [PATCH 1/2] RM-5647 - added java api functionality and some integration tests --- .../org_alfresco_module_rm/test/util/BaseRMTestCase.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java index d29d38c9dc..8d19bc0f33 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java @@ -70,6 +70,8 @@ import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.repository.ContentService; +import org.alfresco.service.cmr.repository.CopyService; +import org.alfresco.service.cmr.repository.DocumentLinkService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; @@ -147,6 +149,8 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase protected ActionService actionService; protected OwnableService ownableService; protected VersionService versionService; + protected CopyService copyService; + protected DocumentLinkService documentLinkService; /** RM Services */ protected DispositionService dispositionService; @@ -388,6 +392,8 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase actionService = (ActionService)applicationContext.getBean("ActionService"); ownableService = (OwnableService)applicationContext.getBean("OwnableService"); versionService = (VersionService)applicationContext.getBean("VersionService"); + copyService = (CopyService)applicationContext.getBean("CopyService"); + documentLinkService = (DocumentLinkService)applicationContext.getBean("DocumentLinkService"); // Get RM services dispositionService = (DispositionService)applicationContext.getBean("DispositionService"); From cbcc7c9ec7c05cf473b8d8945940ab212bea635f Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Tue, 3 Oct 2017 17:21:34 +0300 Subject: [PATCH 2/2] RM-5647 - one more integration test + some fix & refactor --- .../org_alfresco_module_rm/test/util/BaseRMTestCase.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java index 8d19bc0f33..166e87aaf3 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java @@ -70,7 +70,6 @@ import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.repository.ContentService; -import org.alfresco.service.cmr.repository.CopyService; import org.alfresco.service.cmr.repository.DocumentLinkService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -149,7 +148,6 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase protected ActionService actionService; protected OwnableService ownableService; protected VersionService versionService; - protected CopyService copyService; protected DocumentLinkService documentLinkService; /** RM Services */ @@ -392,7 +390,6 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase actionService = (ActionService)applicationContext.getBean("ActionService"); ownableService = (OwnableService)applicationContext.getBean("OwnableService"); versionService = (VersionService)applicationContext.getBean("VersionService"); - copyService = (CopyService)applicationContext.getBean("CopyService"); documentLinkService = (DocumentLinkService)applicationContext.getBean("DocumentLinkService"); // Get RM services