5 files changed, 124 insertions, 10 deletions
diff --git a/common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java
index ad15417b71..95b30f934b 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java
@@ -41,6 +41,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.so.client.RestClientSSL;
+import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 import org.onap.so.client.graphinventory.exceptions.GraphInventoryPatchDepthExceededException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -68,7 +69,7 @@ public class AAIRestClientTest {
 	public void verifyPatchValidation() throws URISyntaxException {
 		AAIRestClient client = new AAIRestClient(props, new URI(""));
 		AAIRestClient spy = spy(client);
-		AAIPatchConverter patchValidatorMock = mock(AAIPatchConverter.class);
+		GraphInventoryPatchConverter patchValidatorMock = mock(GraphInventoryPatchConverter.class);
 		doReturn(patchValidatorMock).when(spy).getPatchConverter();
 		String payload = "{}";
 		doReturn(Response.ok().build()).when(spy).method(eq("PATCH"), any());
diff --git a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
index 428fa276db..27637126c6 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java
@@ -45,6 +45,7 @@ import org.onap.so.client.aai.entities.singletransaction.SingleTransactionRespon
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.defaultproperties.DefaultAAIPropertiesImpl;
+import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -117,7 +118,7 @@ public class AAISingleTransactionClientTest {
 	@Test
 	public void confirmPatchFormat() {
 		AAISingleTransactionClient singleTransaction = spy(new AAISingleTransactionClient(AAIVersion.LATEST));
-		AAIPatchConverter mock = mock(AAIPatchConverter.class);
+		GraphInventoryPatchConverter mock = mock(GraphInventoryPatchConverter.class);
 		doReturn(mock).when(singleTransaction).getPatchConverter();
 		singleTransaction.update(uriA, "{}");
 		verify(mock, times(1)).convertPatchFormat(any());
diff --git a/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java
index 621375882b..342e3b1aa4 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java
@@ -43,6 +43,7 @@ import org.onap.aai.domain.yang.Relationship;
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.defaultproperties.DefaultAAIPropertiesImpl;
+import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -143,7 +144,7 @@ public class AAITransactionalClientTest {
 	@Test
 	public void confirmPatchFormat() {
 		AAITransactionalClient client = spy(new AAITransactionalClient(AAIVersion.LATEST));
-		AAIPatchConverter mock = mock(AAIPatchConverter.class);
+		GraphInventoryPatchConverter mock = mock(GraphInventoryPatchConverter.class);
 		doReturn(mock).when(client).getPatchConverter();
 		client.update(uriA, "{}");
 		verify(mock, times(1)).convertPatchFormat(any());
diff --git a/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java b/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java
new file mode 100644
index 0000000000..f4490faacc
--- /dev/null
+++ b/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java
@@ -0,0 +1,109 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2019 Nokia.
+ * ================================================================================
+ * 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 org.onap.so.client.adapter.rest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.GeneralSecurityException;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.so.client.policy.JettisonStyleMapperProvider;
+import org.onap.so.utils.CryptoUtils;
+import org.onap.so.utils.TargetEntity;
+
+public class AdapterRestClientTest {
+
+    private static final String CRYPTO_KEY = "546573746F736973546573746F736973";
+    private static final String INVALID_CRYPTO_KEY = "1234";
+
+    private Map<String, String> headerMap;
+    private AdapterRestProperties adapterRestPropertiesMock;
+
+    @Before
+    public void setup() {
+        headerMap = new HashMap<>();
+        adapterRestPropertiesMock = mock(AdapterRestProperties.class);
+    }
+
+    @Test
+    public void initializeHeaderMap_success() throws URISyntaxException, GeneralSecurityException {
+        // given
+        String encyptedMessage = CryptoUtils.encrypt("testAdapter", CRYPTO_KEY);
+        when(adapterRestPropertiesMock.getAuth()).thenReturn(encyptedMessage);
+        when(adapterRestPropertiesMock.getKey()).thenReturn(CRYPTO_KEY);
+        AdapterRestClient testedObject = new AdapterRestClient(adapterRestPropertiesMock, new URI(""));
+        // when
+        testedObject.initializeHeaderMap(headerMap);
+        // then
+        assertThat(headerMap).containsOnly(entry("Authorization", getExpectedEncodedString(encyptedMessage)));
+    }
+
+    @Test
+    public void initializeHeaderMap_putNullToMapWhenAuthIsNull() throws URISyntaxException {
+        // given
+        AdapterRestClient testedObject = new AdapterRestClient(adapterRestPropertiesMock, new URI(""));
+        // when
+        testedObject.initializeHeaderMap(headerMap);
+        // then
+        assertThat(headerMap).containsOnly(entry("Authorization", null));
+    }
+
+    @Test
+    public void initializeHeaderMap_putNullToMapWhenExOccurs() throws URISyntaxException, GeneralSecurityException {
+        // given
+        String encyptedMessage = CryptoUtils.encrypt("testAdapter", CRYPTO_KEY);
+        when(adapterRestPropertiesMock.getAuth()).thenReturn(encyptedMessage);
+        when(adapterRestPropertiesMock.getKey()).thenReturn(INVALID_CRYPTO_KEY);
+        AdapterRestClient testedObject = new AdapterRestClient(adapterRestPropertiesMock, new URI(""),
+                "accept", "contentType");
+        // when
+        testedObject.initializeHeaderMap(headerMap);
+        // then
+        assertThat(headerMap).containsOnly(entry("Authorization", null));
+    }
+
+    @Test
+    public void getTargetEntity_success() throws URISyntaxException {
+        AdapterRestClient testedObject = new AdapterRestClient(adapterRestPropertiesMock, new URI(""));
+        assertThat(testedObject.getTargetEntity()).isEqualTo(TargetEntity.OPENSTACK_ADAPTER);
+    }
+
+    @Test
+    public void getCommonObjectMapperProvider_success() throws URISyntaxException {
+        AdapterRestClient testedObject = new AdapterRestClient(adapterRestPropertiesMock, new URI(""));
+        assertThat(testedObject.getCommonObjectMapperProvider()).isInstanceOf(JettisonStyleMapperProvider.class);
+    }
+
+    private String getExpectedEncodedString(String encryptedMessage) throws GeneralSecurityException {
+        String auth = CryptoUtils.decrypt(encryptedMessage, CRYPTO_KEY);
+        byte[] encoded = Base64.encodeBase64(auth.getBytes());
+        String encodedString = new String(encoded);
+        return "Basic " + encodedString;
+    }
+}
diff --git a/common/src/test/java/org/onap/so/client/aai/AAIPatchConverterTest.java b/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java
index 0d4490f51d..d24b3ff147 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAIPatchConverterTest.java
+++ b/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.aai;
+package org.onap.so.client.graphinventory;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,6 +35,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.so.client.aai.AAICommonObjectMapperProvider;
+import org.onap.so.client.graphinventory.GraphInventoryPatchConverter;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -42,13 +44,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 @RunWith(MockitoJUnitRunner.class)
-public class AAIPatchConverterTest {
+public class GraphInventoryPatchConverterTest {
 
 	private ObjectMapper mapper = new AAICommonObjectMapperProvider().getMapper();
 
 	@Test
 	public void convertObjectToPatchFormatTest() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		AAIPatchConverter validator = new AAIPatchConverter();
+		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
 		GenericVnf vnf = new GenericVnf();
 		vnf.setIpv4Loopback0Address("");
 		String result = validator.marshallObjectToPatchFormat(vnf);
@@ -60,7 +62,7 @@ public class AAIPatchConverterTest {
 	
 	@Test
 	public void convertStringToPatchFormatTest() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		AAIPatchConverter validator = new AAIPatchConverter();
+		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
 		String payload = "{\"ipv4-loopback0-address\":\"\"}";
 		String result = validator.marshallObjectToPatchFormat(payload);
 		
@@ -69,7 +71,7 @@ public class AAIPatchConverterTest {
 	
 	@Test
 	public void convertStringToPatchFormatNull_Test() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		AAIPatchConverter validator = new AAIPatchConverter();
+		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
 		String payload = "{\"ipv4-loopback0-address\": null}";
 		String result = validator.marshallObjectToPatchFormat(payload);
 		System.out.println(result);
@@ -78,7 +80,7 @@ public class AAIPatchConverterTest {
 	
 	@Test
 	public void convertMapToPatchFormatTest() throws URISyntaxException, JsonParseException, JsonMappingException, IOException {
-		AAIPatchConverter validator = new AAIPatchConverter();
+		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
 		HashMap<String, String> map = new HashMap<>();
 		map.put("ipv4-loopback0-address", "");
 		map.put("ipv4-loopback1-address", "192.168.1.1");
@@ -89,7 +91,7 @@ public class AAIPatchConverterTest {
 	
 	@Test
 	public void hasComplexObjectTest() {
-		AAIPatchConverter validator = new AAIPatchConverter();
+		GraphInventoryPatchConverter validator = new GraphInventoryPatchConverter();
 		String hasNesting = "{ \"hello\" : \"world\", \"nested\" : { \"key\" : \"value\" } }";
 		String noNesting = "{ \"hello\" : \"world\" }";
 		String arrayCase = "{ \"hello\" : \"world\", \"nestedSimple\" : [\"value1\" , \"value2\"], \"nestedComplex\" : [{\"key\" : \"value\"}]}";