update sparky with configurable features

[aai/sparky-be.git] / sparkybe-onap-service / src / test / java / org / onap / aai / sparky / autosuggestion / sync / AutosuggestionSynchronizerTest.java

diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java
index 8c13ebc..8a83ca7 100644 (file)
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java
@@ -18,7 +18,6 @@ import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.restclient.client.OperationResult;
-import org.onap.aai.setup.Version;
 import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
 import org.onap.aai.sparky.config.oxm.OxmEntityLookup;
 import org.onap.aai.sparky.config.oxm.OxmModelLoader;
@@ -172,8 +171,7 @@ public class AutosuggestionSynchronizerTest {
     suggestionEntityLookup = new SuggestionEntityLookup(filtersConfig);
 
     processors.add(suggestionEntityLookup);
-    Version v = Version.V11;
-    OxmModelLoader oxmModelLoader = new OxmModelLoader(v, processors,nodeInjest);
+    OxmModelLoader oxmModelLoader = new OxmModelLoader("v11", processors,nodeInjest);
     oxmModelLoader.loadModel();
     
     
@@ -270,20 +268,20 @@ public class AutosuggestionSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));
 
@@ -360,20 +358,20 @@ public class AutosuggestionSynchronizerTest {
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-1"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-1_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(
             Matchers.contains("generic-vnf-2"), Mockito.anyString(),
-            Mockito.anyInt()))
+            Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson(
             "/sync/aai/generic-vnf-generic-vnf-2_full_depth.json")));
 
     Mockito
         .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),
-            Mockito.anyString(), Mockito.anyInt()))
+            Mockito.anyString(), Mockito.anyInt(),Mockito.anyString()))
         .thenReturn(new OperationResult(200, TestResourceLoader
             .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json")));