Add headers to response and token scenario for auth tests (#156)

Christoffer-Cortes · web-flow · commit 179fc6cfa0b3 · 2018-08-15T14:23:13.000+02:00
* Add headers to http response and add token scenario for auth tests
diff --git a/src/functionaltests/java/com/ericsson/ei/rules/RuleCheckSteps.java b/src/functionaltests/java/com/ericsson/ei/rules/RuleCheckSteps.java
@@ -111,8 +111,8 @@ public void get_request_from_REST_API_return_response_code_of_and_status_as(Stri
         HttpRequest getRequest = new HttpRequest(HttpMethod.GET);
         ResponseEntity<String> apiResponse = getRequest.setPort(applicationPort)
                 .setHost(hostName)
-                .setHeaders("content-type", "application/json")
-                .setHeaders("Accept", "application/json")
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
                 .setEndpoint(endpoint)
                 .performRequest();
         
diff --git a/src/functionaltests/java/com/ericsson/ei/subscriptions/authentication/AuthenticationSteps.java b/src/functionaltests/java/com/ericsson/ei/subscriptions/authentication/AuthenticationSteps.java
@@ -2,6 +2,7 @@
 
 import com.ericsson.ei.controller.model.GetSubscriptionResponse;
 import com.ericsson.ei.utils.FunctionalTestBase;
+import com.ericsson.ei.utils.HttpExecutor;
 import com.ericsson.ei.utils.HttpRequest;
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
 import com.ericsson.ei.utils.TestLDAPInitializer;
@@ -30,14 +31,16 @@ public class AuthenticationSteps extends FunctionalTestBase {
 
     private static final String SUBSCRIPTION = "src/functionaltests/resources/subscription_single.json";
     private static final String SUBSCRIPTION_NAME = "Subscription_Test";
+    private static final String X_AUTH_TOKEN = "X-Auth-Token";
 
     @LocalServerPort
     private int applicationPort;
     private String hostName = getHostName();
     private HttpRequest httpRequest;
     private ResponseEntity<String> response;
+    private String token;
 
-    @Before("@RESTWithCredentials,@RESTWithSession")
+    @Before("@RESTWithCredentials,@RESTWithSessionCookie")
     public void beforeScenario() throws Throwable {
         httpRequest = new HttpRequest(HttpMethod.GET);
         httpRequest.setHost(hostName).setPort(applicationPort).setEndpoint("/auth/logout");
@@ -48,6 +51,11 @@ public void beforeScenario() throws Throwable {
         httpRequest.performRequest();
     }
 
+    @Before("@RESTWithTokenId")
+    public void beforeScenarioSecond() {
+        client_is_replaced();
+    }
+
     @Given("^LDAP is activated$")
     public void ldap_is_activated() throws Throwable {
         String expectedContent = new JSONObject().put("security", true).toString();
@@ -59,7 +67,7 @@ public void ldap_is_activated() throws Throwable {
         assertEquals(expectedContent, response.getBody().toString());
     }
 
-    @When("^a (\\w+) request is prepared for REST API \"(.*)\"")
+    @When("^a (\\w+) request is prepared for REST API \"(.*)\"$")
     public void request_to_rest_api(String method, String endpoint) throws Throwable {
         switch (method) {
         case "POST":
@@ -88,7 +96,12 @@ public void request_sent() throws Throwable {
         response = httpRequest.performRequest();
     }
 
-    @Then("^response code (\\d+) is received")
+    @When("^authentication token is attached$")
+    public void auth_token_attached() throws Throwable {
+        httpRequest.addHeader(X_AUTH_TOKEN, token);
+    }
+
+    @Then("^response code (\\d+) is received$")
     public void get_response_code(int statusCode) throws Throwable {
         assertEquals(HttpStatus.valueOf(statusCode), response.getStatusCode());
     }
@@ -111,4 +124,14 @@ public void subscription_with_name_created(String check) throws Throwable {
             assertEquals(SUBSCRIPTION_NAME, subscription.getFoundSubscriptions().get(0).getSubscriptionName());
         }
     }
+
+    @Then("^authentication token is saved$")
+    public void auth_token_saved() {
+        token = response.getHeaders().getFirst(X_AUTH_TOKEN);
+    }
+
+    @Then("^client is replaced$")
+    public void client_is_replaced() {
+        HttpExecutor.getInstance().recreateHttpClient();
+    }
 }
diff --git a/src/functionaltests/java/com/ericsson/ei/subscriptions/bulk/SubscriptionBulkSteps.java b/src/functionaltests/java/com/ericsson/ei/subscriptions/bulk/SubscriptionBulkSteps.java
@@ -47,8 +47,8 @@ public void make_a_POST_request_with_list_of_subscriptions_to_the_subscription_R
         response = postRequest.setHost(hostName)
                 .setPort(port)
                 .setEndpoint(endpoint)
-                .setHeaders("content-type", "application/json")
-                .setHeaders("Accept", "application/json")
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
                 .setBody(subscriptions.toString())
                 .performRequest();
     }
@@ -61,7 +61,7 @@ public void make_a_GET_request_with_list_of_subscriptions_names_to_the_subscript
         response = getRequest.setHost(hostName)
                 .setPort(port)
                 .setEndpoint(endpoint + "/" + subscriptionsNamesList)
-                .setHeaders("Accept", "application/json")
+                .addHeader("Accept", "application/json")
                 .performRequest();
     }
 
@@ -73,7 +73,7 @@ public void make_a_DELETE_request_with_list_of_subscriptions_names_to_the_subscr
         response = deleteRequest.setHost(hostName)
                 .setPort(port)
                 .setEndpoint(endpoint + "/" + subscriptionsNamesList)
-                .setHeaders("Accept", "application/json")
+                .addHeader("Accept", "application/json")
                 .performRequest();
     }
 
@@ -85,8 +85,8 @@ public void make_a_PUT_request_with_list_of_subscriptions_to_the_subscription_RE
         response = putRequest.setHost(hostName)
                 .setPort(port)
                 .setEndpoint(endpoint)
-                .setHeaders("content-type", "application/json")
-                .setHeaders("Accept", "application/json")
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
                 .setBody(subscriptions.toString())
                 .performRequest();
     }
@@ -123,7 +123,7 @@ public void number_of_retrieved_subscriptions_using_REST_API_is(
         response = getRequest.setHost(hostName)
                 .setPort(port)
                 .setEndpoint(endpoint)
-                .setHeaders("Accept", "application/json")
+                .addHeader("Accept", "application/json")
                 .performRequest();
         retrievedSubscriptions = new JSONArray(response.getBody().toString());
         assertEquals(subscriptionsNumber, retrievedSubscriptions.length());
diff --git a/src/functionaltests/java/com/ericsson/ei/subscriptions/repeatHandler/SubscriptionRepeatHandlerSteps.java b/src/functionaltests/java/com/ericsson/ei/subscriptions/repeatHandler/SubscriptionRepeatHandlerSteps.java
@@ -117,8 +117,8 @@ public void i_make_a_DELETE_request_with_subscription_name_to_the_subscription_R
         HttpRequest deleteRequest = new HttpRequest(HttpRequest.HttpMethod.DELETE);
         ResponseEntity response = deleteRequest.setHost(getHostName())
                 .setPort(applicationPort)
-                .setHeaders("content-type", "application/json")
-                .setHeaders("Accept", "application/json")
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
                 .setEndpoint(subscriptionEndPoint + name)
                 .performRequest();
         assertEquals(HttpStatus.OK.value(), response.getStatusCodeValue());
diff --git a/src/functionaltests/java/com/ericsson/ei/utils/HttpExecutor.java b/src/functionaltests/java/com/ericsson/ei/utils/HttpExecutor.java
@@ -1,6 +1,6 @@
 package com.ericsson.ei.utils;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Header;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -10,47 +10,69 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 import java.io.IOException;
 
-
-public class HttpExecutor {
+public final class HttpExecutor {
 
     private static HttpExecutor instance;
     private CloseableHttpClient client = HttpClientBuilder.create().build();
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpExecutor.class);
 
-    private HttpExecutor() {
-        
-    }
-    
     public static HttpExecutor getInstance() {
-        if(instance == null) {
+        if (instance == null) {
             instance = new HttpExecutor();
         }
-        
+
         return instance;
     }
+
+    /**
+     * Close existing HttpClient and create a new one.
+     *
+     * @throws IOException
+     */
+    public void recreateHttpClient() {
+        if (this.client != null) {
+            try {
+                this.client.close();
+            } catch (IOException e) {
+                LOGGER.error("Error: {}", e.getMessage());
+            }
+        }
+        this.client = HttpClientBuilder.create().build();
+    }
+
     /**
      * Handle the response from a HTTP request
+     *
      * @param request
-     *      A HTTP request method, e.g. httpGet, httpPost
-     * @return ResponseEntity
-     *      containing the json content of the http response and status code from request
-     * */
+     *            A HTTP request method, e.g. httpGet, httpPost
+     * @return ResponseEntity containing the resulting body, headers and status
+     *         code from request
+     */
     public ResponseEntity<String> executeRequest(HttpRequestBase request) {
         int statusCode = HttpStatus.PROCESSING.value();
         String jsonContent = "";
+        Header[] headers = null;
 
-        try(CloseableHttpResponse httpResponse = client.execute(request)) {
-            if(httpResponse.getEntity() != null) {
-                jsonContent = StringUtils.defaultIfBlank(EntityUtils.toString(httpResponse.getEntity(), "utf-8"), "");
+        try (CloseableHttpResponse httpResponse = client.execute(request)) {
+            if (httpResponse.getEntity() != null) {
+                jsonContent = EntityUtils.toString(httpResponse.getEntity(), "utf-8");
             }
             statusCode = httpResponse.getStatusLine().getStatusCode();
-        } catch(IOException e) {
+            headers = httpResponse.getAllHeaders();
+        } catch (IOException e) {
             LOGGER.error(e.getMessage(), e);
         }
 
-        return new ResponseEntity<>(jsonContent, HttpStatus.valueOf(statusCode));
+        MultiValueMap<String, String> headersMap = new LinkedMultiValueMap<String, String>();
+        for (Header header : headers) {
+            headersMap.add(header.getName(), header.getValue());
+        }
+
+        return new ResponseEntity<>(jsonContent, headersMap, HttpStatus.valueOf(statusCode));
     }
 }
diff --git a/src/functionaltests/resources/features/authentication.feature b/src/functionaltests/resources/features/authentication.feature
@@ -1,4 +1,4 @@
-#Author: valentin.tyhonov@ericsson.com
+#Author: valentin.tyhonov@ericsson.com, christoffer.cortes.sjowall@ericsson.com
 #Keywords Summary :
 #Feature: List of scenarios.
 #Scenario: Business rule through list of steps with arguments.
@@ -35,7 +35,7 @@ Feature: Test Authentication
     Then response code 200 is received
     And subscription is created
 
-  @RESTWithSession
+  @RESTWithSessionCookie
   Scenario: Call an REST API with session credentials
     Given LDAP is activated
     When a GET request is prepared for REST API "/auth/login"
@@ -47,4 +47,21 @@ Feature: Test Authentication
     Then response code 200 is received
     When a GET request is prepared for REST API "/auth/login"
     And request is sent
+    Then response code 200 is received
+
+  @RESTWithTokenId
+  Scenario: Call an REST API with session credentials
+    Given LDAP is activated
+    When a GET request is prepared for REST API "/auth/login"
+    And request is sent
+    Then response code 401 is received
+    When a GET request is prepared for REST API "/auth/login"
+    And username "gauss" and password "password" is used as credentials
+    And request is sent
+    Then response code 200 is received
+    And authentication token is saved
+    And client is replaced
+    When a GET request is prepared for REST API "/auth/login"
+    And authentication token is attached
+    And request is sent
     Then response code 200 is received
