Add timer and check for requests in query integration test (#143)

* Add timer and check for requests in query integration test

* Check for response code 204

* Minor fix

Author: Christoffer-Cortes

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

@@ -5,6 +5,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.commons.io.FileUtils;
@@ -139,6 +140,15 @@ public void request_sent() throws Throwable {
         response = httpRequest.performRequest();
     }
 
+    @When("^request is sent for (\\d+) seconds until reponse code no longer matches (\\d+)$")
+    public void request_sent_body_not_received(int seconds, int statusCode) throws Throwable {
+        long stopTime = System.currentTimeMillis() + (seconds * 1000);
+        do {
+            response = httpRequest.performRequest();
+        } while (response.getStatusCode().value() == statusCode && stopTime > System.currentTimeMillis());
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+    }
+
     @Then("^response code (\\d+) is received$")
     public void get_response_code(int statusCode) throws Throwable {
         LOGGER.debug("Response code: {}", response.getStatusCode());
@@ -163,6 +173,7 @@ public void get_response_body_from_file(String filename) throws Throwable {
     @Then("^response body contains \'(.*)\'$")
     public void response_body_contains(String contains) throws Throwable {
         LOGGER.debug("Response body: {}", response.getBody());
+        LOGGER.debug("Contains: {}", contains);
         assertEquals(true, response.getBody().contains(contains));
     }
 }

src/integrationtest/resources/bodies/subscription_single.json

@@ -35,7 +35,7 @@
         "type": "ARTIFACT_1"
       }
     ],
-    "subscriptionName": "Subscription_Test",
+    "subscriptionName": "Subscription_IT",
     "userName": "ABC"
   }
 ]

src/integrationtest/resources/bodies/subscription_single_modify.json

@@ -35,7 +35,7 @@
         "type": "ARTIFACT_1"
       }
     ],
-    "subscriptionName": "Subscription_Test",
+    "subscriptionName": "Subscription_IT",
     "userName": "ABC"
   }
 ]

src/integrationtest/resources/features/query.feature

@@ -16,8 +16,7 @@ Feature: Query test
     And an aggregated object is created
     When a 'GET' request is prepared for REST API '/queryAggregatedObject'
     And param key 'ID' with value '6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43' is added
-    And request is sent
-    Then response code 200 is received
+    And request is sent for 30 seconds until reponse code no longer matches 204
     And response body contains '6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43'
 
   @QueryFreestyleScenario
@@ -26,6 +25,5 @@ Feature: Query test
     And an aggregated object is created
     When a 'POST' request is prepared for REST API '/query'
     And body is set to file 'queryFreestyle.json'
-    And request is sent
-    Then response code 200 is received
+    And request is sent for 30 seconds until reponse code no longer matches 204
     And response body contains '6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43'

src/integrationtest/resources/features/subscriptions.feature

@@ -23,7 +23,7 @@ Feature: Subscriptions test
   Scenario: Get subscription
     Given frontend is up and running
     When a 'GET' request is prepared for REST API '/subscriptions'
-    And '/Subscription_Test' is appended to endpoint
+    And '/Subscription_IT' is appended to endpoint
     And username "gauss" and password "password" is used as credentials
     And request is sent
     Then response code 200 is received
@@ -33,7 +33,7 @@ Feature: Subscriptions test
   Scenario: Delete subscription
     Given frontend is up and running
     When a 'DELETE' request is prepared for REST API '/subscriptions'
-    And '/Subscription_Test' is appended to endpoint
+    And '/Subscription_IT' is appended to endpoint
     And username "gauss" and password "password" is used as credentials
     And request is sent
     Then response code 200 is received