more tests updates

Author: Vasile Baluta

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

@@ -68,12 +68,12 @@ private void setUpEmbeddedMongo() throws IOException {
         try {
             testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
             mongoClient = testsFactory.newMongo();
+            String port = "" + mongoClient.getAddress().getPort();
+            System.setProperty("mongodb.port", port);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
             e.printStackTrace();
         }
-        String port = "" + mongoClient.getAddress().getPort();
-        System.setProperty("mongodb.port", port);
     }
 
     public void tearDown() {

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

@@ -93,12 +93,12 @@ public static void setUpEmbeddedMongo() throws Exception {
         try {
             testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
             mongoClient = testsFactory.newMongo();
+            String port = "" + mongoClient.getAddress().getPort();
+            System.setProperty("mongodb.port", port);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             e.printStackTrace();
         }
-        String port = "" + mongoClient.getAddress().getPort();
-        System.setProperty("mongodb.port", port);
 
         try {
             aggregatedObject = FileUtils.readFileToString(new File(aggregatedPath));

src/test/java/com/ericsson/ei/rules/test/TestRulesService.java

@@ -50,12 +50,12 @@ public static void setMongoDB() throws IOException, JSONException {
         try {
             testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
             mongoClient = testsFactory.newMongo();
+            String port = "" + mongoClient.getAddress().getPort();
+            System.setProperty("mongodb.port", port);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
             e.printStackTrace();
         }
-        String port = "" + mongoClient.getAddress().getPort();
-        System.setProperty("mongodb.port", port);
     }
 
     @PostConstruct

src/test/java/com/ericsson/ei/subscription/SubscriptionServiceTest.java

@@ -78,15 +78,15 @@ public class SubscriptionServiceTest {
     public static void setMongoDB() throws IOException, JSONException {
         try {
             testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
+            mongoClient = testsFactory.newMongo();
+            String port = "" + mongoClient.getAddress().getPort();
+            System.setProperty("mongodb.port", port);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
             e.printStackTrace();
         }
         String readFileToString = FileUtils.readFileToString(new File(subscriptionJsonPath), "UTF-8");
         jsonArray = new JSONArray(readFileToString);
-        mongoClient = testsFactory.newMongo();
-        String port = "" + mongoClient.getAddress().getPort();
-        System.setProperty("mongodb.port", port);
 
         ArrayList<String> list = new ArrayList<String>();
         for (int i = 0; i < jsonArray.length(); i++) {

src/test/java/com/ericsson/ei/subscriptionhandler/test/SubscriptionHandlerTest.java

@@ -111,12 +111,12 @@ public static void setUpEmbeddedMongo() throws JSONException, IOException {
         try {
             testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
             mongoClient = testsFactory.newMongo();
+            String port = "" + mongoClient.getAddress().getPort();
+            System.setProperty("mongodb.port", port);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
             e.printStackTrace();
         }
-        String port = "" + mongoClient.getAddress().getPort();
-        System.setProperty("mongodb.port", port);
         aggregatedObject = FileUtils.readFileToString(new File(aggregatedPath), "UTF-8");
         subscriptionData = FileUtils.readFileToString(new File(subscriptionPath), "UTF-8");
         url = new JSONObject(subscriptionData).getString("notificationMeta").replaceAll(REGEX, "");