diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java index 99ff7b30ab..b899a1306a 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java @@ -28,6 +28,7 @@ package org.alfresco.rest.core; import org.alfresco.rest.rm.community.requests.igCoreAPI.FilePlanComponentAPI; import org.alfresco.rest.rm.community.requests.igCoreAPI.RMSiteAPI; +import org.alfresco.rest.rm.community.requests.igCoreAPI.RecordsAPI; import org.alfresco.rest.rm.community.requests.igCoreAPI.RestIGCoreAPI; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.model.UserModel; @@ -84,4 +85,14 @@ public class RestAPIFactory { return getRestIGCoreAPI(userModel).usingFilePlanComponents(); } + + public RecordsAPI getRecordsAPI() + { + return getRestIGCoreAPI(null).usingRecords(); + } + + public RecordsAPI getRecordsAPI(UserModel userModel) + { + return getRestIGCoreAPI(userModel).usingRecords(); + } } diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/FilePlanComponentAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/FilePlanComponentAPI.java index 2bc7350088..e0ee81edfd 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/FilePlanComponentAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/FilePlanComponentAPI.java @@ -138,8 +138,31 @@ public class FilePlanComponentAPI extends RMModelRequest return getRMRestWrapper().processModels(FilePlanComponentsCollection.class, simpleRequest( GET, - "fileplan-components/{fileplanComponentId}/children?{parameters}", - filePlanComponentId, getParameters() + "fileplan-components/{fileplanComponentId}/children", + filePlanComponentId + )); + } + + /** + * List child components of a file plan component + * @param parameters The URL parameters to add + * @param filePlanComponentId The id of the file plan component of which to get child components + * @return The {@link FilePlanComponent} for the given file plan component id + * @throws Exception for the following cases: + * + */ + public FilePlanComponentsCollection listChildComponents(String filePlanComponentId, String parameters) throws Exception + { + mandatoryString("filePlanComponentId", filePlanComponentId); + + return getRMRestWrapper().processModels(FilePlanComponentsCollection.class, simpleRequest( + GET, + "fileplan-components/{fileplanComponentId}/children?{parameters}", + filePlanComponentId,parameters )); } @@ -248,6 +271,7 @@ public class FilePlanComponentAPI extends RMModelRequest } builder.addMultiPart("filedata", recordContent, ContentType.BINARY.name()); + /* * Upload the file using RestAssured library. */ Response response = given() @@ -288,7 +312,7 @@ public class FilePlanComponentAPI extends RMModelRequest /** * Updates a file plan component * - * @param filePlanComponentModel The properties to be updated + * @param filePlanComponent The properties to be updated * @param parameters The URL parameters to add * @param filePlanComponentId The id of the file plan component which will be updated * @param returns The updated {@link FilePlanComponent} diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/RecordsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RecordsAPI.java similarity index 82% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/RecordsAPI.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RecordsAPI.java index 6843494674..07d2b5a099 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/RecordsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RecordsAPI.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.rm.community.requests; +package org.alfresco.rest.rm.community.requests.igCoreAPI; import static com.jayway.restassured.RestAssured.given; @@ -32,9 +32,10 @@ import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryString import com.jayway.restassured.response.Response; -import org.alfresco.rest.core.RestAPI; +import org.alfresco.rest.core.RMRestWrapper; import org.alfresco.rest.core.RestRequest; import org.alfresco.rest.model.RestHtmlResponse; +import org.alfresco.rest.rm.community.requests.RMModelRequest; import org.springframework.context.annotation.Scope; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; @@ -47,8 +48,16 @@ import org.springframework.stereotype.Component; */ @Component @Scope (value = "prototype") -public class RecordsAPI extends RestAPI +public class RecordsAPI extends RMModelRequest { + /** + * @param rmRestWrapper + */ + public RecordsAPI(RMRestWrapper rmRestWrapper) + { + super(rmRestWrapper); + } + /** * Get the content for the electronic record * @@ -65,13 +74,12 @@ public class RecordsAPI extends RestAPI public T getRecordContentText(String recordId) throws Exception { mandatoryString("recordId", recordId); - Response response = given().auth().basic(usingRestWrapper().getTestUser().getUsername(), usingRestWrapper().getTestUser().getPassword()) - .get("records/{recordId}/content?{parameters}", recordId, getParameters()) + Response response = given().auth().basic(getRMRestWrapper().getTestUser().getUsername(), getRMRestWrapper().getTestUser().getPassword()) + .get("records/{recordId}/content", recordId) .andReturn(); - usingRestWrapper().setStatusCode(Integer.toString(response.getStatusCode())); + getRMRestWrapper().setStatusCode(Integer.toString(response.getStatusCode())); - LOG.info("The record content is " + response.getBody().prettyPrint()); return (T) response.getBody().prettyPrint(); } @@ -91,7 +99,7 @@ public class RecordsAPI extends RestAPI public RestHtmlResponse getRecordContent(String recordId) throws Exception { mandatoryString("recordId", recordId); - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "records/{recordId}/content?{parameters}", recordId, getParameters()); - return usingRestWrapper().processHtmlResponse(request); + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "records/{recordId}/content", recordId); + return getRMRestWrapper().processHtmlResponse(request); } } diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RestIGCoreAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RestIGCoreAPI.java index 336933e39a..e582d9a8a0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RestIGCoreAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RestIGCoreAPI.java @@ -77,4 +77,14 @@ public class RestIGCoreAPI extends RMModelRequest { return new FilePlanComponentAPI(getRMRestWrapper()); } + + /** + * Provides DSL on all REST calls under records/... API path + * + * @return {@link FilePlanComponentAPI} + */ + public RecordsAPI usingRecords() + { + return new RecordsAPI(getRMRestWrapper()); + } } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java index a5e4b1825d..efa0586622 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java @@ -39,6 +39,11 @@ import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric; import static org.springframework.http.HttpStatus.CREATED; import static org.springframework.http.HttpStatus.OK; +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.nio.charset.Charset; + import org.alfresco.rest.RestTest; import org.alfresco.rest.core.RestAPIFactory; import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponent; @@ -332,7 +337,7 @@ public class BaseRMRestTest extends RestTest * @param name file name * @return {@link File} file */ - public static File createTempFile(final String name,String content) + public static File createTempFile(final String name, String content) { try { diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/ReadRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/ReadRecordTests.java index f9882804e1..ac53d2b4cb 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/ReadRecordTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/ReadRecordTests.java @@ -47,17 +47,12 @@ import static org.testng.AssertJUnit.assertTrue; import java.util.ArrayList; import java.util.NoSuchElementException; -import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.rm.community.base.BaseRestTest; +import org.alfresco.rest.rm.community.base.BaseRMRestTest; import org.alfresco.rest.rm.community.base.TestData; import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponent; import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentContent; import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentProperties; import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentsCollection; -import org.alfresco.rest.rm.community.requests.FilePlanComponentAPI; -import org.alfresco.rest.rm.community.requests.RecordsAPI; -import org.alfresco.utility.data.DataUser; -import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -68,16 +63,8 @@ import org.testng.annotations.Test; * @author Rodica Sutu * @since 2.6 */ -public class ReadRecordTests extends BaseRestTest +public class ReadRecordTests extends BaseRMRestTest { - @Autowired - private FilePlanComponentAPI filePlanComponentAPI; - @Autowired - private RecordsAPI recordsAPI; - - @Autowired - private DataUser dataUser; - String CATEGORY_NAME=TestData.CATEGORY_NAME +getRandomAlphanumeric(); String ELECTRONIC_RECORD_NAME = "Record electronic" + getRandomAlphanumeric(); @@ -107,10 +94,10 @@ public class ReadRecordTests extends BaseRestTest public Object[][] getInvalidContainersForRecords() throws Exception { return new Object[][] { - { FILE_PLAN_ALIAS.toString() }, - { TRANSFERS_ALIAS.toString() }, - { HOLDS_ALIAS.toString() }, - { createCategory(FILE_PLAN_ALIAS.toString(), CATEGORY_NAME).getId()} + { FILE_PLAN_ALIAS }, + { TRANSFERS_ALIAS }, + { HOLDS_ALIAS }, + { createCategoryFolderInFilePlan().getParentId()} }; } @Test @@ -121,33 +108,33 @@ public class ReadRecordTests extends BaseRestTest public void readRecordsFromInvalidContainers(String container) throws Exception { - filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); - FilePlanComponent electronicRecord = FilePlanComponent.builder() .name(ELECTRONIC_RECORD_NAME) .nodeType(CONTENT_TYPE.toString()) .content(FilePlanComponentContent.builder().mimeType("text/plain").build()) .build(); - FilePlanComponent nonelectronicRecord= FilePlanComponent.builder() - .properties(FilePlanComponentProperties.builder() - .description("Description") - .title("Title") - .build()) - .name(NONELECTRONIC_RECORD_NAME) - .nodeType(NON_ELECTRONIC_RECORD_TYPE.toString()) - .build(); + FilePlanComponent nonelectronicRecord = FilePlanComponent.builder() + .properties(FilePlanComponentProperties.builder() + .description("Description") + .title("Title") + .build()) + .name(NONELECTRONIC_RECORD_NAME) + .nodeType(NON_ELECTRONIC_RECORD_TYPE.toString()) + .build(); //create records - filePlanComponentAPI.createFilePlanComponent(electronicRecord,container); - filePlanComponentAPI.createFilePlanComponent(nonelectronicRecord, container); + getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(electronicRecord, container); + getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(nonelectronicRecord, container); + // List children from API - filePlanComponentAPI.withParams("where=(isFile=true)").listChildComponents(container) - //check the list returned is empty - .assertThat().entriesListIsEmpty().assertThat().paginationExist(); - // Check status code - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + getRestAPIFactory().getFilePlanComponentsAPI().listChildComponents(container, "where=(isFile=true)") + .assertThat()//check the list returned is empty + .entriesListIsEmpty().assertThat().paginationExist(); + //check response status code + assertStatusCode(OK); } + /** * Given a record * When I try to read the meta-data @@ -157,18 +144,17 @@ public class ReadRecordTests extends BaseRestTest public void readRecordMetadata() throws Exception { String RELATIVE_PATH = "/" + CATEGORY_NAME + getRandomAlphanumeric() + "/folder"; - filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); - //create the containers from the relativePath + //create the containers from the relativePath FilePlanComponent recordFolder = FilePlanComponent.builder() .name(FOLDER_NAME) .nodeType(RECORD_FOLDER_TYPE.toString()) .relativePath(RELATIVE_PATH) .build(); - String folderId = filePlanComponentAPI.createFilePlanComponent(recordFolder, FILE_PLAN_ALIAS.toString()).getId(); + String folderId = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(recordFolder, FILE_PLAN_ALIAS.toString()).getId(); //create electronic record - String recordWithContentId = filePlanComponentAPI.createElectronicRecord(electronicRecord, createTempFile(ELECTRONIC_RECORD_NAME, ELECTRONIC_RECORD_NAME), folderId).getId(); + String recordWithContentId = getRestAPIFactory().getFilePlanComponentsAPI().createElectronicRecord(electronicRecord, createTempFile(ELECTRONIC_RECORD_NAME, ELECTRONIC_RECORD_NAME), folderId).getId(); //Get the record created - FilePlanComponent recordWithContent=filePlanComponentAPI.withParams("include = "+ IS_COMPLETED).getFilePlanComponent(recordWithContentId); + FilePlanComponent recordWithContent=getRestAPIFactory().getFilePlanComponentsAPI().getFilePlanComponent(recordWithContentId, "include = "+IS_COMPLETED); //Check the metadata returned assertTrue(recordWithContent.getName().startsWith(ELECTRONIC_RECORD_NAME)); assertTrue(recordWithContent.getIsFile()); @@ -179,12 +165,12 @@ public class ReadRecordTests extends BaseRestTest assertNotNull(recordWithContent.getContent().getEncoding()); assertNotNull(recordWithContent.getContent().getMimeType()); assertNotNull(recordWithContent.getAspectNames()); - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); //create non-electronic record - String nonElectronicRecordId = filePlanComponentAPI.createFilePlanComponent(nonelectronicRecord, folderId).getId(); + String nonElectronicRecordId = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(nonelectronicRecord, folderId).getId(); //Get the record created - FilePlanComponent nonElectronicRecord = filePlanComponentAPI.withParams("include = " + IS_COMPLETED).getFilePlanComponent(nonElectronicRecordId); + FilePlanComponent nonElectronicRecord = getRestAPIFactory().getFilePlanComponentsAPI().getFilePlanComponent(nonElectronicRecordId, "include = " + IS_COMPLETED); //Check the metadata returned assertTrue(nonElectronicRecord.getName().startsWith(NONELECTRONIC_RECORD_NAME)); @@ -197,7 +183,7 @@ public class ReadRecordTests extends BaseRestTest assertNotNull(nonElectronicRecord.getContent().getMimeType()); assertNotNull(nonElectronicRecord.getAspectNames()); assertEquals(nonElectronicRecord.getProperties().getDescription(), NONELECTRONIC_RECORD_NAME); - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); } /** @@ -208,36 +194,33 @@ public class ReadRecordTests extends BaseRestTest @Test public void readRecordContent() throws Exception { - String RECORD_ELECTRONIC= "Record " + getRandomAlphanumeric(); - String RELATIVE_PATH="/"+CATEGORY_NAME+ getRandomAlphanumeric()+"/folder"; - filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); + String RECORD_ELECTRONIC = "Record " + getRandomAlphanumeric(); + String RELATIVE_PATH = "/"+CATEGORY_NAME+ getRandomAlphanumeric()+"/folder"; //create the containers from the relativePath FilePlanComponent recordFolder = FilePlanComponent.builder() .name(FOLDER_NAME) .nodeType(RECORD_FOLDER_TYPE.toString()) .relativePath(RELATIVE_PATH) .build(); - String folderId=filePlanComponentAPI.createFilePlanComponent(recordFolder,FILE_PLAN_ALIAS.toString()).getId(); + String folderId = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(recordFolder,FILE_PLAN_ALIAS.toString()).getId(); // FilePlanComponent record = FilePlanComponent.builder() .name(RECORD_ELECTRONIC) .nodeType(CONTENT_TYPE.toString()) .build(); - String recordId =filePlanComponentAPI.createElectronicRecord(record, createTempFile(RECORD_ELECTRONIC, RECORD_ELECTRONIC), folderId).getId(); + String recordId = getRestAPIFactory().getFilePlanComponentsAPI().createElectronicRecord(record, createTempFile(RECORD_ELECTRONIC, RECORD_ELECTRONIC), folderId).getId(); - recordsAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); - - assertEquals(recordsAPI.getRecordContentText(recordId),RECORD_ELECTRONIC); + assertEquals(getRestAPIFactory().getRecordsAPI().getRecordContentText(recordId),RECORD_ELECTRONIC); // Check status code - recordsAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); FilePlanComponent recordNoContent = FilePlanComponent.builder() .name(RECORD_ELECTRONIC) .nodeType(CONTENT_TYPE.toString()) .build(); - String recordNoContentId=filePlanComponentAPI.createFilePlanComponent(recordNoContent,folderId).getId(); - assertTrue(recordsAPI.getRecordContentText(recordNoContentId).toString().isEmpty()); - recordsAPI.usingRestWrapper().assertStatusCodeIs(OK); + String recordNoContentId = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(recordNoContent,folderId).getId(); + assertTrue(getRestAPIFactory().getRecordsAPI().getRecordContentText(recordNoContentId).toString().isEmpty()); + assertStatusCode(OK); } /** * Given a non-electronic record @@ -254,12 +237,12 @@ public class ReadRecordTests extends BaseRestTest .nodeType(NON_ELECTRONIC_RECORD_TYPE.toString()) .relativePath("/"+CATEGORY_NAME+getRandomAlphanumeric()+"/"+FOLDER_NAME) .build(); - filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); - String nonElectronicRecord=filePlanComponentAPI.createFilePlanComponent(record,FILE_PLAN_ALIAS.toString()).getId(); - recordsAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); - assertTrue(recordsAPI.getRecordContentText(nonElectronicRecord).toString().isEmpty()); - recordsAPI.usingRestWrapper().assertStatusCodeIs(OK); + String nonElectronicRecord= getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(record,FILE_PLAN_ALIAS.toString()).getId(); + + + assertTrue(getRestAPIFactory().getRecordsAPI().getRecordContentText(nonElectronicRecord).toString().isEmpty()); + assertStatusCode(OK); } @@ -276,9 +259,8 @@ public class ReadRecordTests extends BaseRestTest ) public void readContentFromInvalidContainers(String container) throws Exception { - recordsAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); - recordsAPI.getRecordContentText(container).toString(); - recordsAPI.usingRestWrapper().assertStatusCodeIs(BAD_REQUEST); + getRestAPIFactory().getRecordsAPI().getRecordContentText(container).toString(); + assertStatusCode(BAD_REQUEST); } /** @@ -293,7 +275,7 @@ public class ReadRecordTests extends BaseRestTest { return new Object[][] { // an arbitrary record folder - { createCategoryFolderInFilePlan(dataUser.getAdminUser(), FILE_PLAN_ALIAS.toString()).getId() }, + { createCategoryFolderInFilePlan().getId()}, // an arbitrary unfiled records folder { createUnfiledRecordsFolder(UNFILED_RECORDS_CONTAINER_ALIAS.toString(), "Unfiled Folder " + getRandomAlphanumeric()).getId() } }; @@ -308,7 +290,6 @@ public class ReadRecordTests extends BaseRestTest { final int NUMBER_OF_RECORDS = 5; //String RELATIVE_PATH = "/" + CATEGORY_NAME + getRandomAlphanumeric(); - filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); // Create Electronic Records ArrayList children = new ArrayList(); @@ -320,7 +301,7 @@ public class ReadRecordTests extends BaseRestTest .nodeType(CONTENT_TYPE.toString()) .build(); //create a child - FilePlanComponent child = filePlanComponentAPI.createElectronicRecord(record, createTempFile(ELECTRONIC_RECORD_NAME + i, ELECTRONIC_RECORD_NAME + i ), containerId); + FilePlanComponent child = getRestAPIFactory().getFilePlanComponentsAPI().createElectronicRecord(record, createTempFile(ELECTRONIC_RECORD_NAME + i, ELECTRONIC_RECORD_NAME + i ), containerId); children.add(child); } //Create NonElectronicRecords @@ -335,24 +316,22 @@ public class ReadRecordTests extends BaseRestTest .nodeType(NON_ELECTRONIC_RECORD_TYPE.toString()) .build(); //create records - FilePlanComponent child=filePlanComponentAPI.createFilePlanComponent(nonelectronicRecord, containerId); + FilePlanComponent child= getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(nonelectronicRecord, containerId); children.add(child); } - // Authenticate with admin user - RestWrapper restWrapper = filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); // List children from API FilePlanComponentsCollection apiChildren = - (FilePlanComponentsCollection) filePlanComponentAPI.listChildComponents(containerId).assertThat().entriesListIsNotEmpty(); + (FilePlanComponentsCollection) getRestAPIFactory().getFilePlanComponentsAPI().listChildComponents(containerId).assertThat().entriesListIsNotEmpty(); // Check status code - restWrapper.assertStatusCodeIs(OK); + assertStatusCode(OK); // Check listed children against created list apiChildren.getEntries().forEach(c -> { - FilePlanComponent filePlanComponent = c.getFilePlanComponent(); + FilePlanComponent filePlanComponent = c.getFilePlanComponentModel(); assertNotNull(filePlanComponent.getId()); logger.info("Checking child " + filePlanComponent.getId()); @@ -365,7 +344,7 @@ public class ReadRecordTests extends BaseRestTest .get(); // Created by - assertEquals(filePlanComponent.getCreatedByUser().getId(), dataUser.getAdminUser().getUsername()); + assertEquals(filePlanComponent.getCreatedByUser().getId(), getAdminUser().getUsername()); // Is parent Id set correctly assertEquals(filePlanComponent.getParentId(), containerId); @@ -409,47 +388,45 @@ public class ReadRecordTests extends BaseRestTest .name(NONELECTRONIC_RECORD_NAME) .nodeType(NON_ELECTRONIC_RECORD_TYPE.toString()) .build(); - filePlanComponentAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); //create records in Unfiled Container - FilePlanComponent recordElecInUnfiled = filePlanComponentAPI.createFilePlanComponent(electRecord, UNFILED_RECORDS_CONTAINER_ALIAS.toString()); - FilePlanComponent recordNonElecInUnfiled = filePlanComponentAPI.createFilePlanComponent(nonElectronic, UNFILED_RECORDS_CONTAINER_ALIAS.toString()); + FilePlanComponent recordElecInUnfiled = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(electRecord, UNFILED_RECORDS_CONTAINER_ALIAS.toString()); + FilePlanComponent recordNonElecInUnfiled = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(nonElectronic, UNFILED_RECORDS_CONTAINER_ALIAS.toString()); // List children for the electronic Record - filePlanComponentAPI.withParams("where=(isFile=true)").listChildComponents(recordElecInUnfiled.getId()) + getRestAPIFactory().getFilePlanComponentsAPI().listChildComponents(recordElecInUnfiled.getId(), "where=(isFile=true)") //check the list returned is empty .assertThat().entriesListIsEmpty().assertThat().paginationExist(); // Check status code - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); // List children for the nonElectronic Record - filePlanComponentAPI.withParams("where=(isFile=true)").listChildComponents(recordNonElecInUnfiled.getId()) + getRestAPIFactory().getFilePlanComponentsAPI().listChildComponents(recordNonElecInUnfiled.getId(), "where=(isFile=true)") //check the list returned is empty .assertThat().entriesListIsEmpty().assertThat().paginationExist(); // Check status code - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); //Update the Records objects electRecord.setRelativePath(RELATIVE_PATH); nonElectronic.setRelativePath(RELATIVE_PATH); //create records in Unfiled Container - FilePlanComponent recordElecFromRecordFolder = filePlanComponentAPI.createFilePlanComponent(electRecord, FILE_PLAN_ALIAS.toString()); - FilePlanComponent recordNonElecFromRecordFolder = filePlanComponentAPI.createFilePlanComponent(nonElectronic, FILE_PLAN_ALIAS.toString()); + FilePlanComponent recordElecFromRecordFolder = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(electRecord, FILE_PLAN_ALIAS.toString()); + FilePlanComponent recordNonElecFromRecordFolder = getRestAPIFactory().getFilePlanComponentsAPI().createFilePlanComponent(nonElectronic, FILE_PLAN_ALIAS.toString()); // List children for the electronic Record - filePlanComponentAPI.withParams("where=(isFile=true)").listChildComponents(recordElecFromRecordFolder.getId()) + getRestAPIFactory().getFilePlanComponentsAPI().listChildComponents(recordElecFromRecordFolder.getId(), "where=(isFile=true)") //check the list returned is empty .assertThat().entriesListIsEmpty().assertThat().paginationExist(); // Check status code - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); // List children for the nonElectronic Record - filePlanComponentAPI.withParams("where=(isFile=true)").listChildComponents(recordNonElecFromRecordFolder.getId()) + getRestAPIFactory().getFilePlanComponentsAPI().listChildComponents(recordNonElecFromRecordFolder.getId(), "where=(isFile=true)") //check the list returned is empty .assertThat().entriesListIsEmpty().assertThat().paginationExist(); // Check status code - filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(OK); + assertStatusCode(OK); } - }