Added closed folder to invalidDestinationIds data provider

This commit is contained in:
cagache
2019-05-14 09:54:16 +03:00
parent bb1e01a6cc
commit 60f8a61599

View File

@@ -87,7 +87,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
private SiteModel publicSite; private SiteModel publicSite;
private FolderModel testFolder; private FolderModel testFolder;
private RecordCategory recordCategory; private RecordCategory recordCategory;
private RecordCategoryChild recordFolder, subcategoryRecordFolder, subCategory; private RecordCategoryChild recordFolder, subcategoryRecordFolder, subCategory, closedFolder;
private UnfiledContainerChild unfiledContainerFolder; private UnfiledContainerChild unfiledContainerFolder;
@Autowired @Autowired
@@ -100,11 +100,8 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
* Invalid destination paths where in-place records can't be filed * Invalid destination paths where in-place records can't be filed
*/ */
@DataProvider (name = "invalidDestinationPaths") @DataProvider (name = "invalidDestinationPaths")
public Object[][] getInvalidDestinationPaths() throws Exception public Object[][] getInvalidDestinationPaths()
{ {
RecordCategoryChild closedFolder = createFolder(recordCategory.getId(), getRandomName("closedFolder"));
closeFolder(closedFolder.getId());
return new String[][] return new String[][]
{ {
{ "/", DESTINATION_PATH_NOT_RESOLVED_EXC}, { "/", DESTINATION_PATH_NOT_RESOLVED_EXC},
@@ -135,6 +132,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
{ getRestAPIFactory().getTransferContainerAPI().getTransferContainer(TRANSFERS_ALIAS).getId() }, { getRestAPIFactory().getTransferContainerAPI().getTransferContainer(TRANSFERS_ALIAS).getId() },
{ getContentService().getNodeRefByPath(getAdminUser().getUsername(), getAdminUser().getPassword(), "/Sites/rm/documentLibrary/Holds") }, { getContentService().getNodeRefByPath(getAdminUser().getUsername(), getAdminUser().getPassword(), "/Sites/rm/documentLibrary/Holds") },
{ recordCategory.getId() }, { recordCategory.getId() },
{ closedFolder.getId() },
{ unfiledContainerFolder.getId() }, { unfiledContainerFolder.getId() },
{ testFolder.getNodeRef() } { testFolder.getNodeRef() }
}; };
@@ -156,6 +154,8 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
subcategoryRecordFolder = createFolder(subCategory.getId(), getRandomName("recordFolder")); subcategoryRecordFolder = createFolder(subCategory.getId(), getRandomName("recordFolder"));
unfiledContainerFolder = createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS, unfiledContainerFolder = createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS,
"Unfiled Folder " + getRandomAlphanumeric(), UNFILED_RECORD_FOLDER_TYPE); "Unfiled Folder " + getRandomAlphanumeric(), UNFILED_RECORD_FOLDER_TYPE);
closedFolder = createFolder(recordCategory.getId(), getRandomName("closedFolder"));
closeFolder(closedFolder.getId());
STEP("Create rm users with different permissions on the record category"); STEP("Create rm users with different permissions on the record category");
userFillingPermission = roleService.createCollaboratorWithRMRoleAndPermission(publicSite, recordCategory, ROLE_RM_POWER_USER, PERMISSION_FILING); userFillingPermission = roleService.createCollaboratorWithRMRoleAndPermission(publicSite, recordCategory, ROLE_RM_POWER_USER, PERMISSION_FILING);