Simplified checking result in flow tests, fixed traffic generated test (#84)

* Simplified checking result in flow tests

* Fixed traffic generated test

Author: ValentinTyhonov

src/main/resources/application.properties

@@ -8,8 +8,8 @@ server.port: 8090
 rules.path: /ArtifactRules_new.json
 
 logging.level.root: INFO
-logging.level.org.springframework.web: DEBUG
-logging.level.com.ericsson.ei: DEBUG
+logging.level.org.springframework.web: INFO
+logging.level.com.ericsson.ei: INFO
 
 rabbitmq.host: localhost
 rabbitmq.port: 5672

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

@@ -13,10 +13,12 @@
 */
 package com.ericsson.ei.flowtests;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -32,17 +34,17 @@ public class FlowSourceChangeObject extends FlowTestBase {
     private static final String AGGREGATED_OBJECT_ID = "fb6efi4n-25fb-4d77-b9fd-5f2xrrefe66de47";
 
     @Override
-    String setRulesFilePath() {
+    String getRulesFilePath() {
         return RULES_FILE_PATH;
     }
 
     @Override
-    String setEventsFilePath() {
+    String getEventsFilePath() {
         return EVENTS_FILE_PATH;
     }
 
     @Override
-    List<String> setEventNamesToSend() {
+    List<String> getEventNamesToSend() {
         List<String> eventNames = new ArrayList<>();
         eventNames.add("event_EiffelSourceChangeSubmittedEvent_3");
         eventNames.add("event_EiffelSourceChangeCreatedEvent_3");
@@ -61,9 +63,10 @@ List<String> setEventNamesToSend() {
     }
 
     @Override
-    Map<String, String> setCheckInfo() {
-        Map<String, String> checkInfo = new HashMap<>();
-        checkInfo.put(AGGREGATED_OBJECT_ID, AGGREGATED_OBJECT_FILE_PATH);
-        return checkInfo;
+    Map<String, JsonNode> getCheckData() throws IOException {
+        JsonNode expectedJSON = getJSONFromFile(AGGREGATED_OBJECT_FILE_PATH);
+        Map<String, JsonNode> checkData = new HashMap<>();
+        checkData.put(AGGREGATED_OBJECT_ID, expectedJSON);
+        return checkData;
     }
 }

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

@@ -19,6 +19,7 @@
 import com.ericsson.ei.erqueryservice.ERQueryService;
 import com.ericsson.ei.erqueryservice.SearchOption;
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Before;
@@ -70,17 +71,17 @@ public void before() throws IOException {
     }
 
     @Override
-    String setRulesFilePath() {
+    String getRulesFilePath() {
         return RULES_FILE_PATH;
     }
 
     @Override
-    String setEventsFilePath() {
+    String getEventsFilePath() {
         return EVENTS_FILE_PATH;
     }
 
     @Override
-    List<String> setEventNamesToSend() {
+    List<String> getEventNamesToSend() {
         List<String> eventNames = new ArrayList<>();
         eventNames.add("event_EiffelConfidenceLevelModifiedEvent_3_2");
         eventNames.add("event_EiffelArtifactPublishedEvent_3");
@@ -97,9 +98,10 @@ List<String> setEventNamesToSend() {
     }
 
     @Override
-    Map<String, String> setCheckInfo() {
-        Map<String, String> checkInfo = new HashMap<>();
-        checkInfo.put(AGGREGATED_OBJECT_ID, AGGREGATED_OBJECT_FILE_PATH);
-        return checkInfo;
+    Map<String, JsonNode> getCheckData() throws IOException {
+        JsonNode expectedJSON = getJSONFromFile(AGGREGATED_OBJECT_FILE_PATH);
+        Map<String, JsonNode> checkData = new HashMap<>();
+        checkData.put(AGGREGATED_OBJECT_ID, expectedJSON);
+        return checkData;
     }
 }

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

@@ -16,11 +16,13 @@
 */
 package com.ericsson.ei.flowtests;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.runner.RunWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -38,17 +40,17 @@ public class FlowTest2 extends FlowTestBase {
     private static final String AGGREGATED_OBJECT_ID_2 = "ccce572c-c364-441e-abc9-b62fed080ca2";
 
     @Override
-    String setRulesFilePath() {
+    String getRulesFilePath() {
         return RULES_FILE_PATH;
     }
 
     @Override
-    String setEventsFilePath() {
+    String getEventsFilePath() {
         return EVENTS_FILE_PATH;
     }
 
     @Override
-    List<String> setEventNamesToSend() {
+    List<String> getEventNamesToSend() {
         List<String> eventNames = new ArrayList<>();
         eventNames.add("event_EiffelArtifactCreatedEvent_3");
         eventNames.add("event_EiffelArtifactPublishedEvent_3");
@@ -68,10 +70,12 @@ List<String> setEventNamesToSend() {
     }
 
     @Override
-    Map<String, String> setCheckInfo() {
-        Map<String, String> checkInfo = new HashMap<>();
-        checkInfo.put(AGGREGATED_OBJECT_ID_1, AGGREGATED_OBJECT_FILE_PATH_1);
-        checkInfo.put(AGGREGATED_OBJECT_ID_2, AGGREGATED_OBJECT_FILE_PATH_2);
-        return checkInfo;
+    Map<String, JsonNode> getCheckData() throws IOException {
+        JsonNode expectedJSON1 = getJSONFromFile(AGGREGATED_OBJECT_FILE_PATH_1);
+        JsonNode expectedJSON2 = getJSONFromFile(AGGREGATED_OBJECT_FILE_PATH_2);
+        Map<String, JsonNode> checkData = new HashMap<>();
+        checkData.put(AGGREGATED_OBJECT_ID_1, expectedJSON1);
+        checkData.put(AGGREGATED_OBJECT_ID_2, expectedJSON2);
+        return checkData;
     }
 }

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

@@ -41,7 +41,7 @@
 
 public abstract class FlowTestBase extends FlowTestConfigs {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FlowTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FlowTestBase.class);
 
     @Autowired
     private RmqHandler rmqHandler;
@@ -59,7 +59,6 @@ public abstract class FlowTestBase extends FlowTestConfigs {
     private String event_map;
 
     private static ObjectMapper objectMapper = new ObjectMapper();
-    private static JsonNode parsedJson;
 
     @Test
     public void flowTest() {
@@ -69,20 +68,20 @@ public void flowTest() {
             String exchangeName = "ei-poc-4";
             createExchange(exchangeName, queueName);
 
-            rulesHandler.setRulePath(setRulesFilePath());
+            rulesHandler.setRulePath(getRulesFilePath());
 
-            List<String> eventNames = setEventNamesToSend();
-            testParametersChange();
+            List<String> eventNames = getEventNamesToSend();
+            JsonNode parsedJSON = getJSONFromFile(getEventsFilePath());
             int eventsCount = eventNames.size();
             for (String eventName : eventNames) {
-                JsonNode eventJson = parsedJson.get(eventName);
+                JsonNode eventJson = parsedJSON.get(eventName);
                 String event = eventJson.toString();
                 channel.basicPublish(exchangeName, queueName, null, event.getBytes());
             }
 
             // wait for all events to be processed
             waitForEventsToBeProcessed(eventsCount);
-            checkResult(setCheckInfo());
+            checkResult(getCheckData());
         } catch (IOException e) {
             LOGGER.error(e.getMessage(), e);
         }
@@ -91,28 +90,28 @@ public void flowTest() {
     /**
      * @return path to file with rules, that is used in flow test
      */
-    abstract String setRulesFilePath();
+    abstract String getRulesFilePath();
 
     /**
      * @return path to file, with events, that is used in flow test
      */
-    abstract String setEventsFilePath();
+    abstract String getEventsFilePath();
 
     /**
      * @return list of event names, that will be used in flow test
      */
-    abstract List<String> setEventNamesToSend();
+    abstract List<String> getEventNamesToSend();
 
     /**
      * @return map, where
      *          key - _id of expected aggregated object
-     *          value - path to file with expected aggregated object
+     *          value - expected aggregated object
      */
-    abstract Map<String, String> setCheckInfo();
+    abstract Map<String, JsonNode> getCheckData() throws IOException;
 
-    private void testParametersChange() throws IOException {
-        String jsonFileContent = FileUtils.readFileToString(new File(setEventsFilePath()), "UTF-8");
-        parsedJson = objectMapper.readTree(jsonFileContent);
+    JsonNode getJSONFromFile(String filePath) throws IOException {
+        String expectedDocument = FileUtils.readFileToString(new File(filePath), "UTF-8");
+        return objectMapper.readTree(expectedDocument);
     }
 
     // count documents that were processed
@@ -136,15 +135,13 @@ private void waitForEventsToBeProcessed(int eventsCount) {
         }
     }
 
-    private void checkResult(final Map<String, String> inputFiles) {
-        inputFiles.forEach((id, filePath) -> {
+    private void checkResult(final Map<String, JsonNode> checkData) {
+        checkData.forEach((id, expectedJSON) -> {
             try {
                 String document = objectHandler.findObjectById(id);
-                String expectedDocument = FileUtils.readFileToString(new File(filePath), "UTF-8");
-                JsonNode expectedJson = objectMapper.readTree(expectedDocument);
-                JsonNode actualJson = objectMapper.readTree(document);
-                LOGGER.info("Complete aggregated object: " + actualJson);
-                JSONAssert.assertEquals(expectedJson.toString(), actualJson.toString(), false);
+                JsonNode actualJSON = objectMapper.readTree(document);
+                LOGGER.info("Complete aggregated object: " + actualJSON);
+                JSONAssert.assertEquals(expectedJSON.toString(), actualJSON.toString(), false);
             } catch (IOException | JSONException e) {
                 LOGGER.error(e.getMessage(), e);
             }

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

@@ -16,10 +16,12 @@
 */
 package com.ericsson.ei.flowtests;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,17 +37,17 @@ public class FlowTestTestExecution extends FlowTestBase {
     private static final String AGGREGATED_OBJECT_ID = "b46ef12d-25gb-4d7y-b9fd-8763re66de47";
 
     @Override
-    String setRulesFilePath() {
+    String getRulesFilePath() {
         return RULES_FILE_PATH;
     }
 
     @Override
-    String setEventsFilePath() {
+    String getEventsFilePath() {
         return EVENTS_FILE_PATH;
     }
 
     @Override
-    List<String> setEventNamesToSend() {
+    List<String> getEventNamesToSend() {
         ArrayList<String> eventNames = new ArrayList<>();
         eventNames.add("event_EiffelActivityTriggeredEvent");
         eventNames.add("event_EiffelActivityStartedEvent");
@@ -62,9 +64,10 @@ List<String> setEventNamesToSend() {
     }
 
     @Override
-    Map<String, String> setCheckInfo() {
-        Map<String, String> checkInfo = new HashMap<>();
-        checkInfo.put(AGGREGATED_OBJECT_ID, AGGREGATED_OBJECT_FILE_PATH);
-        return checkInfo;
+    Map<String, JsonNode> getCheckData() throws IOException {
+        JsonNode expectedJSON = getJSONFromFile(AGGREGATED_OBJECT_FILE_PATH);
+        Map<String, JsonNode> checkData = new HashMap<>();
+        checkData.put(AGGREGATED_OBJECT_ID, expectedJSON);
+        return checkData;
     }
 }