try to fix unit tests

Author: Vali (Vasile Baluta)

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

@@ -34,47 +34,48 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class SubscriptionServiceTest {
-    
+
     String subscriptionName;
 
     @Autowired
     private ISubscriptionService subscriptionService;
-    
+
     @Autowired
     private MongoDBHandler mongoDBHandler;
-    
+
     private static MongodForTestsFactory testsFactory;
-    
+
     ObjectMapper mapper = new ObjectMapper();
-    
+
     private static final String subscriptionJsonPath = "src/test/resources/subscription.json";
-    
+
     static JSONArray jsonArray = null;
     static MongoClient mongoClient = null;
-    
+
     @BeforeClass
     public static void setMongoDB() throws IOException, JSONException {
         testsFactory = MongodForTestsFactory.with(Version.V3_4_1);
         String readFileToString = FileUtils.readFileToString(new File(subscriptionJsonPath));
         jsonArray = new JSONArray(readFileToString);
         mongoClient = testsFactory.newMongo();
-        
+
         ArrayList<String> list = new ArrayList<String>();
         for (int i = 0; i < jsonArray.length(); i++) {
             list.add(jsonArray.getJSONObject(i).toString());
         }
     }
-    
+
     @PostConstruct
     public void initMocks() {
         mongoDBHandler.setMongoClient(mongoClient);
     }
-    
+
     @AfterClass
     public static void tearDownMongoDB() throws Exception {
         testsFactory.shutdown();
+        mongoClient.close();
     }
-    
+
     @Test
     public void testInsertSubscription() {
         Subscription subscription;
@@ -87,7 +88,7 @@ public void testInsertSubscription() {
         } catch (Exception e) {
         }
     }
-    
+
     @Test
     public void testUpdateSubscription() {
         Subscription subscription;
@@ -100,45 +101,45 @@ public void testUpdateSubscription() {
             subscription2 = null;
             subscription2 = subscriptionService.getSubscription(expectedSubscriptionName);
             subscriptionName = subscription2.getSubscriptionName();
-            
+
             assertEquals(subscriptionName, expectedSubscriptionName);
             // Updating subscription2(subscriptionName=Subscription_Test) with
             // the subscription(subscriptionName=Subscription_Test_Modify)
             subscription = mapper.readValue(jsonArray.getJSONObject(1).toString(), Subscription.class);
             String expectedModifiedSubscriptionName = subscription2.getSubscriptionName();
             boolean addSubscription = subscriptionService.modifySubscription(subscription,
                     subscriptionName);
-            
+
             // test update done successfully
             assertEquals(addSubscription, true);
             subscription = null;
             subscription = subscriptionService.getSubscription(expectedModifiedSubscriptionName);
             subscriptionName = subscription.getSubscriptionName();
             assertEquals(subscriptionName, expectedModifiedSubscriptionName);
-            
+
             // deleting the test data
             deleteSubscriptionsByName(subscriptionName);
         } catch (Exception e) {
         }
     }
-    
+
     @Test
     public void testGetAllSubscriptions() {
         List<Subscription> subscriptions;
         try {
             // Insert Subscription
             Subscription subscription2 = mapper.readValue(jsonArray.getJSONObject(0).toString(), Subscription.class);
             subscriptionService.addSubscription(subscription2);
-            
+
             subscriptions = subscriptionService.getSubscription();
             assertTrue(subscriptions.size() > 0);
-            
+
             // deleting the test data
             deleteSubscriptionsByName(subscription2.getSubscriptionName());
         } catch (SubscriptionNotFoundException | IOException | JSONException e) {
         }
     }
-    
+
     @Test
     public void testGetSubscriptionsByName() {
         Subscription subscription;
@@ -155,15 +156,15 @@ public void testGetSubscriptionsByName() {
         } catch (SubscriptionNotFoundException | IOException | JSONException e) {
         }
     }
-    
+
     @Test
     public void testIsDuplicatedSubscription() {
         boolean isDuplicatedSubscription;
         try {
             // Insert Subscription
             Subscription subscription2 = mapper.readValue(jsonArray.getJSONObject(0).toString(), Subscription.class);
             subscriptionService.addSubscription(subscription2);
-            
+
             subscriptionName = subscription2.getSubscriptionName();
             isDuplicatedSubscription = subscriptionService.isDuplicatedSubscription(subscriptionName);
             assertEquals(isDuplicatedSubscription, true);
@@ -172,27 +173,27 @@ public void testIsDuplicatedSubscription() {
         } catch (IOException | JSONException e) {
         }
     }
-    
+
     @Test
     public void testDeleteSubscriptionsByName() {
         // Insert Subscription
         Subscription subscription2;
         try {
             subscription2 = mapper.readValue(jsonArray.getJSONObject(0).toString(), Subscription.class);
-            
+
             subscriptionService.addSubscription(subscription2);
             String expectedSubscriptionName = subscription2.getSubscriptionName();
             boolean deleteSubscription = subscriptionService.deleteSubscription(expectedSubscriptionName);
             assertEquals(deleteSubscription, true);
         } catch (IOException | JSONException e) {
         }
     }
-    
+
     @Test(expected = SubscriptionNotFoundException.class)
     public void testExceptionGetSubscriptionsByName() throws SubscriptionNotFoundException {
         subscriptionService.getSubscription("Subscription_Test1238586455");
     }
-    
+
     private void deleteSubscriptionsByName(String subscriptionName) {
         subscriptionService.deleteSubscription(subscriptionName);
     }

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

@@ -68,7 +68,7 @@ public class TestWaitListWorker {
     JsonNode jsonNode;
     @Mock
     RulesObject rulesObject;
-  
+
 
     @Before
     public void init() throws Exception {
@@ -165,7 +165,6 @@ public void testPublishandReceiveEvent() {
             Channel channel = conn.createChannel();
             String queueName = "er001-eiffelxxx.eiffelintelligence.messageConsumer.durable";
             String exchange = "ei-poc-4";
-            channel.basicPublish(exchange, queueName, null, jsonFileContent.getBytes());
             Consumer consumer = new DefaultConsumer(channel) {
                 @Override
                 public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties,
@@ -175,7 +174,9 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
                 }
             };
             channel.basicConsume(queueName, true, consumer);
-            Thread.sleep(100);
+            channel.basicPublish(exchange, queueName, null, jsonFileContent.getBytes());
+            Thread.sleep(1000);
+            assertTrue(message != null);
             assertTrue(message.equals(jsonFileContent));
         } catch (Exception e) {
             assertFalse(true);