Merge changes from topics "VID-14", "VID-13", "VID-12"

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

diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceTreeIntegrativeTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceTreeIntegrativeTest.java
index 00a9995..8c33e7f 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceTreeIntegrativeTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/AAIServiceTreeIntegrativeTest.java
@@ -40,10 +40,7 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import javax.ws.rs.core.Response;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.onap.vid.aai.AaiClientInterface;
 import org.onap.vid.aai.ExceptionWithRequestInfo;
 import org.onap.vid.aai.util.AAITreeConverter;
@@ -58,7 +55,6 @@ import org.onap.vid.model.aaiTree.ServiceInstance;
 import org.onap.vid.model.aaiTree.Vnf;
 import org.onap.vid.testUtils.TestUtils;
 import org.springframework.http.HttpMethod;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -79,11 +75,9 @@ public class AAIServiceTreeIntegrativeTest {
     @Mock
     ServiceModelInflator serviceModelInflator;
 
-    @InjectMocks
     private AAITreeNodeBuilder aaiTreeNodeBuilder;
 
-    @InjectMocks
-    private AAITreeConverter aaiTreeConverter;
+    private AAITreeConverter aaiTreeConverter = new AAITreeConverter();
 
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
 
@@ -295,17 +289,10 @@ public class AAIServiceTreeIntegrativeTest {
             "\"property-key\": \"model-ver.model-name\"," +
             "\"property-value\": \"service-instance\"}]}]}}]}}]}}]}";
 
-    @BeforeClass
-    public void initMocks() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @BeforeMethod
-    public void resetMocks() {
-        Mockito.reset(aaiClient);
-        Mockito.reset(aaiGetVersionByInvariantIdResponse);
-        Mockito.reset(sdcService);
-        Mockito.reset(serviceModelInflator);
+    public void initMocks() {
+        TestUtils.initMockitoMocks(this);
+        aaiTreeNodeBuilder = new AAITreeNodeBuilder(aaiClient);
     }
 
     public void getServiceInstanceTreeAndAssert(boolean isDuplicatedKeysInTenantRelation) throws IOException, AsdcCatalogException {