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

REPO-4705: Allow to reconfigure server URI (#2)

Browse Source
This commit is contained in:
Alex Mukha
2019-10-16 11:33:12 +01:00
committed by GitHub
parent 612b65798e
commit 3c818df7f1
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java
View File

@@ -132,10 +132,9 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
public void initializeRequestSpecBuilder() public void initializeRequestSpecBuilder()
{ {
requestSpecBuilder = new RequestSpecBuilder(); requestSpecBuilder = new RequestSpecBuilder();
RestAssured.baseURI = restProperties.envProperty().getTestServerUrl(); configureServerEndpoint(
RestAssured.port = restProperties.envProperty().getPort(); restProperties.envProperty().getTestServerUrl(),
configureRequestSpec().setBaseUri(restProperties.envProperty().getTestServerUrl()); restProperties.envProperty().getPort());
configureRequestSpec().setPort(restProperties.envProperty().getPort());
} }
/** /**
@@ -1092,17 +1091,26 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
public void configureSyncServiceEndPoint() public void configureSyncServiceEndPoint()
{ {
RestAssured.baseURI = restProperties.envProperty().getSyncServerUrl(); configureServerEndpoint(
RestAssured.port = restProperties.envProperty().getSyncPort(); restProperties.envProperty().getSyncServerUrl(),
configureRequestSpec().setBaseUri(restProperties.envProperty().getSyncServerUrl()); restProperties.envProperty().getSyncPort());
configureRequestSpec().setPort(restProperties.envProperty().getSyncPort());
} }
public void configureSolrEndPoint() public void configureSolrEndPoint()
{ {
RestAssured.baseURI = restProperties.envProperty().getSolrServerUrl(); configureServerEndpoint(
RestAssured.port = restProperties.envProperty().getSolrPort(); restProperties.envProperty().getSolrServerUrl(),
configureRequestSpec().setBaseUri(restProperties.envProperty().getSolrServerUrl()); restProperties.envProperty().getSolrPort());
configureRequestSpec().setPort(restProperties.envProperty().getSolrPort()); }
/**
* @param baseURI String of format http://127.0.0.1 without port
*/
public void configureServerEndpoint(String baseURI, int port)
{
RestAssured.baseURI = baseURI;
RestAssured.port = port;
configureRequestSpec().setBaseUri(baseURI);
configureRequestSpec().setPort(port);
} }
} }