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

REPO-4250: REST API: Refactor TAS RESTAPI tests to not use CMIS

Browse Source 
- cherry-pick cd78b750c22f908e962362d9e7ebc754d206e203 from release/5.2.x to master
This commit is contained in:
Alex Mukha
2019-06-03 14:23:15 +01:00
parent 98d90b8008
commit ee3513ddc8
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/tests/tas-restapi/pom.xml
View File

@@ -28,7 +28,7 @@
<suiteXmlFile>src/main/resources/shared-resources/testCount.xml</suiteXmlFile> <suiteXmlFile>src/main/resources/shared-resources/testCount.xml</suiteXmlFile>
<maven.build.sourceVersion>11</maven.build.sourceVersion> <maven.build.sourceVersion>11</maven.build.sourceVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tas.utility.version>2.0.22</tas.utility.version> <tas.utility.version>2.0.24</tas.utility.version>
<rest-assured.version>3.3.0</rest-assured.version> <rest-assured.version>3.3.0</rest-assured.version>
<httpclient-osgi-version>4.5.2</httpclient-osgi-version> <httpclient-osgi-version>4.5.2</httpclient-osgi-version>
<json-path.version>3.3.0</json-path.version> <json-path.version>3.3.0</json-path.version>

47
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java
View File

@@ -1,34 +1,13 @@
package org.alfresco.rest.requests; package org.alfresco.rest.requests;
import java.io.File; import io.restassured.http.ContentType;
import javax.json.JsonArrayBuilder;
import org.alfresco.rest.core.JsonBodyGenerator; import org.alfresco.rest.core.JsonBodyGenerator;
import org.alfresco.rest.core.RestRequest; import org.alfresco.rest.core.RestRequest;
import org.alfresco.rest.core.RestResponse; import org.alfresco.rest.core.RestResponse;
import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.core.RestWrapper;
import org.alfresco.rest.exception.JsonToModelConversionException; import org.alfresco.rest.exception.JsonToModelConversionException;
import org.alfresco.rest.model.RestActionDefinitionModelsCollection; import org.alfresco.rest.model.*;
import org.alfresco.rest.model.RestCommentModel;
import org.alfresco.rest.model.RestCommentModelsCollection;
import org.alfresco.rest.model.RestNodeAssocTargetModel;
import org.alfresco.rest.model.RestNodeAssociationModel;
import org.alfresco.rest.model.RestNodeAssociationModelCollection;
import org.alfresco.rest.model.RestNodeBodyModel;
import org.alfresco.rest.model.RestNodeBodyMoveCopyModel;
import org.alfresco.rest.model.RestNodeChildAssocModelCollection;
import org.alfresco.rest.model.RestNodeModel;
import org.alfresco.rest.model.RestNodeModelsCollection;
import org.alfresco.rest.model.RestRatingModel;
import org.alfresco.rest.model.RestRatingModelsCollection;
import org.alfresco.rest.model.RestRenditionInfoModel;
import org.alfresco.rest.model.RestRenditionInfoModelCollection;
import org.alfresco.rest.model.RestTagModel;
import org.alfresco.rest.model.RestTagModelsCollection;
import org.alfresco.rest.model.RestVersionModel;
import org.alfresco.rest.model.RestVersionModelsCollection;
import org.alfresco.rest.model.body.RestNodeLockBodyModel; import org.alfresco.rest.model.body.RestNodeLockBodyModel;
import org.alfresco.rest.model.builder.NodesBuilder; import org.alfresco.rest.model.builder.NodesBuilder;
import org.alfresco.utility.Utility; import org.alfresco.utility.Utility;
@@ -37,7 +16,8 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.testng.reporters.Files; import org.testng.reporters.Files;
import io.restassured.http.ContentType; import javax.json.JsonArrayBuilder;
import java.io.File;
/** /**
* Declares all Rest API under the /nodes path * Declares all Rest API under the /nodes path
@@ -391,6 +371,25 @@ public class Node extends ModelRequest<Node>
restWrapper.processEmptyModel(request); restWrapper.processEmptyModel(request);
} }
/**
* Check if specified rendition exists and if not
* create node rendition using POST call on '/nodes/{nodeId}/renditions'
*
* @param renditionId id of rendition to be created
* @return
* @throws Exception
*/
public void createNodeRenditionIfNotExists(String renditionId) throws Exception
{
getNodeRendition(renditionId);
if (HttpStatus.OK.toString().equals(restWrapper.getStatusCode()))
{
String postBody = JsonBodyGenerator.keyValueJson("id", renditionId);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/renditions", repoModel.getNodeRef());
restWrapper.processEmptyModel(request);
}
}
/** /**
* Get node rendition using GET call on '/nodes/{nodeId}/renditions/{renditionId} * Get node rendition using GET call on '/nodes/{nodeId}/renditions/{renditionId}
* *