some polish

Author: Vasile Baluta

.travis.yml

@@ -17,7 +17,10 @@ script:
 # since we run parallel tests using embedded mongodb in fresh environment all tests run first in parallel 
 # will try to download the embedded mongo to this travis instance but the late ones will fail to write.
 # We will therefore run one test using mongodb first that will download the mongo instance and
-# then the rest of the test that will no longer need to download the embedded mongo since it will exist
+# then the rest of the test that will no longer need to download the embedded mongo since it will exist.
+#
+# It is also importan that the first test to be run is a Spring Boot Test since spring boot also downloads
+# another version of embedded mongo db so all Spring Boot tests will end up in a race condition also
   -  mvn -DsomeModule.test.includes="**/QueryServiceTest.java" test
   -  mvn -DsomeModule.test.excludes="**/QueryServiceTest.java" test
 

pom.xml

@@ -262,7 +262,11 @@
                 <version>2.20</version>
                 <configuration>
                     <forkCount>2C</forkCount>
-                    <reuseForks>false</reuseForks>
+                    <reuseForks>true</reuseForks>
+                    <parallel>classes</parallel>
+                    <useUnlimitedThreads>true</useUnlimitedThreads>
+                    <threadCount>80</threadCount>
+                    <perCoreThreadCount>true</perCoreThreadCount>
                     <excludes>
                         <exclude>${someModule.test.excludes}</exclude>
                     </excludes>

src/main/java/com/ericsson/ei/waitlist/WaitListStorageHandler.java

@@ -67,7 +67,6 @@ public void addEventToWaitList(String event, RulesObject rulesObject) throws Exc
         if (result == false) {
             throw new Exception("failed to insert the document into database");
         }
-        updateTestEventCount(true);
     }
 
     private String addProprtiesToEvent(String event, RulesObject rulesObject) {
@@ -103,26 +102,6 @@ public ArrayList<String> getWaitList() {
 
     public boolean dropDocumentFromWaitList(String document) {
         boolean result = mongoDbHandler.dropDocument(databaseName, collectionName, document);
-
-        if (result) {
-            updateTestEventCount(false);
-        }
-
         return result;
     }
-
-    private void updateTestEventCount(boolean increase) {
-        // if (System.getProperty("flow.test") == "true") {
-        // String countStr =
-        // System.getProperty("eiffel.intelligence.waitListEventsCount");
-        // int count = Integer.parseInt(countStr);
-        // if (increase) {
-        // count++;
-        // } else {
-        // count--;
-        // }
-        // System.setProperty("eiffel.intelligence.waitListEventsCount", "" +
-        // count);
-        // }
-    }
 }

src/test/java/com/ericsson/ei/flowtests/FlowTestBase.java

@@ -79,8 +79,6 @@ public abstract class FlowTestBase extends AbstractTestExecutionListener {
     @Override
     public void beforeTestClass(TestContext testContext) throws Exception {
         System.setProperty("flow.test", "true");
-        // System.setProperty("eiffel.intelligence.processedEventsCount", "0");
-        // System.setProperty("eiffel.intelligence.waitListEventsCount", "0");
         createFlowTestConfigs();
         getFlowTestConfigs().init();
     }
@@ -103,17 +101,16 @@ private void createFlowTestConfigs() {
     }
 
     private String getClasName() {
-        // Class c = MethodHandles.lookup().lookupClass();
-        // return c.getName();
         return this.getClass().getName();
     }
 
     private void cleanFlowTestConfigs() {
         configsMap.remove(getClasName());
     }
-    
+
     // setFirstEventWaitTime: variable to set the wait time after publishing the
-    // first event. So any thread looking for the events don't do it before actually
+    // first event. So any thread looking for the events don't do it before
+    // actually
     // populating events in the database
     private int firstEventWaitTime = 0;
 

src/test/java/com/ericsson/ei/flowtests/SingleEventAggregationTest.java

@@ -83,7 +83,6 @@ String getEventsFilePath() {
     public void before() {
         MockitoAnnotations.initMocks(this);
         upStreamEventsHandler.setEventRepositoryQueryService(erQueryService);
-        // MockitoAnnotations.initMocks(this);
         when(erQueryService.getEventStreamDataById(anyString(), any(SearchOption.class), anyInt(), anyInt(),
                 anyBoolean())).thenReturn(null);
         super.setFirstEventWaitTime(5000);

src/test/java/com/ericsson/ei/handlers/test/ObjectHandlerTest.java

@@ -64,7 +64,6 @@ public class ObjectHandlerTest {
     private String dataBaseName = "EventStorageDBbbb";
     private String collectionName = "SampleEvents";
     private String input = "{\"TemplateName\":\"ARTIFACT_1\",\"id\":\"eventId\",\"type\":\"eventType11\",\"test_cases\":[{\"event_id\":\"testcaseid1\",\"test_data\":\"testcase1data\"},{\"event_id\":\"testcaseid2\",\"test_data\":\"testcase2data\"}]}";
-    private String updateInput = "{\"TemplateName\":\"ARTIFACT_1\",\"id\":\"eventId\",\"type\":\"eventType11\",\"test_cases\" : [{\"event_id\" : \"testcaseid1\", \"test_data\" : \"testcase2data\"},{\"event_id\" : \"testcaseid3\", \"test_data\" : \"testcase3data\"}]}";
     private String condition = "{\"_id\" : \"eventId\"}";
     private String event = "{\"meta\":{\"id\":\"eventId\"}}";
 

src/test/java/com/ericsson/ei/queryservice/test/QueryServiceTest.java

@@ -93,18 +93,14 @@ public static void setUpEmbeddedMongo() throws Exception {
             mongoClient = testsFactory.newMongo();
             String port = "" + mongoClient.getAddress().getPort();
             System.setProperty("mongodb.port", port);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            e.printStackTrace();
-        }
 
-        try {
             aggregatedObject = FileUtils.readFileToString(new File(aggregatedPath));
-            System.out.println("The aggregatedObject is : " + aggregatedObject);
+            log.debug("The aggregatedObject is : " + aggregatedObject);
             missedNotification = FileUtils.readFileToString(new File(missedNotificationPath));
-            System.out.println("The missedNotification is : " + missedNotification);
+            log.debug("The missedNotification is : " + missedNotification);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            e.printStackTrace();
         }
     }
 
@@ -116,22 +112,22 @@ public static void init() throws Exception {
     @PostConstruct
     public void initMocks() {
         mongoDBHandler.setMongoClient(mongoClient);
-        System.out.println("Database connected");
+        log.debug("Database connected");
         // deleting all documents before inserting
         mongoClient.getDatabase(aggregationDataBaseName).getCollection(aggregationCollectionName)
                 .deleteMany(new BsonDocument());
         Document missedDocument = Document.parse(missedNotification);
         Document aggDocument = Document.parse(aggregatedObject);
         mongoClient.getDatabase(missedNotificationDataBaseName).getCollection(missedNotificationCollectionName)
                 .insertOne(missedDocument);
-        System.out.println("Document Inserted in missed Notification Database");
+        log.debug("Document Inserted in missed Notification Database");
 
         JsonNode preparedAggDocument = objectHandler.prepareDocumentForInsertion(aggDocument.getString("id"),
                 aggregatedObject);
         aggDocument = Document.parse(preparedAggDocument.toString());
         mongoClient.getDatabase(aggregationDataBaseName).getCollection(aggregationCollectionName)
                 .insertOne(aggDocument);
-        System.out.println("Document Inserted in Aggregated Object Database");
+        log.debug("Document Inserted in Aggregated Object Database");
     }
 
     @Test
@@ -140,11 +136,12 @@ public void processMissedNotificationTest() {
                 .getCollection(missedNotificationCollectionName).find();
         Iterator itr = responseDB.iterator();
         String response = itr.next().toString();
-        log.info("The inserted doc is : " + response);
+        log.debug("The inserted doc is : " + response);
         List<String> result = processMissedNotification.processQueryMissedNotification("Subscription_1");
-        log.info("The retrieved data is : " + result.toString());
+        log.debug("The retrieved data is : " + result.toString());
         ObjectNode record = null;
         JsonNode actual = null;
+
         try {
             JsonNode tempRecord = new ObjectMapper().readTree(result.get(0));
             record = (ObjectNode) tempRecord;
@@ -154,7 +151,7 @@ record = (ObjectNode) tempRecord;
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-        log.info("The result is : " + record.toString());
+        log.debug("The result is : " + record.toString());
         assertEquals(record.toString(), actual.toString());
     }
 
@@ -164,11 +161,12 @@ public void processAggregatedObjectTest() {
                 .getCollection(aggregationCollectionName).find();
         Iterator itr = responseDB.iterator();
         String response = itr.next().toString();
-        log.info("The inserted doc is : " + response);
+        log.debug("The inserted doc is : " + response);
         ArrayList<String> result = processAggregatedObject
                 .processQueryAggregatedObject("6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43");
         ObjectNode record = null;
         JsonNode actual = null;
+
         try {
             JsonNode tempRecord = new ObjectMapper().readTree(result.get(0));
             record = (ObjectNode) tempRecord;
@@ -178,7 +176,7 @@ record = (ObjectNode) tempRecord;
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-        log.info("The result is : " + record.toString());
+        log.debug("The result is : " + record.toString());
         assertEquals(record.get("aggregatedObject").toString(), actual.toString());
     }
 
@@ -189,5 +187,4 @@ public static void tearDown() throws Exception {
         if (testsFactory != null)
             testsFactory.shutdown();
     }
-
 }

src/test/java/com/ericsson/ei/waitlist/TestWaitListWorker.java

@@ -94,9 +94,6 @@ public void init() throws Exception {
         setupMB();
         list.add(FileUtils.readFileToString(new File(input1), "UTF-8"));
         list.add(FileUtils.readFileToString(new File(input2), "UTF-8"));
-        // Mockito.when(mongoDBHandler.dropDocument(Mockito.anyString(),
-        // Mockito.anyString(), Mockito.anyString()))
-        // .thenReturn(true);
         Mockito.when(waitListStorageHandler.getWaitList()).thenReturn(list);
         Mockito.when(rulesHandler.getRulesForEvent(Mockito.anyString())).thenReturn(rulesObject);
         Mockito.when(jmesPathInterface.runRuleOnEvent(Mockito.anyString(), Mockito.anyString())).thenReturn(jsonNode);