Add eiffel-commons to integration tests (#186)

* Use eiffel-commons 0.0.6
* Replace http utils with the ones in eiffel-commons

Author: Christoffer-Cortes

pom.xml

@@ -46,6 +46,13 @@
         </plugins>
     </reporting>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -164,6 +171,12 @@
             <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
+        <!-- Eiffel Commons -->
+        <dependency>
+            <groupId>com.github.eiffel-community</groupId>
+            <artifactId>eiffel-commons</artifactId>
+            <version>0.0.6</version>
+        </dependency>
     </dependencies>
 
     <build>

src/integrationtest/java/com/ericsson/ei/frontend/CommonSteps.java

@@ -7,7 +7,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.commons.io.FileUtils;
@@ -23,16 +22,16 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.support.AbstractTestExecutionListener;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 
 import com.ericsson.ei.utils.AMQPCommunication;
-import com.ericsson.ei.utils.HttpRequest;
-import com.ericsson.ei.utils.HttpRequest.HttpMethod;
+import com.ericsson.eiffelcommons.utils.HttpRequest;
+import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
+import com.ericsson.eiffelcommons.utils.ResponseEntity;
 
 import cucumber.api.java.Before;
 import cucumber.api.java.en.Given;
@@ -47,8 +46,10 @@
 public class CommonSteps extends AbstractTestExecutionListener {
 
     @LocalServerPort
-    private int frontendPort;
-    private String frontendHost = "localhost";
+    private int frontEndPort;
+    private String frontEndHost = "localhost";
+    private String protocol = "http";
+    private String baseURL;
     private String rabbitHost;
     private int rabbitPort;
     private String rabbitUsername;
@@ -58,7 +59,7 @@ public class CommonSteps extends AbstractTestExecutionListener {
 
     private List<HttpRequest> httpRequestList = new ArrayList<>();
     private HttpRequest httpRequest;
-    private ResponseEntity<String> response;
+    private ResponseEntity response;
 
     private static final String RESOURCE_PATH = "src/integrationtest/resources/";
     private static final String BODIES_PATH = "bodies/";
@@ -67,6 +68,11 @@ public class CommonSteps extends AbstractTestExecutionListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommonSteps.class);
 
+    @Before
+    public void beforeAllScenarios() {
+        baseURL = String.format("%s://%s:%d", protocol, frontEndHost, frontEndPort);
+    }
+
     @Before("@QueryByIdScenario or @QueryFreestyleScenario")
     public void beforeQueryScenario() {
         rabbitHost = System.getProperty("rabbit.host");
@@ -79,8 +85,8 @@ public void beforeQueryScenario() {
 
     @Given("^frontend is up and running$")
     public void frontend_running() {
-        LOGGER.debug("Front-end port: {}", frontendPort);
-        assertEquals(true, frontendPort != 0);
+        LOGGER.debug("Front-end port: {}", frontEndPort);
+        assertEquals(true, frontEndPort != 0);
     }
 
     @Given("^an aggregated object is created$")
@@ -99,7 +105,7 @@ public void aggregated_object_created() throws IOException, TimeoutException {
     public void request_to_rest_api(String method, String endpoint) throws Throwable {
         LOGGER.debug("Method: {}, Endpoint: {}", method, endpoint);
         httpRequest = new HttpRequest(HttpMethod.valueOf(method));
-        httpRequest.setHost(frontendHost).setPort(frontendPort).setEndpoint(endpoint);
+        httpRequest.setBaseUrl(baseURL).setEndpoint(endpoint);
     }
 
     @When("^\'(.*)\' endpoint is set in request list at index (\\d+)$")
@@ -158,8 +164,8 @@ public void request_sent_body_not_received(int seconds, int statusCode) throws T
         long stopTime = System.currentTimeMillis() + (seconds * 1000);
         do {
             response = httpRequest.performRequest();
-        } while (response.getStatusCode().value() == statusCode && stopTime > System.currentTimeMillis());
-        assertEquals(HttpStatus.OK, response.getStatusCode());
+        } while (response.getStatusCode() == statusCode && stopTime > System.currentTimeMillis());
+        assertEquals(HttpStatus.OK.value(), response.getStatusCode());
     }
 
     @Then("^request is saved to request list at index (\\d+)$")
@@ -171,7 +177,7 @@ public void request_is_saved_to_list(int index) throws Throwable {
     @Then("^response code (\\d+) is received$")
     public void get_response_code(int statusCode) throws Throwable {
         LOGGER.debug("Response code: {}", response.getStatusCode());
-        assertEquals(HttpStatus.valueOf(statusCode), response.getStatusCode());
+        assertEquals(statusCode, response.getStatusCode());
     }
 
     @Then("^response body \'(.*)\' is received$")