From 3c818df7f149b7400fe0e8364bedfbe44545e98e Mon Sep 17 00:00:00 2001
From: Alex Mukha <killerboot@users.noreply.github.com>
Date: Wed, 16 Oct 2019 11:33:12 +0100
Subject: [PATCH] REPO-4705: Allow to reconfigure server URI (#2)

---
 .../org/alfresco/rest/core/RestWrapper.java   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java
index 8b73c5f072..24a9415056 100644
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java
@@ -132,10 +132,9 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
     public void initializeRequestSpecBuilder()
     {
         requestSpecBuilder = new RequestSpecBuilder();
-        RestAssured.baseURI = restProperties.envProperty().getTestServerUrl();
-        RestAssured.port = restProperties.envProperty().getPort();
-        configureRequestSpec().setBaseUri(restProperties.envProperty().getTestServerUrl());
-        configureRequestSpec().setPort(restProperties.envProperty().getPort());
+        configureServerEndpoint(
+                restProperties.envProperty().getTestServerUrl(),
+                restProperties.envProperty().getPort());
     }
 
     /**
@@ -1092,17 +1091,26 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
     public void configureSyncServiceEndPoint()
     {
-        RestAssured.baseURI = restProperties.envProperty().getSyncServerUrl();
-        RestAssured.port = restProperties.envProperty().getSyncPort();
-        configureRequestSpec().setBaseUri(restProperties.envProperty().getSyncServerUrl());
-        configureRequestSpec().setPort(restProperties.envProperty().getSyncPort());
+        configureServerEndpoint(
+                restProperties.envProperty().getSyncServerUrl(),
+                restProperties.envProperty().getSyncPort());
     }
 
     public void configureSolrEndPoint()
     {
-        RestAssured.baseURI = restProperties.envProperty().getSolrServerUrl();
-        RestAssured.port = restProperties.envProperty().getSolrPort();
-        configureRequestSpec().setBaseUri(restProperties.envProperty().getSolrServerUrl());
-        configureRequestSpec().setPort(restProperties.envProperty().getSolrPort());
+        configureServerEndpoint(
+                restProperties.envProperty().getSolrServerUrl(),
+                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);
     }
 }
\ No newline at end of file