add junit

Change-Id: I759aeeb64085dbe72883a942971bffc8e03515f7
Issue-ID: DCAEGEN2-407
Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>

diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml
index 6a40d32..eaed609 100644 (file)
--- a/prh-aai-client/pom.xml
+++ b/prh-aai-client/pom.xml
@@ -105,6 +105,11 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
-
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.16.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java b/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java
index 06d1a55..c7f7b0d 100644 (file)
--- a/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java
+++ b/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java
@@ -19,7 +19,7 @@
  */
 package services.service;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.ResponseHandler;
@@ -71,7 +71,7 @@ public class AAIExtendedHttpClientImpl implements AAIExtendedHttpClient {
             getRequest.addHeader(headersEntry.getKey(), headersEntry.getValue());
         }
 
-        Optional<String> extendedDetails = Optional.absent();
+        Optional<String> extendedDetails = Optional.empty();
 
         try {
             extendedDetails = closeableHttpClient.execute(getRequest, aaiResponseHandler());
@@ -108,7 +108,7 @@ public class AAIExtendedHttpClientImpl implements AAIExtendedHttpClient {
         return extendedURI;
     }
 
-    private static String createCustomQuery(@Nonnull final Map<String, String> queryParams) {
+    private String createCustomQuery(@Nonnull final Map<String, String> queryParams) {
         final StringBuilder queryStringBuilder = new StringBuilder("");
         final Iterator<Map.Entry<String, String>> queryParamIterator = queryParams.entrySet().iterator();
         while (queryParamIterator.hasNext()) {
@@ -123,7 +123,7 @@ public class AAIExtendedHttpClientImpl implements AAIExtendedHttpClient {
         return queryStringBuilder.toString();
     }
 
-    public static ResponseHandler<Optional<String>> aaiResponseHandler() {
+    private ResponseHandler<Optional<String>> aaiResponseHandler() {
         return httpResponse ->  {
             final int responseCode = httpResponse.getStatusLine().getStatusCode();
             final HttpEntity responseEntity = httpResponse.getEntity();
@@ -134,7 +134,7 @@ public class AAIExtendedHttpClientImpl implements AAIExtendedHttpClient {
             } else {
                 String aaiResponse = responseEntity != null ? EntityUtils.toString(responseEntity) : "";
                 //ToDo loging
-                return Optional.absent();
+                return Optional.empty();
             }
         };
     }

diff --git a/prh-aai-client/src/main/test/java/services/service/AAIExtendedHttpClientImplTest.java b/prh-aai-client/src/main/test/java/services/service/AAIExtendedHttpClientImplTest.java
new file mode 100644 (file)
index 0000000..5932528
--- /dev/null
+++ b/prh-aai-client/src/main/test/java/services/service/AAIExtendedHttpClientImplTest.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package services.service;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+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.impl.client.CloseableHttpClient;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import services.config.AAIHttpClientConfiguration;
+
+public class AAIExtendedHttpClientImplTest {
+
+    private AAIExtendedHttpClientImpl testedObject;
+    private AAIHttpClientConfiguration aaiHttpClientConfigurationMock = mock(AAIHttpClientConfiguration.class);
+    private CloseableHttpClient closeableHttpClientMock = mock(CloseableHttpClient.class);
+
+    @Before
+    public void init() throws NoSuchFieldException, IllegalAccessException {
+        when(aaiHttpClientConfigurationMock.aaiHost()).thenReturn("hostTest");
+        when(aaiHttpClientConfigurationMock.aaiProtocol()).thenReturn("https");
+        when(aaiHttpClientConfigurationMock.aaiHostPortNumber()).thenReturn(1234);
+        testedObject = new AAIExtendedHttpClientImpl(aaiHttpClientConfigurationMock);
+        setField();
+    }
+
+    @Test
+    public void getExtendedDetails_success() throws IOException {
+        String expectedResult = "getExtendedDetailsOK";
+        Map<String, String> queryParams = new HashMap<>();
+        queryParams.put("key1", "value1");
+        Map<String, String> headers = new HashMap<>();
+        headers.put("headerKey", "headerValue");
+
+        when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))).
+                thenReturn(Optional.of(expectedResult));
+        String actualResult = testedObject.getExtendedDetails("testPath", queryParams, headers);
+        Assert.assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void getExtendedDetails_returnsNull() throws IOException {
+        when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))).
+                thenReturn(Optional.empty());
+        String actualResult = testedObject.getExtendedDetails("testPath", new HashMap<>(), new HashMap<>());
+        Assert.assertNull(actualResult);
+    }
+
+    private void setField() throws NoSuchFieldException, IllegalAccessException {
+        Field field = testedObject.getClass().getDeclaredField("closeableHttpClient");
+        field.setAccessible(true);
+        field.set(testedObject, closeableHttpClientMock);
+    }
+
+
+}