1 files changed, 124 insertions, 5 deletions
diff --git a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java
index b73454fe67..9b34095a23 100644
--- a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java
+++ b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/AAIRestClientTest.java
@@ -25,7 +25,11 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.matching;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.mockito.ArgumentMatchers.any;
@@ -35,10 +39,13 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.HashMap;
+import java.net.URL;
+import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.Response;
+import org.javatuples.Pair;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -48,6 +55,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aaiclient.client.defaultproperties.DefaultAAIPropertiesImpl;
 import org.onap.aaiclient.client.graphinventory.GraphInventoryPatchConverter;
 import org.onap.aaiclient.client.graphinventory.exceptions.GraphInventoryPatchDepthExceededException;
+import org.onap.so.client.RestClient;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.google.common.collect.ImmutableMap;
@@ -68,7 +76,7 @@ public class AAIRestClientTest {
 
     @Test
     public void failPatchOnComplexObject() throws URISyntaxException {
-        AAIRestClient client = new AAIRestClient(props, new URI(""), new HashMap<String, String>());
+        AAIRestClient client = new AAIRestClient(props, new URI(""), new MultivaluedHashMap<>());
         this.thrown.expect(GraphInventoryPatchDepthExceededException.class);
         this.thrown.expectMessage(containsString("Object exceeds allowed depth for update action"));
         client.patch(
@@ -77,7 +85,7 @@ public class AAIRestClientTest {
 
     @Test
     public void verifyPatchValidation() throws URISyntaxException {
-        AAIRestClient client = new AAIRestClient(props, new URI(""), new HashMap<String, String>());
+        AAIRestClient client = new AAIRestClient(props, new URI(""), new MultivaluedHashMap<>());
         AAIRestClient spy = spy(client);
         GraphInventoryPatchConverter patchValidatorMock = mock(GraphInventoryPatchConverter.class);
         doReturn(patchValidatorMock).when(spy).getPatchConverter();
@@ -90,10 +98,121 @@ public class AAIRestClientTest {
     @Test
     public void verifyAdditionalHeadersTest() throws URISyntaxException {
         AAIRestClient client = new AAIRestClient(new DefaultAAIPropertiesImpl(wireMockRule.port()), new URI("/test"),
-                ImmutableMap.of("test", "value"));
+                new MultivaluedHashMap<String, Pair<String, String>>(
+                        ImmutableMap.of("ALL", Pair.with("test", "value"), "GET", Pair.with("get test", "value"))));
         wireMockRule.stubFor(get(urlPathEqualTo("/test")).willReturn(aResponse().withStatus(200)));
         client.get();
         wireMockRule.verify(getRequestedFor(urlPathEqualTo("/test")).withHeader("X-FromAppId", equalTo("MSO"))
-                .withHeader("X-TransactionId", matching(".*")).withHeader("test", equalTo("value")));
+                .withHeader("X-TransactionId", matching(".*")).withHeader("test", equalTo("value"))
+                .withHeader("get test", equalTo("value")));
+    }
+
+
+    @Test
+    public void cacheGetTest() throws URISyntaxException, InterruptedException {
+
+        wireMockRule.stubFor(get(urlPathMatching("/cached"))
+                .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "text/plain").withBody("value")));
+
+        AAIProperties props = new AAIProperties() {
+
+            @Override
+            public URL getEndpoint() throws MalformedURLException {
+                return new URL(String.format("http://localhost:%s", wireMockRule.port()));
+            }
+
+            @Override
+            public String getSystemName() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public boolean isCachingEnabled() {
+                return true;
+            }
+
+            @Override
+            public AAIVersion getDefaultVersion() {
+                return AAIVersion.LATEST;
+            }
+
+            @Override
+            public String getAuth() {
+                return null;
+            }
+
+            @Override
+            public String getKey() {
+                return null;
+            }
+
+        };
+        RestClient client = new AAIRestClient(props, new URI("/cached"), new MultivaluedHashMap<>());
+
+        Response response = client.get();
+
+        response.readEntity(String.class);
+        response = client.get();
+        response.readEntity(String.class);
+        verify(1, getRequestedFor(urlEqualTo("/cached")));
+
+    }
+
+    @Test
+    public void cachePutTest() throws URISyntaxException, InterruptedException {
+
+        wireMockRule.stubFor(put(urlPathMatching("/cached/1")).willReturn(aResponse().withStatus(200)));
+
+        wireMockRule.stubFor(get(urlPathMatching("/cached/1"))
+                .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "application/json").withBody("{}")));
+
+        AAIProperties props = new AAIProperties() {
+
+            @Override
+            public URL getEndpoint() throws MalformedURLException {
+                return new URL(String.format("http://localhost:%s", wireMockRule.port()));
+            }
+
+            @Override
+            public String getSystemName() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public boolean isCachingEnabled() {
+                return true;
+            }
+
+            @Override
+            public AAIVersion getDefaultVersion() {
+                return AAIVersion.LATEST;
+            }
+
+            @Override
+            public String getAuth() {
+                return null;
+            }
+
+            @Override
+            public String getKey() {
+                return null;
+            }
+
+        };
+
+        RestClient client = new AAIRestClient(props, new URI("/cached/1"), new MultivaluedHashMap<>());
+
+
+        Response response = client.get();
+
+        response.readEntity(String.class);
+        client.put("wow");
+
+        client.get();
+        response.readEntity(String.class);
+        verify(2, getRequestedFor(urlEqualTo("/cached/1")));
+
     }
 }