RM-4405: renamed valid containers data provider

This commit is contained in:
Kristijan Conkas
2016-12-09 15:43:56 +00:00
parent d69d46c76a
commit 0c8640be7e
3 changed files with 7 additions and 7 deletions

View File

@@ -102,8 +102,8 @@ public class BaseRestTest extends RestTest
public static final String RM_DESCRIPTION = "Records Management Site"; public static final String RM_DESCRIPTION = "Records Management Site";
/** Valid root containers where electronic and non-electronic records can be created */ /** Valid root containers where electronic and non-electronic records can be created */
@DataProvider(name = "validContainers") @DataProvider(name = "validRootContainers")
public Object[][] rootContainers() throws Exception { public Object[][] getValidRootContainers() throws Exception {
return new Object[][] { return new Object[][] {
// an arbitrary record folder // an arbitrary record folder
{ createCategoryFolderInFilePlan(dataUser.getAdminUser(), FILE_PLAN_ALIAS.toString()) }, { createCategoryFolderInFilePlan(dataUser.getAdminUser(), FILE_PLAN_ALIAS.toString()) },

View File

@@ -164,7 +164,7 @@ public class ElectronicRecordTests extends BaseRestTest
*/ */
@Test @Test
( (
dataProvider = "validContainers", dataProvider = "validRootContainers",
description = "Electronic record can only be created if all mandatory properties are given" description = "Electronic record can only be created if all mandatory properties are given"
) )
public void canCreateElectronicRecordOnlyWithMandatoryProperties(FilePlanComponent container) throws Exception public void canCreateElectronicRecordOnlyWithMandatoryProperties(FilePlanComponent container) throws Exception
@@ -209,7 +209,7 @@ public class ElectronicRecordTests extends BaseRestTest
*/ */
@Test @Test
( (
dataProvider = "validContainers", dataProvider = "validRootContainers",
description = "Electronic records can be created in unfiled record folder or unfiled record root" description = "Electronic records can be created in unfiled record folder or unfiled record root"
) )
public void canCreateElectronicRecordsInValidContainers(FilePlanComponent container) throws Exception public void canCreateElectronicRecordsInValidContainers(FilePlanComponent container) throws Exception

View File

@@ -138,7 +138,7 @@ public class NonElectronicRecordTests extends BaseRestTest
*/ */
@Test @Test
( (
dataProvider = "validContainers", dataProvider = "validRootContainers",
description = "Non-electronic records can be created in valid containers" description = "Non-electronic records can be created in valid containers"
) )
public void canCreateInValidContainers(FilePlanComponent container) throws Exception public void canCreateInValidContainers(FilePlanComponent container) throws Exception
@@ -251,7 +251,7 @@ public class NonElectronicRecordTests extends BaseRestTest
*/ */
@Test @Test
( (
dataProvider = "validContainers", dataProvider = "validRootContainers",
description = "Non-electronic record can only be created if all mandatory properties are given" description = "Non-electronic record can only be created if all mandatory properties are given"
) )
public void allMandatoryPropertiesRequired(FilePlanComponent container) throws Exception public void allMandatoryPropertiesRequired(FilePlanComponent container) throws Exception
@@ -310,7 +310,7 @@ public class NonElectronicRecordTests extends BaseRestTest
*/ */
@Test @Test
( (
dataProvider = "validContainers", dataProvider = "validRootContainers",
description = "Non-electronic record can't be created if user doesn't have RM privileges" description = "Non-electronic record can't be created if user doesn't have RM privileges"
) )
public void cantCreateIfNoRmPrivileges(FilePlanComponent container) throws Exception public void cantCreateIfNoRmPrivileges(FilePlanComponent container) throws Exception