Reduce and improve logs during test executions (#313)

Author: tobiasake

src/main/java/com/ericsson/ei/controller/SubscriptionControllerImpl.java

@@ -114,10 +114,13 @@ public ResponseEntity<?> getSubscriptionByNames(@PathVariable String subscriptio
                 foundSubscriptionList.add(subscription);
                 LOGGER.debug("Subscription [{}] fetched successfully.", subscriptionName);
             } catch (SubscriptionNotFoundException e) {
-                LOGGER.error("Subscription not found: {}",subscriptionName , e);
+                LOGGER.error("Subscription not found: {}", subscriptionName);
+                LOGGER.debug("Subscription not found traceback:\n {}", e);
                 notFoundSubscriptionList.add(subscriptionName);
             } catch (Exception e) {
-                LOGGER.error("Failed to fetch subscription {}", subscriptionName, e);
+                LOGGER.error("Failed to fetch subscription {}", subscriptionName);
+                LOGGER.debug("Failed to fetch subscription:\n {}", e);
+
                 notFoundSubscriptionList.add(subscriptionName);
             }
         });

src/main/java/com/ericsson/ei/handlers/MongoDBHandler.java

@@ -35,6 +35,8 @@
 import com.mongodb.MongoClient;
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoCredential;
+import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoSocketReadException;
 import com.mongodb.MongoWriteException;
 import com.mongodb.ServerAddress;
 import com.mongodb.client.MongoCollection;
@@ -266,8 +268,34 @@ public void createTTLIndex(String dataBaseName, String collectionName, String fi
     private MongoCollection<Document> getMongoCollection(String dataBaseName, String collectionName) {
         if (mongoClient == null)
             return null;
-        MongoDatabase db = mongoClient.getDatabase(dataBaseName);
-        List<String> collectionList = db.listCollectionNames().into(new ArrayList<String>());
+        MongoDatabase db;
+        List<String> collectionList;
+        try {
+            db = mongoClient.getDatabase(dataBaseName);
+            collectionList = db.listCollectionNames().into(new ArrayList<String>());
+        }
+        catch (MongoCommandException e) {
+            LOGGER.error("MongoCommandException, Something went wrong with MongoDb connection. Error: " + e.getErrorMessage() + "\nStacktrace\n" + e);
+            closeMongoDbConecction();
+            return null;
+        }
+        catch (MongoInterruptedException e) {
+            LOGGER.error(" MongoInterruptedException, MongoDB shutdown or interrupted. Error: " + e.getMessage() + "\nStacktrace\n" + e);
+            closeMongoDbConecction();
+            return null;
+        }
+        catch (MongoSocketReadException e) {
+            LOGGER.error("MongoSocketReadException, MongoDB shutdown or interrupted. Error: " + e.getMessage() + "\nStacktrace\n" + e);
+            closeMongoDbConecction();
+            return null;
+        }
+        
+        catch (IllegalStateException e) {
+            LOGGER.error("IllegalStateException, MongoDB state not good. Error: " + e.getMessage());
+            closeMongoDbConecction();
+            return null;
+        }
+        
         if (!collectionList.contains(collectionName)) {
             LOGGER.debug("The requested database({}) / collection({}) not available in mongodb, Creating ........", dataBaseName, collectionName);
             try {
@@ -286,6 +314,13 @@ private MongoCollection<Document> getMongoCollection(String dataBaseName, String
         return collection;
     }
 
+    private void closeMongoDbConecction() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+        mongoClient = null;
+    }
+    
     /**
      * This method is used to drop a collection.
      *

src/main/java/com/ericsson/ei/notifications/HttpRequestSender.java

@@ -25,6 +25,7 @@
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestOperations;
 
 /**
@@ -62,6 +63,9 @@ public boolean postDataMultiValue(String url, HttpEntity<?> request)
             LOGGER.error("HTTP request failed, bad request! When trying to connect to URL: {}\n{}",
                     url, e);
             return false;
+        } catch (HttpServerErrorException e) {
+            LOGGER.error("HttpServerErrorException, HTTP request to url {} failed\n", url, e);
+            return false;
         } catch (Exception e) {
             LOGGER.error("HTTP request to url {} failed\n", url, e);
             return false;

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

@@ -26,15 +26,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootContextLoader;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.ericsson.ei.App;
 import com.ericsson.ei.handlers.MongoDBHandler;
-import com.ericsson.ei.utils.TestContextInitializer;
+import com.ericsson.ei.utils.FunctionalTestBase;
 import com.mongodb.BasicDBObject;
 import com.mongodb.util.JSON;
 
@@ -43,10 +39,8 @@
         "missedNotificationDataBaseName: SubscriptionRepeatDbHandlerTest-missedNotifications",
         "rabbitmq.exchange.name: SubscriptionRepeatDbHandlerTest-exchange",
         "rabbitmq.consumerName: SubscriptionRepeatDbHandlerTest" })
-@ContextConfiguration(classes = App.class, loader = SpringBootContextLoader.class, initializers = TestContextInitializer.class)
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = { App.class })
-public class SubscriptionRepeatDbHandlerTest {
+public class SubscriptionRepeatDbHandlerTest extends FunctionalTestBase {
 
     static Logger log = LoggerFactory.getLogger(SubscriptionRepeatDbHandlerTest.class);
 

src/test/resources/logback.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36}.%M - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+    <logger name="org.mockserver.mock" level="error" />
+</configuration>