Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

1 files changed, 4 insertions, 10 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/integrationTest/AaiIntegrationTest.java b/vid-app-common/src/test/java/org/onap/vid/integrationTest/AaiIntegrationTest.java
index a7c5a275..e35472ad 100644
--- a/vid-app-common/src/test/java/org/onap/vid/integrationTest/AaiIntegrationTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/integrationTest/AaiIntegrationTest.java
@@ -1,13 +1,11 @@
 package org.onap.vid.integrationTest;
 
-import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.vid.aai.AaiClient;
 import org.onap.vid.aai.AaiClientInterface;
 import org.onap.vid.aai.AaiResponse;
 import org.onap.vid.aai.model.GetServiceModelsByDistributionStatusResponse;
 import org.onap.vid.aai.model.Result;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -23,12 +21,10 @@ public class AaiIntegrationTest extends AbstractTestNGSpringContextTests {
 
 
     @Autowired
-    MockServletContext servletContext;
-
+    AaiClientInterface aaiClient;
 
-    @Test
-    public void testGetServiceModelsFromAai() throws Exception {
-        AaiClientInterface aaiClient = new AaiClient(servletContext);
+    @Test(enabled = false)
+    public void testGetServiceModelsFromAai() {
         AaiResponse<GetServiceModelsByDistributionStatusResponse> serviceModelsByDistributionStatusResponse = aaiClient.getServiceModelsByDistributionStatus();
         GetServiceModelsByDistributionStatusResponse response = serviceModelsByDistributionStatusResponse.getT();
         for(Result result: response.getResults()){
@@ -38,6 +34,4 @@ public class AaiIntegrationTest extends AbstractTestNGSpringContextTests {
             Assert.assertNotNull(result.getModel().getModelVers().getModelVer().get(0).getModelVersion());
         }
     }
-
-
 }