Topology tree: enrich vfModules data from other versions of same model

[vid.git] / vid-app-common / src / test / java / org / onap / vid / services / AAIServiceIntegrativeTest.java

diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceIntegrativeTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceIntegrativeTest.java
index 28c844c..934a471 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceIntegrativeTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceIntegrativeTest.java
@@ -44,9 +44,11 @@ import org.onap.vid.aai.util.AAIRestInterface;
 import org.onap.vid.aai.util.AAITreeConverter;
 import org.onap.vid.aai.util.CacheProvider;
 import org.onap.vid.aai.util.TestWithAaiClient;
+import org.onap.vid.model.ModelUtil;
 import org.onap.vid.model.aaiTree.Network;
 import org.onap.vid.model.aaiTree.VpnBinding;
 import org.onap.vid.testUtils.TestUtils;
+import org.onap.vid.utils.Logging;
 import org.springframework.http.HttpMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
@@ -56,19 +58,18 @@ public class AAIServiceIntegrativeTest extends TestWithAaiClient {
 
     private AAIRestInterface aaiRestInterface;
     private AaiServiceImpl aaiServiceWithoutMocks;
+    private Logging logging = new Logging();
 
     private AaiServiceImpl createAaiServiceWithoutMocks(AAIRestInterface aaiRestInterface, CacheProvider cacheProvider) {
         AaiClient aaiClient = new AaiClient(aaiRestInterface, null, cacheProvider);
         ExecutorService executorService = MoreExecutors.newDirectExecutorService();
         AAIServiceTree aaiServiceTree = new AAIServiceTree(
-                aaiClient,
-                new AAITreeNodeBuilder(aaiClient),
-                new AAITreeConverter(),
-                null,
-                null,
-                executorService
+            new AAITreeNodeBuilder(aaiClient, logging),
+            new AAITreeNodesEnricher(aaiClient, null, null, null),
+            new AAITreeConverter(new ModelUtil()), null,
+            executorService
         );
-        return new AaiServiceImpl(aaiClient, null, aaiServiceTree, executorService);
+        return new AaiServiceImpl(aaiClient, null, aaiServiceTree, executorService, logging);
     }
 
     @BeforeMethod
@@ -160,6 +161,7 @@ public class AAIServiceIntegrativeTest extends TestWithAaiClient {
         aaiServiceWithoutMocks.getVpnListByVpnType("aaa");
     }
 
+    @Test
     public void getNetworkListTest_successResponse() {
         String rawResponse = TestUtils.readFileAsString("/responses/aai/l3-networks-by-cloud-region-and-tenantId.json");
         final ResponseWithRequestInfo responseWithRequestInfo = mockedResponseWithRequestInfo(Response.Status.OK,