try to fix tests

Author: Vasile Baluta

.travis.yml

@@ -9,5 +9,4 @@ before_install:
   - chmod +x pom.xml
 
 script:
-  - rm /home/travis/.embedmongo/extracted/Linux-B64--3.4.1/extractmongod
   - mvn clean install

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

@@ -80,10 +80,11 @@ public void tearDown() {
             // exception and go on
         }
 
-        if (testsFactory != null)
-            testsFactory.shutdown();
         if (mongoClient != null)
             mongoClient.close();
+        if (testsFactory != null)
+            testsFactory.shutdown();
+
     }
 
     void createExchange(final String exchangeName, final String queueName) {

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

@@ -107,9 +107,10 @@ public void test() {
     @After
     public void dropCollection() {
         mongoDBHandler.dropDocument(dataBaseName, collectionName, condition);
-        if (testsFactory != null)
-            testsFactory.shutdown();
         if (mongoClient != null)
             mongoClient.close();
+        if (testsFactory != null)
+            testsFactory.shutdown();
+
     }
 }

src/test/java/com/ericsson/ei/mongoDBHandler/test/MongoDBHandlerTest.java

@@ -90,7 +90,8 @@ public void testUpdateDocument() {
     @After
     public void dropCollection() {
         assertTrue(mongoDBHandler.dropDocument(dataBaseName, collectionName, condition));
-        testsFactory.shutdown();
         mongoClient.close();
+        testsFactory.shutdown();
+
     }
 }

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

@@ -181,10 +181,10 @@ record = (ObjectNode) tempRecord;
 
     @AfterClass
     public static void tearDown() throws Exception {
-        if (testsFactory != null)
-            testsFactory.shutdown();
         if (mongoClient != null)
             mongoClient.close();
+        if (testsFactory != null)
+            testsFactory.shutdown();
     }
 
 }

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

@@ -56,8 +56,8 @@ public void initMocks() {
 
     @AfterClass
     public static void tearDownMongoDB() throws Exception {
-        testsFactory.shutdown();
         mongoClient.close();
+        testsFactory.shutdown();
     }
 
     @Test

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

@@ -91,10 +91,11 @@ public void init() {
 
     @AfterClass
     public static void tearDownMongoDB() throws Exception {
-        if (testsFactory != null)
-            testsFactory.shutdown();
         if (mongoClient != null)
             mongoClient.close();
+        if (testsFactory != null)
+            testsFactory.shutdown();
+
     }
 
     @Test

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

@@ -129,8 +129,8 @@ public static void init() throws Exception {
 
     @AfterClass
     public static void close() {
-        testsFactory.shutdown();
         mongoClient.close();
+        testsFactory.shutdown();
     }
 
     @PostConstruct