From c8e47639a338bc499b540e6818742512308888f8 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Wed, 17 May 2017 16:04:54 +0300 Subject: [PATCH] RM-5012 - fix unit tests and cleanedup merge request --- .../UnfiledContainerTests.java | 26 +++++++++---------- .../action/RMActionExecuterAbstractBase.java | 2 +- .../record/RecordServiceImpl.java | 16 ------------ .../api/impl/FilePlanComponentsApiUtils.java | 14 +++++----- .../disposition/MultipleSchedulesTest.java | 3 --- .../UpdateDispositionScheduleTest.java | 1 - .../record/InplaceRecordPermissionTest.java | 4 +-- .../rma/type/RecordFolderTypeUnitTest.java | 7 +++++ 8 files changed, 29 insertions(+), 44 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledcontainers/UnfiledContainerTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledcontainers/UnfiledContainerTests.java index 4d5b73daac..7bc5ac302d 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledcontainers/UnfiledContainerTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledcontainers/UnfiledContainerTests.java @@ -406,23 +406,23 @@ public class UnfiledContainerTests extends BaseRMRestTest @Test(description = "Create a record with custom record identifier in unfiled container") public void createRecordWithCustomIdentifier() throws Exception { - String recordName = "customIdRecord-" + getRandomAlphanumeric(); - String customIdentifier = "customId"; - RecordProperties propertiesModel = RecordProperties.builder().identifier(customIdentifier).build(); + String recordName = "customIdRecord-" + getRandomAlphanumeric(); + String customIdentifier = "customId"; + RecordProperties propertiesModel = RecordProperties.builder().identifier(customIdentifier).build(); - UnfiledContainerChild childModel = UnfiledContainerChild.builder() - .name(recordName) - .nodeType(CONTENT_TYPE) - .properties(UnfiledContainerChildProperties.builder() + UnfiledContainerChild childModel = UnfiledContainerChild.builder() + .name(recordName) + .nodeType(CONTENT_TYPE) + .properties(UnfiledContainerChildProperties.builder() .identifier(customIdentifier) .build()) - .build(); + .build(); - UnfiledContainerChild child = getRestAPIFactory().getUnfiledContainersAPI().createUnfiledContainerChild(childModel, UNFILED_RECORDS_CONTAINER_ALIAS); + UnfiledContainerChild child = getRestAPIFactory().getUnfiledContainersAPI().createUnfiledContainerChild(childModel, UNFILED_RECORDS_CONTAINER_ALIAS); - assertStatusCode(HttpStatus.CREATED); - assertEquals(child.getProperties().getIdentifier(), customIdentifier); - assertEquals(child.getName(), recordName + " (" + customIdentifier + ")"); + assertStatusCode(HttpStatus.CREATED); + assertEquals(child.getProperties().getIdentifier(), customIdentifier); + assertEquals(child.getName(), recordName + " (" + customIdentifier + ")"); } @AfterMethod @@ -432,7 +432,7 @@ public class UnfiledContainerTests extends BaseRMRestTest UnfiledContainerChildCollection listedChildren = getRestAPIFactory().getUnfiledContainersAPI() .getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS); - listedChildren.getEntries().forEach(UnfiledContainerChildEntry -> + listedChildren.getEntries().forEach(UnfiledContainerChildEntry -> { if (UnfiledContainerChildEntry.getEntry().getIsRecord()) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java index 3ea22ba684..b8dc8fe9e8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java @@ -128,7 +128,7 @@ public abstract class RMActionExecuterAbstractBase extends PropertySubActionExe /** Hold service */ private HoldService holdService; - + /** Identifier service */ private IdentifierService identifierService; 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 bf566e1232..bbf8449374 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 @@ -510,22 +510,6 @@ public class RecordServiceImpl extends BaseBehaviourBean }, AuthenticationUtil.getSystemUserName()); } - @Behaviour - ( - kind = BehaviourKind.ASSOCIATION, - policy = "alf:onCreateChildAssociation", - type = "rma:recordFolder", - notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT - ) - public void onCreateChildAssociationOnCommit(ChildAssociationRef childAssocRef, boolean bNew) - { - NodeRef record = childAssocRef.getChildRef(); - if(nodeService.exists(record) && dictionaryService.isSubClass(nodeService.getType(record), ContentModel.TYPE_CONTENT)) - { - generateRecordIdentifier(nodeService, identifierService, record); - } - } - /** * @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#disablePropertyEditableCheck() */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/FilePlanComponentsApiUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/FilePlanComponentsApiUtils.java index c4552503d6..7ba7add131 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/FilePlanComponentsApiUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/FilePlanComponentsApiUtils.java @@ -617,13 +617,6 @@ public class FilePlanComponentsApiUtils QName typeQName = nodes.createQName(type); newNodeRef = fileFolderService.create(parentNodeRef, name, typeQName).getNodeRef(); - // If electronic record create empty content - if (!typeQName.equals(RecordsManagementModel.TYPE_NON_ELECTRONIC_DOCUMENT) - && dictionaryService.isSubClass(typeQName, ContentModel.TYPE_CONTENT)) - { - writeContent(newNodeRef, name, new ByteArrayInputStream("".getBytes()), false); - } - // Set the provided properties if any Map qnameProperties = mapToNodeProperties(properties); if (qnameProperties != null) @@ -631,6 +624,13 @@ public class FilePlanComponentsApiUtils nodeService.addProperties(newNodeRef, qnameProperties); } + // If electronic record create empty content + if (!typeQName.equals(RecordsManagementModel.TYPE_NON_ELECTRONIC_DOCUMENT) + && dictionaryService.isSubClass(typeQName, ContentModel.TYPE_CONTENT)) + { + writeContent(newNodeRef, name, new ByteArrayInputStream("".getBytes()), false); + } + // Add the provided aspects if any if (aspects != null) { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/MultipleSchedulesTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/MultipleSchedulesTest.java index 9babf86695..8d2b5c3c98 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/MultipleSchedulesTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/MultipleSchedulesTest.java @@ -179,7 +179,6 @@ public class MultipleSchedulesTest extends BaseRMTestCase // Create a record filed under category A and linked to category B. record = fileFolderService.create(folderA, RECORD_NAME, ContentModel.TYPE_CONTENT).getNodeRef(); - recordService.file(record); recordService.link(record, folderB); }) .when(() -> { @@ -213,7 +212,6 @@ public class MultipleSchedulesTest extends BaseRMTestCase setUpFilePlan(); // Create a record filed under category B and linked to category A. record = fileFolderService.create(folderB, RECORD_NAME, ContentModel.TYPE_CONTENT).getNodeRef(); - recordService.file(record); recordService.link(record, folderA); }) .when(() -> { @@ -245,7 +243,6 @@ public class MultipleSchedulesTest extends BaseRMTestCase setUpFilePlan(); // Create a record filed under category A and linked to category B and C. record = fileFolderService.create(folderA, RECORD_NAME, ContentModel.TYPE_CONTENT).getNodeRef(); - recordService.file(record); recordService.link(record, folderB); recordService.link(record, folderC); // Cut off the record. diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateDispositionScheduleTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateDispositionScheduleTest.java index 14636db6d8..f39da05237 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateDispositionScheduleTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateDispositionScheduleTest.java @@ -123,7 +123,6 @@ public class UpdateDispositionScheduleTest extends BaseRMTestCase // Create a folder containing a record within the category. folder = recordFolderService.createRecordFolder(category, FOLDER_NAME); record = fileFolderService.create(folder, RECORD_NAME, ContentModel.TYPE_CONTENT).getNodeRef(); - recordService.file(record); dispositionService.cutoffDisposableItem(record); // Ensure the update has been applied to the record. diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java index 2dce8cb76f..d25886dff5 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java @@ -524,9 +524,7 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase // create record folder and file record NodeRef recordFolder = recordFolderService.createRecordFolder(recordCategory, GUID.generate()); fileFolderService.move(dmDocument, recordFolder, null); - }) - .perform(() -> - { + // cut off record rmActionService.executeRecordsManagementAction(dmDocument, DeclareRecordAction.NAME); utils.completeEvent(dmDocument, CommonRMTestUtils.DEFAULT_EVENT_NAME); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderTypeUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderTypeUnitTest.java index 0e62e4c779..d460e69495 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderTypeUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderTypeUnitTest.java @@ -27,6 +27,7 @@ package org.alfresco.module.org_alfresco_module_rm.model.rma.type; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock; @@ -203,6 +204,9 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(true); when(mockedNodeService.hasAspect(nodeRef, ASPECT_HIDDEN)).thenReturn(true); + ChildAssociationRef mockedPrimaryParentAssoc = mock(ChildAssociationRef.class); + when(mockedNodeService.getPrimaryParent(nodeRef)).thenReturn(mockedPrimaryParentAssoc); + ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef); recordFolderType.onCreateChildAssociationOnCommit(childAssocRef, true); } @@ -220,6 +224,9 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(false); + ChildAssociationRef mockedPrimaryParentAssoc = mock(ChildAssociationRef.class); + when(mockedNodeService.getPrimaryParent(nodeRef)).thenReturn(mockedPrimaryParentAssoc); + ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef); recordFolderType.onCreateChildAssociationOnCommit(childAssocRef, true); }