1 files changed, 33 insertions, 27 deletions

diff --git a/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java b/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java
index bdf8bd0..fb6ca71 100644
--- a/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java
+++ b/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java
@@ -24,6 +24,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.when;
+
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.HttpHeaders;
@@ -116,6 +119,7 @@ public class MDCSetupTest extends MDCSetup {
         HashMap<String, String> headers = new HashMap<>();
         headers.put(ONAPLogConstants.Headers.INVOCATION_ID, invocationId);
         setInvocationId(new SimpleHashMap(headers));
+        assertEquals(invocationId, MDC.get(ONAPLogConstants.MDCs.SERVER_INVOCATION_ID));
         assertEquals(invocationId, MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
     }
 
@@ -123,20 +127,7 @@ public class MDCSetupTest extends MDCSetup {
     public void setInvocationIdNoHeaderTest() {
         HashMap<String, String> headers = new HashMap<>();
         setInvocationId(new SimpleHashMap(headers));
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-    }
-
-    @Test
-    public void setInvovationIdFromMDCTest() {
-        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, "7b77143c-9b50-410c-ac2f-05758a68e3e8");
-        setInvocationIdFromMDC();
-        assertEquals("7b77143c-9b50-410c-ac2f-05758a68e3e8", MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-    }
-
-    @Test
-    public void setInvocationIdFromMDCNoInvocationIdTest() {
-        setInvocationIdFromMDC();
-        // InvocationId is set to a random UUID
+        assertNotNull(MDC.get(ONAPLogConstants.MDCs.SERVER_INVOCATION_ID));
         assertNotNull(MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
     }
 
@@ -156,7 +147,7 @@ public class MDCSetupTest extends MDCSetup {
 
     @Test
     public void clearClientMDCsTest() {
-        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, "7b77143c-9b50-410c-ac2f-05758a68e3e9");
+        MDC.put(ONAPLogConstants.MDCs.CLIENT_INVOCATION_ID, "7b77143c-9b50-410c-ac2f-05758a68e3e9");
         MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, "Bad Gateway");
         MDC.put(ONAPLogConstants.MDCs.ERROR_DESC, "Bad Gateway");
         MDC.put(ONAPLogConstants.MDCs.ERROR_CODE, "502");
@@ -167,7 +158,7 @@ public class MDCSetupTest extends MDCSetup {
         MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP, "2019-06-18T02:09:06.024Z");
 
         clearClientMDCs();
-        assertNull(MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
+        assertNull(MDC.get(ONAPLogConstants.MDCs.CLIENT_INVOCATION_ID));
         assertNull(MDC.get(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION));
         assertNull(MDC.get(ONAPLogConstants.MDCs.ERROR_CODE));
         assertNull(MDC.get(ONAPLogConstants.MDCs.ERROR_DESC));
@@ -237,17 +228,6 @@ public class MDCSetupTest extends MDCSetup {
     }
 
     @Test
-    public void setMDCPartnerNameClientIdHeaderTest() {
-        MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
-        headerMap.putSingle(Constants.HttpHeaders.CLIENT_ID, "SO");
-        SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap);
-
-        setMDCPartnerName(headers);
-
-        assertEquals("SO", MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME));
-    }
-
-    @Test
     public void setMDCPartnerNameNoHeaderTest() {
         MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
         SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap);
@@ -322,4 +302,30 @@ public class MDCSetupTest extends MDCSetup {
         assertEquals("UNKNOWN", partnerName);
     }
 
+    @Test
+    public void overrideServerIp() {
+        String ip = "127.0.0.1";
+        System.setProperty(serverIpAddressOverride, ip);
+        MDCSetup m = new MDCSetup();
+        assertEquals(ip, m.serverIpAddress);
+    }
+
+    @Test
+    public void overrideServerFqdn() {
+        String nodeName = "node300";
+        System.setProperty(serverFqdnOverride, nodeName);
+        MDCSetup m = new MDCSetup();
+        assertEquals(nodeName, m.serverFqdn);
+    }
+
+    @Test
+    public void testPrecision() {
+        System.setProperty(MDCSetup.INSTANT_PRECISION_OVERRIDE, "3");
+        ZonedDateTime zdt = ZonedDateTime.now(ZoneOffset.UTC);
+        zdt = zdt.withNano(333666999);
+        MDCSetup m = new MDCSetup();
+        String currentTimestamp = m.getCurrentTimeStamp();
+        assertEquals(24, currentTimestamp.length());
+    }
+
 }