From e8d29ab5e3775472f59a4997fa3a5df9319de306 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 10 Oct 2019 15:22:07 +0300 Subject: use logging interceptor in SDC client Issue-ID: VID-253 Change-Id: I67947886fd8945a224ee81d5eb0a8fedf1f7317c Signed-off-by: Eylon Malin --- .../java/org/onap/vid/asdc/rest/SdcRestClientITTest.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'vid-app-common/src/test') diff --git a/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java b/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java index 7cbf0805b..3a76a33e2 100644 --- a/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java @@ -24,18 +24,13 @@ import static com.xebialabs.restito.semantics.Action.ok; import static com.xebialabs.restito.semantics.Action.stringContent; import static org.apache.http.client.config.RequestConfig.custom; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.matchesPattern; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.hamcrest.collection.IsMapContaining.hasEntry; import static org.hamcrest.collection.IsMapContaining.hasKey; -import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.onap.vid.client.SyncRestClientInterface.HEADERS.X_ECOMP_INSTANCE_ID; -import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY; import com.fasterxml.jackson.core.JsonProcessingException; import com.xebialabs.restito.semantics.Call; @@ -129,12 +124,7 @@ public class SdcRestClientITTest { assertTrue(first.isPresent()); - assertThat(first.get().getHeaders(), - allOf( - hasEntry(equalToIgnoringCase(REQUEST_ID_HEADER_KEY), contains(matchesPattern(UUID_REGEX))), - hasKey(equalToIgnoringCase(X_ECOMP_INSTANCE_ID)), - hasEntry(equalToIgnoringCase("x-onap-partnerName"), contains(equalTo("VID.VID"))) - )); + assertThat(first.get().getHeaders(), hasKey(equalToIgnoringCase(X_ECOMP_INSTANCE_ID))); } private Service getExpectedService(String stringId) { -- cgit 1.2.3-korg