From: Jonathan Gathman <jonathan.gathman@att.com>
Date: Wed, 10 Oct 2018 22:35:09 +0000 (+0000)
Subject: Merge "Enhance fproxy unit tests"
X-Git-Tag: 2.1.8~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a573ad26b84bdce011543ab30b00eb2b561ca17e;hp=5d725231eb1f39df15c6a4016b92563137726577;p=aaf%2Fcadi.git

Merge "Enhance fproxy unit tests"
---

diff --git a/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java b/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java
index ccf13e9..e78d48b 100644
--- a/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java
+++ b/sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java
@@ -76,11 +76,14 @@ public class FProxyServiceTest {
     public void testRequestFrowarding() throws Exception {
         String testUrl = "https://localhost:80/testurl";
         String testResponse = "Response from MockRestService";
+        String testTransactionId = "63f88b50-6345-4a61-bc59-3a48cabb60a4";
 
         mockServer.expect(requestTo(testUrl)).andExpect(method(HttpMethod.GET))
+                .andExpect(header(transactionIdHeaderName, testTransactionId))
                 .andRespond(withSuccess(testResponse, MediaType.APPLICATION_JSON));
 
-        mvc.perform(MockMvcRequestBuilders.get(testUrl).accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk())
+        mvc.perform(MockMvcRequestBuilders.get(testUrl).accept(MediaType.APPLICATION_JSON)
+                .header(transactionIdHeaderName, testTransactionId)).andExpect(status().isOk())
                 .andExpect(content().string(equalTo(testResponse)));
 
         mockServer.verify();
@@ -105,6 +108,7 @@ public class FProxyServiceTest {
 
         // Expect mock server to be called with request containing cached header
         mockServer.expect(requestTo(testUrl)).andExpect(method(HttpMethod.GET))
+                .andExpect(header(transactionIdHeaderName, testTransactionId))
                 .andExpect(header(headerName, headerValue))
                 .andRespond(withSuccess(testResponse, MediaType.APPLICATION_JSON));