Merge "Merge from ECOMP's repository"

[vid.git] / vid-app-common / src / test / java / org / onap / vid / aai / AaiOverTLSClientTest.java

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java
index 5b631a6..52556a1 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/AaiOverTLSClientTest.java
@@ -21,26 +21,31 @@
 package org.onap.vid.aai;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.Collections;
-import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.vid.aai.model.AaiNodeQueryResponse;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.vid.aai.model.ResourceType;
 import org.onap.vid.client.SyncRestClient;
+import org.onap.vid.model.SubscriberList;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.contains;
+import static org.mockito.ArgumentMatchers.eq;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AaiOverTLSClientTest {
 
-    public static final String SEARCH_NODES_QUERY_SEARCH_NODE_TYPE = "search/nodes-query?search-node-type=generic-vnf&filter=vnf-name:EQUALS:name";
+    private static final String SEARCH_NODES_QUERY_SEARCH_NODE_TYPE = "nodes/generic-vnfs?vnf-name=name";
+    private static final String SUBSCRIBERS = "business/customers?subscriber-type=INFRA&depth=0";
     private AaiOverTLSClient aaiRestClient;
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_MOCKS)
     private SyncRestClient syncRestClient;
     @Mock
     private AaiOverTLSPropertySupplier propertySupplier;
@@ -51,12 +56,21 @@ public class AaiOverTLSClientTest {
     }
 
     @Test
-    public void searchNodeTypeByName() {
+    public void testIsNodeTypeExistsByName() {
+        mockPropertyReader();
+
+        aaiRestClient.isNodeTypeExistsByName("name", ResourceType.GENERIC_VNF);
+        Mockito.verify(syncRestClient).get(contains(SEARCH_NODES_QUERY_SEARCH_NODE_TYPE),
+            eq(getHeaders()), eq(Collections.emptyMap()));
+    }
+
+    @Test
+    public void  testGetAllSubscribers(){
         mockPropertyReader();
 
-        aaiRestClient.searchNodeTypeByName("name", ResourceType.GENERIC_VNF);
-        Mockito.verify(syncRestClient).get(Matchers.contains(SEARCH_NODES_QUERY_SEARCH_NODE_TYPE),
-            Matchers.eq(getHeaders()), Matchers.eq(Collections.emptyMap()), Matchers.eq(AaiNodeQueryResponse.class));
+        aaiRestClient.getAllSubscribers();
+        Mockito.verify(syncRestClient).get(contains(SUBSCRIBERS),
+            eq(getHeaders()), eq(Collections.emptyMap()), eq(SubscriberList.class));
     }
 
     private void mockPropertyReader() {