From 8aeaf9192627483299b3e280f06e03852dc23a0c Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Tue, 21 May 2019 12:39:46 +0100 Subject: [PATCH] RM-6792 review - change unfiled folder to container --- .../record/RecordServiceImpl.java | 3 ++- .../record/RecordServiceImplUnitTest.java | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java index 4e4f9740d0..868cfbee95 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java @@ -917,7 +917,8 @@ public class RecordServiceImpl extends BaseBehaviourBean { final QName nodeType = nodeService.getType(newRecordContainer); if(!(nodeType.equals(RecordsManagementModel.TYPE_RECORD_FOLDER) || - nodeType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER))) + nodeType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER) || + nodeType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER))) { throw new AlfrescoRuntimeException("Unable to create record, because container is not a valid type for new record."); } diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java index 5574d1a1ae..43a717d4b3 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java @@ -73,6 +73,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest private NodeRef nonStandardFilePlanComponent; private NodeRef nonStandardFilePlan; private NodeRef dmNodeRef; + private NodeRef unfiledRecordContainer; private NodeRef unfiledRecordFolder; private ChildAssociationRef parentAssoc; @@ -91,6 +92,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest nonStandardFilePlanComponent = generateNodeRef(TYPE_RECORD_CATEGORY); nonStandardFilePlan = generateNodeRef(TYPE_MY_FILE_PLAN); dmNodeRef = generateNodeRef(TYPE_CONTENT); + unfiledRecordContainer = generateNodeRef(TYPE_UNFILED_RECORD_CONTAINER); unfiledRecordFolder = generateNodeRef(TYPE_UNFILED_RECORD_FOLDER); parentAssoc = mock(ChildAssociationRef.class); @@ -483,12 +485,12 @@ public class RecordServiceImplUnitTest extends BaseUnitTest mocksForRecordCreation(); // create the record - recordService.createRecord(nonStandardFilePlan, dmNodeRef); + recordService.createRecord(filePlan, dmNodeRef); // verify record was created in unfiled record container verify(mockedNodeService, times(1)).moveNode( dmNodeRef, - unfiledRecordFolder, + unfiledRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName()); } @@ -504,12 +506,12 @@ public class RecordServiceImplUnitTest extends BaseUnitTest mocksForRecordCreation(); // create the record - recordService.createRecord(filePlan, dmNodeRef, unfiledRecordFolder); + recordService.createRecord(filePlan, dmNodeRef, unfiledRecordContainer); // verify record was created in specified unfiled record container verify(mockedNodeService, times(1)).moveNode( dmNodeRef, - unfiledRecordFolder, + unfiledRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName()); } @@ -566,7 +568,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest doNothing().when(recordService).invokeBeforeRecordDeclaration(dmNodeRef); doNothing().when(recordService).invokeOnRecordDeclaration(dmNodeRef); - when(mockedFilePlanService.getUnfiledContainer(nonStandardFilePlan)).thenReturn(unfiledRecordFolder); + when(mockedFilePlanService.getUnfiledContainer(filePlan)).thenReturn(unfiledRecordContainer); when(mockedVersionService.getVersionHistory(dmNodeRef)).thenReturn(null); }