inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/RM-6792_AddLocnParamToDeclareAsRec' into feature/RM-6796_DeclareAndFileTests

Browse Source
This commit is contained in:
cagache
2019-05-16 13:56:45 +03:00
parent e2162a977c 2dc992564c
commit 33ef68102e
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java
View File

@@ -213,7 +213,7 @@ public class CreateRecordAction extends AuditableActionExecuterAbstractBase
if (nodeRef == null) if (nodeRef == null)
{ {
throw new AlfrescoRuntimeException("Unable to execute " + NAME + " action, because the destination path could not be resolved."); throw new AlfrescoRuntimeException("Unable to execute " + NAME + " action, because the destination path could not be found.");
} }
else else
{ {
@@ -251,8 +251,11 @@ public class CreateRecordAction extends AuditableActionExecuterAbstractBase
// if the file plan is still null, raise an exception // if the file plan is still null, raise an exception
if (filePlan == null) if (filePlan == null)
{ {
LOGGER.debug("Unable to execute " + NAME + " action, because the fileplan path could not be determined. Make sure at least one file plan has been created."); if (LOGGER.isDebugEnabled())
throw new AlfrescoRuntimeException("Unable to execute " + NAME + " action, because the fileplan path could not be determined."); {
LOGGER.debug("Unable to execute " + NAME + " action, because the fileplan path could not be determined. Make sure at least one file plan has been created.");
throw new AlfrescoRuntimeException("Unable to execute " + NAME + " action, because the fileplan path could not be determined.");
}
} }
return filePlan; return filePlan;
} }

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -881,7 +881,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
public void createRecord(final NodeRef filePlan, final NodeRef nodeRef, final NodeRef destinationNodeRef, final boolean isLinked) public void createRecord(final NodeRef filePlan, final NodeRef nodeRef, final NodeRef destinationNodeRef, final boolean isLinked)
{ {
// filePlan can be null. In this case the default RM site will be used. // filePlan can be null. In this case the default RM site will be used.
// locationNodeRef can be null. In this case the unfiled record container will be used // destinationNodeRef can be null. In this case the unfiled record container will be used
ParameterCheck.mandatory("nodeRef", nodeRef); ParameterCheck.mandatory("nodeRef", nodeRef);
ParameterCheck.mandatory("isLinked", isLinked); ParameterCheck.mandatory("isLinked", isLinked);
@@ -909,7 +909,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
newRecordContainer = filePlanService.getUnfiledContainer(checkedFilePlan); newRecordContainer = filePlanService.getUnfiledContainer(checkedFilePlan);
if (newRecordContainer == null) if (newRecordContainer == null)
{ {
throw new AlfrescoRuntimeException("Unable to create record, because new record container could not be found."); throw new AlfrescoRuntimeException("Unable to create record, because record container could not be found.");
} }
} }
// if optional location supplied, check that it is a valid record folder // if optional location supplied, check that it is a valid record folder

18
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
View File

@@ -475,10 +475,10 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
/** /**
* Given a file that is not yet a record * Given a file that is not yet a record
* When I create the record without specifying a location * When I create the record without specifying a location
* Then the record is created in the unfiled record folder * Then the record is created in the unfiled record container
*/ */
@Test @Test
public void createRecordIntoUnfiledRecordFolder() public void createRecordIntoUnfiledRecordContainer()
{ {
mocksForRecordCreation(); mocksForRecordCreation();
@@ -495,18 +495,18 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
/** /**
* Given a file that is not yet a record * Given a file that is not yet a record
* When I create the record specifying the unfiled record folder * When I create the record specifying the unfiled record container
* Then the record is created in the unfiled record folder * Then the record is created in the unfiled record container
*/ */
@Test @Test
public void createRecordIntoSpecifiedUnfiledRecordFolder() public void createRecordIntoSpecifiedUnfiledRecordContainer()
{ {
mocksForRecordCreation(); mocksForRecordCreation();
// create the record // create the record
recordService.createRecord(nonStandardFilePlan, dmNodeRef, unfiledRecordFolder); recordService.createRecord(filePlan, dmNodeRef, unfiledRecordFolder);
// verify record was created in specified record folder // verify record was created in specified unfiled record container
verify(mockedNodeService, times(1)).moveNode( verify(mockedNodeService, times(1)).moveNode(
dmNodeRef, dmNodeRef,
unfiledRecordFolder, unfiledRecordFolder,
@@ -525,7 +525,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
mocksForRecordCreation(); mocksForRecordCreation();
// create the record // create the record
recordService.createRecord(nonStandardFilePlan, dmNodeRef, recordFolder); recordService.createRecord(filePlan, dmNodeRef, recordFolder);
// verify record was created in specified record folder // verify record was created in specified record folder
verify(mockedNodeService, times(1)).moveNode( verify(mockedNodeService, times(1)).moveNode(
@@ -547,7 +547,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
NodeRef recordCategory = generateNodeRef(TYPE_RECORD_CATEGORY); NodeRef recordCategory = generateNodeRef(TYPE_RECORD_CATEGORY);
// create the record // create the record
recordService.createRecord(nonStandardFilePlan, dmNodeRef, recordCategory); recordService.createRecord(filePlan, dmNodeRef, recordCategory);
} }
/* Helper method to set up the mocks for record creation */ /* Helper method to set up the mocks for record creation */