From 1420dc4929d35ff6ac3f944b931ad600d061dc4e Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 20 Jan 2020 21:46:47 +0200
Subject: Promise Request-id header: Check MDC value if no header

Issue-ID: VID-647

Change-Id: I9ed97742db1f37de68bfcf1b9cd58afc996da7bf
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../filter/PromiseRequestIdFilterTest.java         | 27 +++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'vid-app-common/src/test/java/org/onap/vid')

diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/filter/PromiseRequestIdFilterTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/filter/PromiseRequestIdFilterTest.java
index d67bd618c..f415bfbcb 100644
--- a/vid-app-common/src/test/java/org/onap/vid/controller/filter/PromiseRequestIdFilterTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/filter/PromiseRequestIdFilterTest.java
@@ -51,9 +51,12 @@ import javax.servlet.http.HttpServletResponse;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
+import org.onap.logging.ref.slf4j.ONAPLogConstants.MDCs;
 import org.onap.portalsdk.core.web.support.UserUtils;
 import org.onap.vid.logging.RequestIdHeader;
+import org.slf4j.MDC;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -70,10 +73,18 @@ public class PromiseRequestIdFilterTest {
 
     private final PromiseRequestIdFilter promiseRequestIdFilter = new PromiseRequestIdFilter();
 
+    @AfterMethod
+    public void tearDown() {
+        MDC.remove(MDCs.REQUEST_ID);
+    }
+
     @Test
-    public void givenRequestIdHeader_headerValueNotChanged() throws IOException, ServletException {
+    public void givenMdcValueAndRequestIdHeader_headerValueNotChanged() throws IOException, ServletException {
 
         final String someTxId = "863850e2-8545-4efd-94b8-afba5f52b3d5";
+        final String mdcTxId = "ed752ff1-3970-4f18-8219-2d821fa4eaea";
+
+        MDC.put(MDCs.REQUEST_ID, mdcTxId);
 
         final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
                 anotherHeader, anotherValue,
@@ -121,6 +132,20 @@ public class PromiseRequestIdFilterTest {
         buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, UserUtils::getRequestId);
     }
 
+    @Test
+    public void givenMdcValueAndNoRequestIdHeader_headerValueWasFromMDC() throws IOException, ServletException {
+
+        final String mdcTxId = "ed752ff1-3970-4f18-8219-2d821fa4eaea";
+
+        MDC.put(MDCs.REQUEST_ID, mdcTxId);
+
+        final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
+                anotherHeader, anotherValue
+        );
+
+        buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, specificTxId(mdcTxId));
+    }
+
     @Test
     public void givenTwoRequestIdHeader_onapHeaderValueIsUsed() throws IOException, ServletException {
 
-- 
cgit 1.2.3-korg