Fix audit, metric and error logs as per logging specification

[clamp.git] / src / test / java / org / onap / clamp / clds / util / LoggingUtilsTest.java

diff --git a/src/test/java/org/onap/clamp/clds/util/LoggingUtilsTest.java b/src/test/java/org/onap/clamp/clds/util/LoggingUtilsTest.java
index 7e2da4d..7e823e1 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/util/LoggingUtilsTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/LoggingUtilsTest.java
@@ -21,30 +21,28 @@
 
 package org.onap.clamp.clds.util;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Map;
-
 import javax.net.ssl.HttpsURLConnection;
 import javax.servlet.http.HttpServletRequest;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.slf4j.event.Level;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -56,9 +54,9 @@ import org.springframework.security.core.userdetails.UserDetails;
 @RunWith(MockitoJUnitRunner.class)
 public class LoggingUtilsTest {
 
-    private static final EELFLogger logger = EELFManager.getInstance().getLogger(LoggingUtilsTest.class);
+    protected static final Logger logger = LoggerFactory.getLogger(LoggingUtilsTest.class);
 
-    private static final String SERVICE_NAME =  "LogginUtilsTest: Test Entering method";
+    private static final String SERVICE_NAME = "LogginUtilsTest: Test Entering method";
 
     private LoggingUtils util;
 
@@ -72,8 +70,6 @@ public class LoggingUtilsTest {
         // given
         final String userName = "test";
 
-        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-
         UserDetails userDetails = Mockito.mock(UserDetails.class);
         Mockito.when(userDetails.getUsername()).thenReturn(userName);
 
@@ -84,34 +80,30 @@ public class LoggingUtilsTest {
         Mockito.when(securityContext.getAuthentication()).thenReturn(localAuth);
         SecurityContextHolder.setContext(securityContext);
 
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
         // when
         util.entering(request, SERVICE_NAME);
 
         // then
-        String[] keys = { ONAPLogConstants.MDCs.PARTNER_NAME,
-                ONAPLogConstants.MDCs.ENTRY_TIMESTAMP,
-                ONAPLogConstants.MDCs.REQUEST_ID,
-                ONAPLogConstants.MDCs.INVOCATION_ID,
-                ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS,
-                ONAPLogConstants.MDCs.SERVER_FQDN,
-                ONAPLogConstants.MDCs.INSTANCE_UUID,
-                ONAPLogConstants.MDCs.SERVICE_NAME
-        };
+        String[] keys = {OnapLogConstants.Mdcs.PARTNER_NAME, OnapLogConstants.Mdcs.ENTRY_TIMESTAMP,
+            OnapLogConstants.Mdcs.REQUEST_ID, OnapLogConstants.Mdcs.INVOCATION_ID,
+            OnapLogConstants.Mdcs.CLIENT_IP_ADDRESS, OnapLogConstants.Mdcs.SERVER_FQDN,
+            OnapLogConstants.Mdcs.INSTANCE_UUID, OnapLogConstants.Mdcs.SERVICE_NAME};
         Map<String, String> mdc = MDC.getMDCAdapter().getCopyOfContextMap();
 
         assertTrue(checkMapKeys(mdc, keys));
-        assertEquals(userName,
-               mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME));
+        assertEquals(userName, mdc.get(OnapLogConstants.Mdcs.PARTNER_NAME));
     }
 
     @Test
     public void testExistingLoggingUtils() {
         // given
-        MDC.put(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP,
-                ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ISO_INSTANT));
+        MDC.put(OnapLogConstants.Mdcs.ENTRY_TIMESTAMP,
+            ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ISO_INSTANT));
 
         // when
-        util.exiting("200", SERVICE_NAME, Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+        util.exiting(HttpStatus.OK.value(), SERVICE_NAME, Level.INFO,
+            OnapLogConstants.ResponseStatus.COMPLETE);
 
         // then
         Map<String, String> mdc = MDC.getMDCAdapter().getCopyOfContextMap();
@@ -130,16 +122,14 @@ public class LoggingUtilsTest {
 
         // then
         assertNotNull(secureConnection);
-        String[] keys = {ONAPLogConstants.MDCs.TARGET_ENTITY,
-                ONAPLogConstants.MDCs.TARGET_SERVICE_NAME,
-                ONAPLogConstants.MDCs.INVOCATIONID_OUT,
-                ONAPLogConstants.MDCs.INVOKE_TIMESTAMP
-        };
+        String[] keys =
+            {OnapLogConstants.Mdcs.TARGET_ENTITY, OnapLogConstants.Mdcs.TARGET_SERVICE_NAME,
+                OnapLogConstants.Mdcs.INVOCATIONID_OUT, OnapLogConstants.Mdcs.INVOKE_TIMESTAMP};
         Map<String, String> mdc = MDC.getMDCAdapter().getCopyOfContextMap();
 
         assertTrue(checkMapKeys(mdc, keys));
-        assertEquals(targetEntity, mdc.get(ONAPLogConstants.MDCs.TARGET_ENTITY));
-        assertEquals(targetServiceName, mdc.get(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME));
+        assertEquals(targetEntity, mdc.get(OnapLogConstants.Mdcs.TARGET_ENTITY));
+        assertEquals(targetServiceName, mdc.get(OnapLogConstants.Mdcs.TARGET_SERVICE_NAME));
     }
 
     private boolean checkMapKeys(Map map, String[] keys) {