change flow to run as system test with local ER

vasile-baluta · web-flow · commit 41078fab0e74 · 2018-12-05T10:00:50.000+01:00
change flow to run as system test with local ER, MongoDB and Rabbitmq.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,10 @@
         <output-relative-path>src/main/java</output-relative-path>
         <raml-path>src/main/resources/public/raml/instance_info.raml</raml-path>
         <raml-path>src/main/resources/public/raml/eiffel-intelligence.raml</raml-path>
-        <base-package>com.ericsson.ei.controller</base-package>
+        <base-package>com.ericsson.ei.controller</base-package>        
+        <skipTests>false</skipTests>
+        <skipITs>${skipTests}</skipITs>
+        <skipUnitTests>${skipTests}</skipUnitTests>
     </properties>
 
     <repositories>
@@ -350,7 +353,8 @@
                 <version>2.20</version>
                 <configuration>
                     <forkCount>2C</forkCount>
-                    <reuseForks>false</reuseForks>
+                    <reuseForks>false</reuseForks>                  
+                    <skipTests>${skipUnitTests}</skipTests>
                     <excludes>
                         <exclude>${someModule.test.excludes}</exclude>
                     </excludes>
@@ -359,6 +363,40 @@
                     </includes>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-failsafe-plugin</artifactId>
+                  <version>3.0.0-M1</version>
+                  <executions>
+                      <execution>
+                          <id>integration-test</id>
+                          <goals>
+                              <goal>integration-test</goal>
+                              <goal>verify</goal>
+                          </goals>
+                          <phase>integration-test</phase>
+                          <configuration>
+                              <skipTests>${skipTests}</skipTests>
+                              <skipITs>${skipITs}</skipITs>
+                              <systemPropertyVariables>
+                                  <systemTest>true</systemTest>
+                                  <er.url>http://localhost:8080/eventrepository/search/</er.url>
+                              </systemPropertyVariables>
+                              <excludes>
+                                  <exclude>**/test/*</exclude>
+                                  <exclude>**/functionaltests/*</exclude>
+                              </excludes>
+                              <includes>
+                                  <include>**/FlowTest.class</include>
+                              </includes>
+                              <additionalClasspathElements>
+                                  <additionalClasspathElement>${basedir}/target/classes</additionalClasspathElement>
+                              </additionalClasspathElements>
+                          </configuration>
+                      </execution>
+                  </executions>
+              </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -126,4 +126,4 @@ ldap.username:
 # password should be encoded. It will be decoded in EndpointSecurity.java.
 # Password needs to be encoded with base64.
 ldap.password:
-ldap.user.filter:
+ldap.user.filter:
diff --git a/src/test/java/com/ericsson/ei/flowtests/FlowTest.java b/src/test/java/com/ericsson/ei/flowtests/FlowTest.java
@@ -33,6 +33,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
@@ -47,6 +48,7 @@
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -55,6 +57,7 @@
 public class FlowTest extends FlowTestBase {
 
     private static final String UPSTREAM_RESULT_FILE = "upStreamResultFile.json";
+    private static final String UPSTREAM_INPUT_FILE = "upStreamInput.json";
     private static final String RULES_FILE_PATH = "src/test/resources/ArtifactRules_new.json";
     private static final String EVENTS_FILE_PATH = "src/test/resources/test_events.json";
     private static final String AGGREGATED_OBJECT_FILE_PATH = "src/test/resources/AggregatedDocumentInternalCompositionLatest.json";
@@ -66,19 +69,35 @@ public class FlowTest extends FlowTestBase {
     @Mock
     private ERQueryService erQueryService;
 
+    @Autowired
+    private RabbitTemplate rabbitMqTemplate;
+
     @Before
     public void before() throws IOException {
-        MockitoAnnotations.initMocks(this);
-        upStreamEventsHandler.setEventRepositoryQueryService(erQueryService);
-
-        final URL upStreamResult = this.getClass().getClassLoader().getResource(UPSTREAM_RESULT_FILE);
         ObjectMapper objectMapper = new ObjectMapper();
-        ObjectNode objectNode = objectMapper.createObjectNode();
-        objectNode.set("upstreamLinkObjects", objectMapper.readTree(upStreamResult));
-        objectNode.set("downstreamLinkObjects", objectMapper.createArrayNode());
 
-        when(erQueryService.getEventStreamDataById(anyString(), any(SearchOption.class), anyInt(), anyInt(),
-                anyBoolean())).thenReturn(new ResponseEntity<>(objectNode, HttpStatus.OK));
+        if (!systemTest) {
+            final URL upStreamResult = this.getClass().getClassLoader().getResource(UPSTREAM_RESULT_FILE);
+            MockitoAnnotations.initMocks(this);
+            upStreamEventsHandler.setEventRepositoryQueryService(erQueryService);
+
+            ObjectNode objectNode = objectMapper.createObjectNode();
+            JsonNode upstreamJson = objectMapper.readTree(upStreamResult);
+            objectNode.set("upstreamLinkObjects", upstreamJson);
+            objectNode.set("downstreamLinkObjects", objectMapper.createArrayNode());
+
+            when(erQueryService.getEventStreamDataById(anyString(), any(SearchOption.class), anyInt(), anyInt(),
+                    anyBoolean())).thenReturn(new ResponseEntity<>(objectNode, HttpStatus.OK));
+        } else {
+            final URL upStreamInput = this.getClass().getClassLoader().getResource(UPSTREAM_INPUT_FILE);
+            ArrayNode upstreamJson = (ArrayNode) objectMapper.readTree(upStreamInput);
+            if (upstreamJson != null) {
+                for (JsonNode event : upstreamJson) {
+                    String eventStr = event.toString();
+                    rabbitMqTemplate.convertAndSend(eventStr);
+                }
+            }
+        }
     }
 
     @Override
diff --git a/src/test/java/com/ericsson/ei/flowtests/FlowTestBase.java b/src/test/java/com/ericsson/ei/flowtests/FlowTestBase.java
@@ -13,17 +13,6 @@
 */
 package com.ericsson.ei.flowtests;
 
-import com.ericsson.ei.handlers.ObjectHandler;
-import com.ericsson.ei.mongodbhandler.MongoDBHandler;
-import com.ericsson.ei.rmqhandler.RmqHandler;
-import com.ericsson.ei.rules.RulesHandler;
-import com.ericsson.ei.waitlist.WaitListStorageHandler;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import com.rabbitmq.client.Channel;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -40,11 +29,24 @@
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.TestContext;
 import org.springframework.test.context.support.AbstractTestExecutionListener;
 
+import com.ericsson.ei.handlers.ObjectHandler;
+import com.ericsson.ei.mongodbhandler.MongoDBHandler;
+import com.ericsson.ei.rmqhandler.RmqHandler;
+import com.ericsson.ei.rules.RulesHandler;
+import com.ericsson.ei.waitlist.WaitListStorageHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.rabbitmq.client.Channel;
+
 /**
  * @author evasiba
  *
@@ -65,6 +67,9 @@ public abstract class FlowTestBase extends AbstractTestExecutionListener {
     @Autowired
     private MongoDBHandler mongoDBHandler;
 
+    @Autowired
+    private ConnectionFactory connectionFactory;
+
     @Autowired
     private WaitListStorageHandler waitlist;
 
@@ -78,24 +83,36 @@ public abstract class FlowTestBase extends AbstractTestExecutionListener {
 
     private static HashMap<String, FlowTestConfigs> configsMap = new HashMap<String, FlowTestConfigs>();
 
+    @Value("${systemTest:false}")
+    protected boolean systemTest;
+
     @Override
     public void beforeTestClass(TestContext testContext) throws Exception {
-        System.setProperty("flow.test", "true");
-        createFlowTestConfigs();
-        getFlowTestConfigs().init();
+        String systemTestProperty = System.getProperty("systemTest");
+        Boolean systemTestValue = Boolean.parseBoolean(systemTestProperty);
+        if (!systemTestValue) {
+            System.setProperty("flow.test", "true");
+            createFlowTestConfigs();
+            getFlowTestConfigs().init();
+        }
     }
 
     @PostConstruct
     public void init() {
-        mongoDBHandler.setMongoClient(getFlowTestConfigs().getMongoClient());
-        waitlist.setMongoDbHandler(mongoDBHandler);
+        LOGGER.info("System Test is: " + systemTest);
+        if (!systemTest) {
+            mongoDBHandler.setMongoClient(getFlowTestConfigs().getMongoClient());
+            waitlist.setMongoDbHandler(mongoDBHandler);
+        }
     }
 
     @After
     public void teardown() {
-        mongoDBHandler.setMongoClient(null);
-        getFlowTestConfigs().tearDown();
-        cleanFlowTestConfigs();
+        if (!systemTest) {
+            mongoDBHandler.setMongoClient(null);
+            getFlowTestConfigs().tearDown();
+            cleanFlowTestConfigs();
+        }
     }
 
     protected FlowTestConfigs getFlowTestConfigs() {
@@ -128,8 +145,8 @@ public void setFirstEventWaitTime(int value) {
 
     /**
      * Override this if you have more events that will be registered to event to
-     * object map but it is not visible in the test. For example from upstream
-     * or downstream from event repository
+     * object map but it is not visible in the test. For example from upstream or
+     * downstream from event repository
      * 
      * @return
      */
@@ -141,9 +158,16 @@ protected int extraEventsCount() {
     public void flowTest() {
         try {
             String queueName = rmqHandler.getQueueName();
-            Channel channel = getFlowTestConfigs().getConn().createChannel();
+            Channel channel = null;
+            if (!systemTest) {
+                channel = getFlowTestConfigs().getConn().createChannel();
+            } else {
+                channel = connectionFactory.createConnection().createChannel(true);
+            }
             String exchangeName = "ei-poc-4";
-            getFlowTestConfigs().createExchange(exchangeName, queueName);
+            if (!systemTest) {
+                getFlowTestConfigs().createExchange(exchangeName, queueName);
+            }
 
             rulesHandler.setRulePath(getRulesFilePath());
 
@@ -155,7 +179,11 @@ public void flowTest() {
             for (String eventName : eventNames) {
                 JsonNode eventJson = parsedJSON.get(eventName);
                 String event = eventJson.toString();
-                channel.basicPublish(exchangeName, queueName, null, event.getBytes());
+                if (!systemTest) {
+                    channel.basicPublish(exchangeName, queueName, null, event.getBytes());
+                } else {
+                    rmqHandler.publishObjectToWaitlistQueue(event);
+                }
                 if (!alreadyExecuted) {
                     try {
                         TimeUnit.MILLISECONDS.sleep(firstEventWaitTime);
@@ -191,8 +219,8 @@ public void flowTest() {
     abstract List<String> getEventNamesToSend();
 
     /**
-     * @return map, where key - _id of expected aggregated object value -
-     *         expected aggregated object
+     * @return map, where key - _id of expected aggregated object value - expected
+     *         aggregated object
      * 
      */
     abstract Map<String, JsonNode> getCheckData() throws IOException;
@@ -204,7 +232,13 @@ JsonNode getJSONFromFile(String filePath) throws IOException {
 
     // count documents that were processed
     private long countProcessedEvents(String database, String collection) {
-        MongoDatabase db = getFlowTestConfigs().getMongoClient().getDatabase(database);
+        MongoClient mongoClient = null;
+        if (!systemTest) {
+            mongoClient = getFlowTestConfigs().getMongoClient();
+        } else {
+            mongoClient = mongoDBHandler.getMongoClient();
+        }
+        MongoDatabase db = mongoClient.getDatabase(database);
         MongoCollection table = db.getCollection(collection);
         return table.count();
     }
diff --git a/src/test/java/com/ericsson/ei/flowtests/FlowTestConfigs.java b/src/test/java/com/ericsson/ei/flowtests/FlowTestConfigs.java
@@ -1,9 +1,5 @@
 package com.ericsson.ei.flowtests;
 
-import com.mongodb.MongoClient;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-
 import java.io.File;
 import java.io.IOException;
 
@@ -16,6 +12,10 @@
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.util.SocketUtils;
 
+import com.mongodb.MongoClient;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
 import lombok.Getter;
@@ -48,7 +48,7 @@ private void setUpMessageBus() throws Exception {
         System.setProperty("rabbitmq.password", "guest");
         System.setProperty("waitlist.initialDelayResend", "500");
         System.setProperty("waitlist.fixedRateResend", "100");
-
+        LOGGER.info("setting up message buss");
         String config = "src/test/resources/configs/qpidConfig.json";
         File qpidConfig = new File(config);
         amqpBroker = new AMQPBrokerManager(qpidConfig.getAbsolutePath(), port);
@@ -68,7 +68,7 @@ private void setUpEmbeddedMongo() throws IOException {
         try {
             testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
             mongoClient = testsFactory.newMongo();
-            String port = "" + mongoClient.getAddress().getPort();  
+            String port = "" + mongoClient.getAddress().getPort();
             System.setProperty("spring.data.mongodb.port", port);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
diff --git a/src/test/resources/AggregatedDocumentInternalCompositionLatest.json b/src/test/resources/AggregatedDocumentInternalCompositionLatest.json
@@ -53,8 +53,8 @@
                                           },
                                           "issues":[
 
-                                          ]
-                                       },
+                                          ],
+                                          "sourceCreations":[
                                        {
                                           "SCCEventId":"552ad6a4-c522-47e2-9195-0481930979e4",
                                           "author":null,
@@ -68,6 +68,8 @@
                                              }
                                           ]
                                        }
+                                       ]
+                                       }                                       
                                     ]
                                  }
                               ],
diff --git a/src/test/resources/test_events.json b/src/test/resources/test_events.json
@@ -196,7 +196,7 @@
                 "type": "COMPOSITION"
             },
             {
-                "target": "1100572b-c3j4-441e-abc9-b62f48080011",
+                "target": "1100572b-c3b4-461e-abc9-b62f48087011",
                 "type": "PREVIOUS_VERSION"
             },
             {
diff --git a/src/test/resources/upStreamInput.json b/src/test/resources/upStreamInput.json
diff --git a/src/test/resources/upStreamResultFile.json b/src/test/resources/upStreamResultFile.json
diff --git a/wiki/Testing.md b/wiki/Testing.md

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@`
`53`	`53`	`},`
`54`	`54`	`"issues":[`
`55`	`55`
`56`		`- ]`
`57`		`- },`
	`56`	`+ ],`
	`57`	`+ "sourceCreations":[`
`58`	`58`	`{`
`59`	`59`	`"SCCEventId":"552ad6a4-c522-47e2-9195-0481930979e4",`
`60`	`60`	`"author":null,`
`@@ -68,6 +68,8 @@`
`68`	`68`	`}`
`69`	`69`	`]`
`70`	`70`	`}`
	`71`	`+ ]`
	`72`	`+ }`
`71`	`73`	`]`
`72`	`74`	`}`
`73`	`75`	`],`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@`
`196`	`196`	`"type": "COMPOSITION"`
`197`	`197`	`},`
`198`	`198`	`{`
`199`		`- "target": "1100572b-c3j4-441e-abc9-b62f48080011",`
	`199`	`+ "target": "1100572b-c3b4-461e-abc9-b62f48087011",`
`200`	`200`	`"type": "PREVIOUS_VERSION"`
`201`	`201`	`},`
`202`	`202`	`{`