ADD: raw body subscription triggering (#157)

ned29 · web-flow · commit 0f5387e59261 · 2018-08-20T08:56:48.000+03:00
* ADD: raw body POST

* review fixes

* CHANGE: deprecated method
diff --git a/pom.xml b/pom.xml
@@ -241,13 +241,13 @@
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-netty</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.1</version>
         </dependency>
 
         <!-- Cucumber -->
diff --git a/src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java b/src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java
@@ -16,7 +16,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.junit.Ignore;
-import org.mockserver.client.server.MockServerClient;
+import org.mockserver.client.MockServerClient;
 import org.mockserver.integration.ClientAndServer;
 import org.mockserver.model.Format;
 import org.mockserver.model.HttpResponse;
diff --git a/src/functionaltests/java/com/ericsson/ei/subscriptions/trigger/SubscriptionTriggerSteps.java b/src/functionaltests/java/com/ericsson/ei/subscriptions/trigger/SubscriptionTriggerSteps.java
@@ -3,62 +3,60 @@
 import com.dumbster.smtp.SimpleSmtpServer;
 import com.dumbster.smtp.SmtpMessage;
 import com.ericsson.ei.utils.FunctionalTestBase;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockserver.model.HttpRequest.request;
-import static org.mockserver.model.HttpResponse.response;
-import static org.mockserver.integration.ClientAndServer.startClientAndServer;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
+import com.ericsson.ei.utils.HttpRequest;
+import cucumber.api.java.After;
+import cucumber.api.java.Before;
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.Then;
+import cucumber.api.java.en.When;
 import org.apache.commons.io.FileUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.junit.Ignore;
-import org.mockserver.client.server.MockServerClient;
+import org.mockserver.client.MockServerClient;
 import org.mockserver.integration.ClientAndServer;
 import org.mockserver.model.Format;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.RequestBuilder;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.util.SocketUtils;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
 
 @Ignore
-@AutoConfigureMockMvc
 public class SubscriptionTriggerSteps extends FunctionalTestBase {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(SubscriptionTriggerSteps.class);
+
     private static final String SUBSCRIPTION_WITH_JSON_PATH = "src/functionaltests/resources/subscription_multiple.json";
     private static final String EIFFEL_EVENTS_JSON_PATH = "src/functionaltests/resources/eiffel_events_for_test.json";
-
     private static final String REST_ENDPOINT = "/rest";
     private static final String REST_ENDPOINT_AUTH = "/rest/with/auth";
     private static final String REST_ENDPOINT_PARAMS = "/rest/with/params";
     private static final String REST_ENDPOINT_AUTH_PARAMS = "/rest/with/auth/params";
-    private static final String BASE_URL = "localhost";
+    private static final String REST_ENDPOINT_ROW_BODY = "/rest/rowBody";
 
     private List<String> subscriptionNames = new ArrayList<>();
 
+    @LocalServerPort
+    private int applicationPort;
+
     @Value("${email.sender}")
     private String sender;
 
@@ -68,20 +66,13 @@ public class SubscriptionTriggerSteps extends FunctionalTestBase {
     @Value("${spring.data.mongodb.database}")
     private String database;
 
-    @Autowired
-    private MockMvc mockMvc;
-
     @Autowired
     private JavaMailSenderImpl mailSender;
 
-    private MvcResult result;
-    private MvcResult postResult;
-    private MvcResult getResult;
     private SimpleSmtpServer smtpServer;
     private ClientAndServer restServer;
     private MockServerClient mockClient;
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SubscriptionTriggerSteps.class);
+    private ResponseEntity response;
 
     @Before("@SubscriptionTriggerScenario")
     public void beforeScenario() throws IOException {
@@ -99,12 +90,14 @@ public void afterScenario() throws IOException {
 
     @Given("^The REST API \"([^\"]*)\" is up and running$")
     public void the_REST_API_is_up_and_running(String endPoint) throws Exception {
-        RequestBuilder requestBuilder = MockMvcRequestBuilders.get(endPoint).accept(MediaType.APPLICATION_JSON);
-
-        result = mockMvc.perform(requestBuilder).andReturn();
-        LOGGER.debug("Response code from mocked REST API: " + String.valueOf(result.getResponse().getStatus()));
-
-        assertEquals(HttpStatus.OK.value(), result.getResponse().getStatus());
+        HttpRequest getRequest = new HttpRequest(HttpRequest.HttpMethod.GET);
+        response = getRequest.setHost(getHostName())
+                .setPort(applicationPort)
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
+                .setEndpoint(endPoint)
+                .performRequest();
+        assertEquals(HttpStatus.OK.value(), response.getStatusCodeValue());
     }
 
     @Given("^Subscriptions are setup using REST API \"([^\"]*)\"$")
@@ -140,7 +133,7 @@ public void wait_for_ei_to_aggregate_objects_and_trigger_subscriptions() throws
     }
 
     @Then("^Mail subscriptions were triggered$")
-    public void check_mail_subscriptions_were_triggered() throws Throwable {
+    public void check_mail_subscriptions_were_triggered() {
         LOGGER.debug("Verifying received emails.");
         List<SmtpMessage> emails = smtpServer.getReceivedEmails();
         assert (emails.size() > 0);
@@ -149,28 +142,26 @@ public void check_mail_subscriptions_were_triggered() throws Throwable {
             // assert correct sender.
             assertEquals(email.getHeaderValue("From"), sender);
             // assert given test case exist in body.
-            assert (email.getBody().toString().contains("TC5"));
+            assert (email.getBody().contains("TC5"));
         }
     }
 
     @Then("^Rest subscriptions were triggered$")
     public void check_rest_subscriptions_were_triggered() throws Throwable {
         LOGGER.debug("Verifying REST requests.");
         List<String> endpointsToCheck = new ArrayList<>(
-                Arrays.asList(REST_ENDPOINT, REST_ENDPOINT_AUTH, REST_ENDPOINT_PARAMS, REST_ENDPOINT_AUTH_PARAMS));
+                Arrays.asList(REST_ENDPOINT, REST_ENDPOINT_AUTH, REST_ENDPOINT_PARAMS, REST_ENDPOINT_AUTH_PARAMS, REST_ENDPOINT_ROW_BODY));
 
         assert (allEndpointsGotAtLeastXCalls(endpointsToCheck, 1));
         for (String endpoint : endpointsToCheck) {
             assert (requestBodyContainsStatedValues(endpoint));
-
         }
     }
 
     /**
      * Assemble subscription names in a list.
      *
-     * @param jsonDataAsString
-     *            JSON string containing subscriptions
+     * @param jsonDataAsString JSON string containing subscriptions
      * @throws Throwable
      */
     private void readSubscriptionNames(String jsonDataAsString) throws Throwable {
@@ -183,58 +174,55 @@ private void readSubscriptionNames(String jsonDataAsString) throws Throwable {
     /**
      * POST subscriptions to endpoint.
      *
-     * @param jsonDataAsString
-     *            JSON string containing subscriptions
-     * @param endPoint
-     *            endpoint to use in POST
+     * @param jsonDataAsString JSON string containing subscriptions
+     * @param endPoint         endpoint to use in POST
      * @throws Exception
      */
     private void postSubscriptions(String jsonDataAsString, String endPoint) throws Exception {
-        RequestBuilder requestBuilder = MockMvcRequestBuilders.post(endPoint).accept(MediaType.APPLICATION_JSON)
-                .content(jsonDataAsString).contentType(MediaType.APPLICATION_JSON);
-
-        postResult = mockMvc.perform(requestBuilder).andReturn();
-        LOGGER.debug("Response code from REST when adding subscriptions: "
-                + String.valueOf(postResult.getResponse().getStatus()));
-
-        assertEquals(HttpStatus.OK.value(), postResult.getResponse().getStatus());
+        HttpRequest postRequest = new HttpRequest(HttpRequest.HttpMethod.POST);
+        response = postRequest.setHost(getHostName())
+                .setPort(applicationPort)
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
+                .setEndpoint(endPoint)
+                .setBody(jsonDataAsString)
+                .performRequest();
+        assertEquals(HttpStatus.OK.value(), response.getStatusCodeValue());
     }
 
     /**
      * Verify that subscriptions were successfully posted.
      *
-     * @param endPoint
-     *            endpoint to use in GET
+     * @param endPoint endpoint to use in GET
      * @throws Exception
      */
     private void validateSubscriptionsSuccessfullyAdded(String endPoint) throws Exception {
-        RequestBuilder getRequest = MockMvcRequestBuilders.get(endPoint);
-        getResult = mockMvc.perform(getRequest).andReturn();
-
-        LOGGER.debug("Response code from REST when getting subscriptions: "
-                + String.valueOf(getResult.getResponse().getStatus()));
-        assertEquals(HttpStatus.OK.value(), result.getResponse().getStatus());
-
+        HttpRequest getRequest = new HttpRequest(HttpRequest.HttpMethod.GET);
+        response = getRequest.setHost(getHostName())
+                .setPort(applicationPort)
+                .addHeader("content-type", "application/json")
+                .addHeader("Accept", "application/json")
+                .setEndpoint(endPoint)
+                .performRequest();
+        assertEquals(HttpStatus.OK.value(), response.getStatusCodeValue());
         LOGGER.debug("Checking that response contains all subscriptions");
         for (String subscriptionName : subscriptionNames) {
-            assertTrue(getResult.getResponse().getContentAsString().contains(subscriptionName));
+            assertTrue(response.toString().contains(subscriptionName));
         }
     }
 
     /**
      * Checks that an enpoint got at least the number of calls as expected.
      *
-     * @param endpoints
-     *            List of endpoints to check.
-     * @param expectedCalls
-     *            Integer with the least number of calls.
+     * @param endpoints     List of endpoints to check.
+     * @param expectedCalls Integer with the least number of calls.
      * @return true if all endpoints had atleast the number of calls as expected.
      * @throws JSONException
      * @throws InterruptedException
      */
     private boolean allEndpointsGotAtLeastXCalls(final List<String> endpoints, int expectedCalls)
             throws JSONException, InterruptedException {
-        List<String> endpointsToCheck = new ArrayList<String>(endpoints);
+        List<String> endpointsToCheck = new ArrayList<>(endpoints);
 
         long stopTime = System.currentTimeMillis() + 30000;
         while (!endpointsToCheck.isEmpty() && stopTime > System.currentTimeMillis()) {
@@ -252,8 +240,7 @@ private boolean allEndpointsGotAtLeastXCalls(final List<String> endpoints, int e
     /**
      * Verify that request made to endpoint contains the correct information.
      *
-     * @param endpoint
-     *            endpoint to check
+     * @param endpoint endpoint to check
      * @return true if verification was successful, false otherwise
      * @throws JSONException
      */
@@ -285,15 +272,18 @@ private void setupRestEndpoints() {
         int port = SocketUtils.findAvailableTcpPort();
         restServer = startClientAndServer(port);
 
-        LOGGER.debug("Setting up endpoints on host '" + BASE_URL + "' and port '" + port + "'.");
-        mockClient = new MockServerClient(BASE_URL, port);
+        LOGGER.debug("Setting up endpoints on host '" + getHostName() + "' and port '" + port + "'.");
+        mockClient = new MockServerClient(getHostName(), port);
         mockClient.when(request().withMethod("POST").withPath(REST_ENDPOINT)).respond(response().withStatusCode(201));
-        mockClient.when(request().withMethod("POST").withPath(REST_ENDPOINT_AUTH))
+        mockClient.when(request().withMethod("POST").withPath(REST_ENDPOINT_AUTH)
+                .withHeader("Authorization", "Basic TXkgbW90aGVyIGhhcyAyIGNhdHMgYW5kIHRoZXkgYXJlIGNyYXp5"))
                 .respond(response().withStatusCode(201));
         mockClient.when(request().withMethod("POST").withPath(REST_ENDPOINT_PARAMS))
                 .respond(response().withStatusCode(201));
         mockClient.when(request().withMethod("POST").withPath(REST_ENDPOINT_AUTH_PARAMS))
                 .respond(response().withStatusCode(201));
+        mockClient.when(request().withMethod("POST").withPath(REST_ENDPOINT_ROW_BODY))
+                .respond(response().withStatusCode(201));
     }
 
     /**
@@ -323,13 +313,13 @@ protected List<String> getEventNamesToSend() {
     /**
      * Replaces tags in the subscription JSON string with valid information.
      *
-     * @param text
-     *            JSON string containing replaceable tags
+     * @param text JSON string containing replaceable tags
      * @return Processed content
      */
     private String stringReplaceText(String text) {
         text = text.replaceAll("\\$\\{rest\\.host\\}", "localhost");
-        text = text.replaceAll("\\$\\{rest\\.port\\}", String.valueOf(restServer.getPort()));
+        text = text.replaceAll("\\$\\{rest\\.port\\}", String.valueOf(restServer.getLocalPort()));
+        text = text.replaceAll("\\$\\{rest\\.row.body\\}", REST_ENDPOINT_ROW_BODY);
         text = text.replaceAll("\\$\\{rest\\.endpoint\\}", REST_ENDPOINT);
         text = text.replaceAll("\\$\\{rest\\.endpoint\\.auth\\}", REST_ENDPOINT_AUTH);
         text = text.replaceAll("\\$\\{rest\\.endpoint\\.params\\}", REST_ENDPOINT_PARAMS);
diff --git a/src/functionaltests/resources/subscription_multiple.json b/src/functionaltests/resources/subscription_multiple.json
@@ -149,5 +149,37 @@
         ]
       }
     ]
+  },
+  {
+    "subscriptionName": "Subscription_Row_Body",
+    "userName": "DEF",
+    "repeat": false,
+    "created": "data-time",
+    "notificationType": "REST_POST",
+    "notificationMeta": "http://${rest.host}:${rest.port}${rest.row.body}",
+    "restPostBodyMediaType": "application/json",
+    "notificationMessageKeyValues": [
+      {
+        "formkey": "",
+        "formvalue": "{parameter: [{ name: 'jsonparams', value : to_string(@)}]}"
+      }
+    ],
+    "requirements": [
+      {
+        "type": "ARTIFACT_1",
+        "conditions": [
+          {"jmespath": "gav.groupId=='com.mycompany.myproduct'"},
+          {"jmespath": "testCaseExecutions[?outcome.conclusion == 'SUCCESSFUL' && outcome.id=='TC5']"}
+        ]
+
+      },
+      {
+        "type": "ARTIFACT_1",
+        "conditions": [
+          {"jmespath": "gav.groupId=='com.mycompany.myproduct'"},
+          {"jmespath": "testCaseExecutions[?testCaseStartedEventId == 'cb9d64b0-a6e9-4419-8b5d-a650c27c59ca']"}
+        ]
+      }
+    ]
   }
 ]
