update tests according to the latest changes

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();
+    }
 }

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:
+     * <ul>
+     *  <li>{@code fileplanComponentId} is not a valid format</li>
+     *  <li>authentication fails</li>
+     *  <li>{@code fileplanComponentId} does not exist</li>
+     *</ul>
+     */
+    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}

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 <http://www.gnu.org/licenses/>.
  * #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<FilePlanComponentAPI>
+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<FilePlanComponentAPI>
     public <T> 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<FilePlanComponentAPI>
     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);
     }
 }

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 <code>records/...</code> API path
+     *
+     * @return {@link FilePlanComponentAPI}
+     */
+    public RecordsAPI usingRecords()
+    {
+        return new RecordsAPI(getRMRestWrapper());
+    }
 }