Making unit and functional test fast (#303)

* change to one mongo and mb in tests

* removing logging level for passing intravis

Author: saif-ericsson

pom.xml

@@ -29,7 +29,7 @@
         <springLdapVersion>2.3.2.RELEASE</springLdapVersion>
         <springSecurityVersion>5.0.6.RELEASE</springSecurityVersion>
         <springSessionVersion>2.0.2.RELEASE</springSessionVersion>
-        <forkCountTests>2C</forkCountTests>
+        <forkCountTests>1</forkCountTests>
     </properties>
 
     <!-- Reporting Plugins -->
@@ -477,12 +477,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>2.22.2</version>
                 <configuration>
                     <skipTests>${skipUTs}</skipTests>
                     <forkCountTests>${forkCountTests}</forkCountTests>
                     <forkCount>${forkCountTests}</forkCount>
-                    <reuseForks>false</reuseForks>
+                    <reuseForks>true</reuseForks>
                     <excludes>
                         <exclude>**/*IT.java</exclude>
                         <exclude>${someModule.test.excludes}</exclude>
@@ -491,6 +491,8 @@
                     <includes>
                         <include>${someModule.test.includes}</include>
                     </includes>
+                    <parallel>classes</parallel>
+                    <threadCount>5</threadCount>
                 </configuration>
             </plugin>
 

src/functionaltests/java/com/ericsson/ei/files/DownloadFilesTestSteps.java

@@ -1,8 +1,10 @@
 package com.ericsson.ei.files;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.File;
+
 import org.apache.commons.io.FileUtils;
-import static org.junit.Assert.assertEquals;
 import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,6 +13,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.TestPropertySource;
 
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
@@ -23,6 +26,9 @@
 import cucumber.api.java.en.Then;
 
 @Ignore
+@TestPropertySource(properties = { "spring.data.mongodb.database: DownloadFilesTestSteps",
+        "rabbitmq.exchange.name: DownloadFilesTestSteps-exchange",
+        "rabbitmq.consumerName: rabbitmq.consumerName: DownloadFilesTestStepsConsumer" })
 @AutoConfigureMockMvc
 public class DownloadFilesTestSteps extends FunctionalTestBase {
 
@@ -40,14 +46,13 @@ public class DownloadFilesTestSteps extends FunctionalTestBase {
     private int applicationPort;
     private String hostName = getHostName();
 
-
     @Given("^Eiffel Intelligence instance is up and running$")
     public void eiffel_intelligence_instance_is_up_and_running() throws Exception {
         LOGGER.debug("Checking if Eiffel Intelligence instance is up and running.");
         httpRequest.setHost(hostName)
-            .setPort(applicationPort)
-            .addHeader("Content-type:", MediaType.APPLICATION_JSON_VALUE.toString())
-            .setEndpoint("/subscriptions");
+                   .setPort(applicationPort)
+                   .addHeader("Content-type:", MediaType.APPLICATION_JSON_VALUE.toString())
+                   .setEndpoint("/subscriptions");
 
         response = httpRequest.performRequest();
         assertEquals(response.getStatusCode(), HttpStatus.OK);
@@ -56,7 +61,7 @@ public void eiffel_intelligence_instance_is_up_and_running() throws Exception {
     @Then("^List available files$")
     public void list_available_files() throws Exception {
         LOGGER.debug("Listing all availble files that can be download via RestApi.");
-        String expectedSubscriptionsValue =  "/download/subscriptionsTemplate";
+        String expectedSubscriptionsValue = "/download/subscriptionsTemplate";
 
         httpRequest.setEndpoint("/download");
         response = httpRequest.performRequest();
@@ -71,17 +76,19 @@ public void list_available_files() throws Exception {
 
     @And("^Get subscription template file$")
     public void get_subscription_template_file() throws Exception {
-        String expectedSubscriptionTemplateContent = FileUtils.readFileToString(new File(SUBSCRIPTIONS_TEMPLATE_FILEPATH), "UTF-8");
+        String expectedSubscriptionTemplateContent = FileUtils.readFileToString(
+                new File(SUBSCRIPTIONS_TEMPLATE_FILEPATH), "UTF-8");
 
         httpRequest.setEndpoint("/download/subscriptionsTemplate");
         response = httpRequest.performRequest();
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
 
         String actualSubscriptionTemplateContent = response.getBody();
-        assertEquals("Get SubscriptionTemplate file failed or contents is not as expected. \nExpected: "
-        + expectedSubscriptionTemplateContent + "\nActual: "+ actualSubscriptionTemplateContent,
-        expectedSubscriptionTemplateContent, actualSubscriptionTemplateContent);
+        assertEquals(
+                "Get SubscriptionTemplate file failed or contents is not as expected. \nExpected: "
+                        + expectedSubscriptionTemplateContent + "\nActual: " + actualSubscriptionTemplateContent,
+                expectedSubscriptionTemplateContent, actualSubscriptionTemplateContent);
     }
 
     @And("^Get rules template file$")
@@ -94,9 +101,10 @@ public void get_rules_template_file() throws Exception {
         assertEquals(HttpStatus.OK, response.getStatusCode());
 
         String actualRulesTemplateContent = response.getBody();
-        assertEquals("Get RulesTemplate file failed or contents is not as expected. \nExpected: "
-        + expectedRulesTemplateContent + "\nActual: "+ actualRulesTemplateContent,
-        expectedRulesTemplateContent, actualRulesTemplateContent);
+        assertEquals(
+                "Get RulesTemplate file failed or contents is not as expected. \nExpected: "
+                        + expectedRulesTemplateContent + "\nActual: " + actualRulesTemplateContent,
+                expectedRulesTemplateContent, actualRulesTemplateContent);
     }
 
     @And("^Get event template file$")
@@ -109,8 +117,9 @@ public void get_event_template_file() throws Exception {
         assertEquals(HttpStatus.OK, response.getStatusCode());
 
         String actualEventsTemplateContent = response.getBody();
-        assertEquals("Get EventsTemplate file failed or contents is not as expected. \nExpected: "
-        + expectedEventsTemplateContent + "\nActual: "+ actualEventsTemplateContent,
-        expectedEventsTemplateContent, actualEventsTemplateContent);
+        assertEquals(
+                "Get EventsTemplate file failed or contents is not as expected. \nExpected: "
+                        + expectedEventsTemplateContent + "\nActual: " + actualEventsTemplateContent,
+                expectedEventsTemplateContent, actualEventsTemplateContent);
     }
 }

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java

@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
 import org.json.JSONArray;
@@ -21,7 +22,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.SocketUtils;
 
@@ -31,7 +31,6 @@
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
-import com.ericsson.ei.utils.TestContextInitializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -43,8 +42,10 @@
 
 @Ignore
 @TestPropertySource(properties = { "notification.ttl.value:1", "aggregated.collection.ttlValue:1",
-        "notification.failAttempt:1" })
-@ContextConfiguration(initializers = TestContextInitializer.class)
+        "notification.failAttempt:1", "spring.data.mongodb.database: TestTTLSteps",
+        "rabbitmq.exchange.name: TestTTLSteps-exchange",
+        "rabbitmq.consumerName: TestTTLStepsConsumer",
+        "missedNotificationDataBaseName: TestTTLStepsMissedNotification" })
 public class TestTTLSteps extends FunctionalTestBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(TestTTLSteps.class);
     private static final String BASE_URL = "localhost";
@@ -63,7 +64,7 @@ public class TestTTLSteps extends FunctionalTestBase {
     private static final String SUBSCRIPTION_FILE_PATH_CREATION = "src/functionaltests/resources/subscription_single_ttlTest.json";
     private static final String EIFFEL_EVENTS_JSON_PATH = "src/functionaltests/resources/eiffel_events_for_test.json";
 
-    private static final long MAX_WAIT_TIME = 65000;
+    private static final long MAX_WAIT_TIME = 120000;
 
     private static JsonNode subscriptionObject;
 
@@ -147,9 +148,12 @@ public void a_subscription_is_created_at_the_end_point_with_non_existent_notific
         String readFileToString = FileUtils.readFileToString(new File(SUBSCRIPTION_FILE_PATH_CREATION), "UTF-8");
         JSONArray jsonArr = new JSONArray(readFileToString);
         httpRequest = new HttpRequest(HttpMethod.POST);
-        httpRequest.setHost(hostName).setPort(applicationPort).setEndpoint(endPoint)
-                .addHeader("content-type", "application/json").addHeader("Accept", "application/json")
-                .setBody(jsonArr.toString());
+        httpRequest.setHost(hostName)
+                   .setPort(applicationPort)
+                   .setEndpoint(endPoint)
+                   .addHeader("content-type", "application/json")
+                   .addHeader("Accept", "application/json")
+                   .setBody(jsonArr.toString());
         httpRequest.performRequest();
     }
 
@@ -158,8 +162,8 @@ public void eiffel_events_are_sent() throws Throwable {
         LOGGER.debug("Sending an Eiffel event");
         List<String> eventNamesToSend = getEventNamesToSend();
         eventManager.sendEiffelEvents(EIFFEL_EVENTS_JSON_PATH, eventNamesToSend);
-        List<String> missingEventIds = dbManager
-                .verifyEventsInDB(eventManager.getEventsIdList(EIFFEL_EVENTS_JSON_PATH, eventNamesToSend));
+        List<String> missingEventIds = dbManager.verifyEventsInDB(
+                eventManager.getEventsIdList(EIFFEL_EVENTS_JSON_PATH, eventNamesToSend), 0);
         assertEquals("The following events are missing in mongoDB: " + missingEventIds.toString(), 0,
                 missingEventIds.size());
         LOGGER.debug("Eiffel event is sent");
@@ -196,15 +200,17 @@ public void the_Notification_document_should_be_deleted_from_the_database() thro
 
     @Then("^Aggregated Object document should be deleted from the database$")
     public void the_Aggregated_Object_document_should_be_deleted_from_the_database() throws Throwable {
-        LOGGER.debug("Checking delition of aggregated object in db");
+        LOGGER.debug("Checking deletion of aggregated object in db");
         List<String> allObjects = null;
+        // To be sure at least one minute has passed since creation of aggregated object
+        TimeUnit.MINUTES.sleep(1);
         allObjects = mongoDBHandler.getAllDocuments(dataBase, collection);
         assertEquals("Database is not empty.", true, allObjects.isEmpty());
     }
 
     /**
-     * Setting up mock server to receive calls on one endpoint and respond with
-     * 500 to trigger retries of POST request
+     * Setting up mock server to receive calls on one endpoint and respond with 500
+     * to trigger retries of POST request
      */
     private void setUpMockServer() {
         int port = SocketUtils.findAvailableTcpPort();
@@ -214,7 +220,7 @@ private void setUpMockServer() {
 
         // set up expectations on mock server to get calls on this endpoint
         mockServerClient.when(request().withMethod("POST").withPath(ENDPOINT))
-                .respond(HttpResponse.response().withStatusCode(500));
+                        .respond(HttpResponse.response().withStatusCode(500));
     }
 
     /**
@@ -231,7 +237,8 @@ private int getNotificationForExpectedSize(int expectedSize, String condition) {
         List<String> notificationExist = null;
 
         while (System.currentTimeMillis() < maxTime) {
-            notificationExist = mongoDBHandler.find(missedNotificationDatabase, missedNotificationCollection, condition);
+            notificationExist = mongoDBHandler.find(missedNotificationDatabase, missedNotificationCollection,
+                    condition);
 
             if (notificationExist.size() == expectedSize) {
                 return notificationExist.size();