From ed8fc543198ec2a878f7e4e2966fa66a6c4986a9 Mon Sep 17 00:00:00 2001 From: pwielebs Date: Thu, 12 Apr 2018 10:34:26 +0200 Subject: http patch request added Change-Id: I9b3e339008d790b253e2b94e4b307b9a86907988 Issue-ID: DCAEGEN2-407 Signed-off-by: pwielebs --- .../service/AAIExtendedHttpClientImplTest.java | 34 +++++++++++++--------- .../services/service/AAIHttpClientImplTest.java | 1 - .../service/utils/HttpRequestDetailsTest.java | 9 ++++-- 3 files changed, 27 insertions(+), 17 deletions(-) (limited to 'prh-aai-client/src/test') diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImplTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImplTest.java index e114bbfd..9ff34b8e 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImplTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClientImplTest.java @@ -31,8 +31,11 @@ import java.util.Map; import java.util.Optional; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPatch; import org.apache.http.client.methods.HttpPut; import org.apache.http.impl.client.CloseableHttpClient; +import org.immutables.value.internal.$processor$.meta.$GsonMirrors; +import org.junit.Ignore; import org.junit.jupiter.api.*; import org.onap.dcaegen2.services.config.AAIHttpClientConfiguration; import org.onap.dcaegen2.services.utils.HttpRequestDetails; @@ -45,19 +48,21 @@ public class AAIExtendedHttpClientImplTest { private static CloseableHttpClient closeableHttpClientMock = mock(CloseableHttpClient.class); private static HttpRequestDetails httpRequestDetailsMock = mock(HttpRequestDetails.class); private static Optional expectedResult = Optional.empty(); + private static final String JSON_MESSAGE = "{ \"ipaddress-v4-oam\": \"11.22.33.44\" }"; + private static final String PNF_ID = "NOKQTFCOC540002E"; @BeforeAll public static void init() throws NoSuchFieldException, IllegalAccessException { Map queryParams = new HashMap<>(); - queryParams.put("ipaddress-v4-oam", "11.22.33.44"); + queryParams.put("pnf-id", PNF_ID); - Map AAI_HEADERS = new HashMap<>(); - AAI_HEADERS.put("X-FromAppId", "prh"); - AAI_HEADERS.put("X-TransactionId", "vv-temp"); - AAI_HEADERS.put("Accept", "application/json"); - AAI_HEADERS.put("Real-Time", "true"); - AAI_HEADERS.put("Content-Type", "application/json"); + Map aaiHeaders = new HashMap<>(); + aaiHeaders.put("X-FromAppId", "prh"); + aaiHeaders.put("X-TransactionId", "vv-temp"); + aaiHeaders.put("Accept", "application/json"); + aaiHeaders.put("Real-Time", "true"); + aaiHeaders.put("Content-Type", "application/json"); when(aaiHttpClientConfigurationMock.aaiHost()).thenReturn("54.45.33.2"); when(aaiHttpClientConfigurationMock.aaiProtocol()).thenReturn("https"); @@ -65,9 +70,10 @@ public class AAIExtendedHttpClientImplTest { when(aaiHttpClientConfigurationMock.aaiUserName()).thenReturn("PRH"); when(aaiHttpClientConfigurationMock.aaiUserPassword()).thenReturn("PRH"); - when(httpRequestDetailsMock.aaiAPIPath()).thenReturn("/aai/v11/network/pnfs/pnf/NOKQTFCOC540002E"); - when(httpRequestDetailsMock.headers()).thenReturn(AAI_HEADERS); + when(httpRequestDetailsMock.aaiAPIPath()).thenReturn("/aai/v11/network/pnfs/pnf"); + when(httpRequestDetailsMock.headers()).thenReturn(aaiHeaders); when(httpRequestDetailsMock.queryParameters()).thenReturn(queryParams); + when(httpRequestDetailsMock.jsonBody()).thenReturn(Optional.of(JSON_MESSAGE)); testedObject = new AAIExtendedHttpClientImpl(aaiHttpClientConfigurationMock); setField(); @@ -83,13 +89,13 @@ public class AAIExtendedHttpClientImplTest { } @Test - public void getHttpResponseGet_success() throws IOException { - when(httpRequestDetailsMock.requestVerb()).thenReturn(RequestVerbs.GET); + public void getHttpResponsePatch_success() throws IOException { + when(httpRequestDetailsMock.requestVerb()).thenReturn(RequestVerbs.PATCH); - expectedResult = Optional.of("getExtendedDetailsOK"); + expectedResult = Optional.of(JSON_MESSAGE); - when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))). - thenReturn(expectedResult); + when(closeableHttpClientMock.execute(any(HttpPatch.class), any(ResponseHandler.class))) + .thenReturn(expectedResult); Optional actualResult = testedObject.getHttpResponse(httpRequestDetailsMock); Assertions.assertEquals(expectedResult.get(), actualResult.get()); diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java index d26e6afa..fd13f1e7 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java @@ -44,7 +44,6 @@ public class AAIHttpClientImplTest { when(aaiHttpClientConfigurationMock.aaiUserPassword()).thenReturn("PNF"); when(aaiHttpClientConfigurationMock.aaiIgnoreSSLCertificateErrors()).thenReturn(true); - testedObject = new AAIHttpClientImpl(aaiHttpClientConfigurationMock); } diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpRequestDetailsTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpRequestDetailsTest.java index 36105d05..563e6921 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpRequestDetailsTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpRequestDetailsTest.java @@ -28,17 +28,20 @@ import org.onap.dcaegen2.services.utils.HttpRequestDetails; import org.onap.dcaegen2.services.utils.ImmutableHttpRequestDetails; import org.onap.dcaegen2.services.utils.RequestVerbs; +import java.util.Optional; + public class HttpRequestDetailsTest { private static HttpRequestDetails testObject; private static final String AAI_PATH = "aaiPathTest"; - private static final RequestVerbs HTTP_VERB = RequestVerbs.GET; + private static final RequestVerbs HTTP_VERB = RequestVerbs.PATCH; private static final String QUERY_KEY1 = "queryKey1"; private static final String QUERY_VALUE1 = "queryValue1"; private static final String HEADERS_KEY1 = "headersKey1"; private static final String HEADERS_VALUE1 = "headersValue1"; + private static final String JSON_MESSAGE = "{\"dare_to\": \"dream_big\"}"; @BeforeAll public static void init() { @@ -47,6 +50,7 @@ public class HttpRequestDetailsTest { .requestVerb(HTTP_VERB) .putQueryParameters(QUERY_KEY1,QUERY_VALUE1) .putHeaders(HEADERS_KEY1,HEADERS_VALUE1) + .jsonBody(JSON_MESSAGE) .build(); } @@ -55,6 +59,7 @@ public class HttpRequestDetailsTest { Assertions.assertEquals(AAI_PATH, testObject.aaiAPIPath()); Assertions.assertEquals(HEADERS_VALUE1, testObject.headers().get(HEADERS_KEY1)); Assertions.assertEquals(QUERY_VALUE1, testObject.queryParameters().get(QUERY_KEY1)); - Assertions.assertEquals(RequestVerbs.GET, testObject.requestVerb()); + Assertions.assertEquals(RequestVerbs.PATCH, testObject.requestVerb()); + Assertions.assertEquals(Optional.of(JSON_MESSAGE), testObject.jsonBody()); } } -- cgit 1.2.3-korg