aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2018-10-10 22:35:09 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-10 22:35:09 +0000
commita573ad26b84bdce011543ab30b00eb2b561ca17e (patch)
tree134d3fa175b3b47a5ed54cf5614bf6d27ca1bbcd
parent5d725231eb1f39df15c6a4016b92563137726577 (diff)
parentb28b902cbd478816290a098e80c96e33ac570309 (diff)
Merge "Enhance fproxy unit tests"
-rw-r--r--sidecar/fproxy/src/test/java/org/onap/aaf/fproxy/FProxyServiceTest.java6
1 files changed, 5 insertions, 1 deletions
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));