From 8f3f7712090cee0fb44382082fa572d174b052b1 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Mon, 19 Mar 2018 14:52:33 +0800 Subject: Fix nexus-iq issues Change-Id: I5735a9706ab07a1820a863f50e9a9ab8ffefc52d Issue-ID: VFC-724 Signed-off-by: yufei_zhou --- .../vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java') diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java index f7320998..d222b1ff 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/catalog/impl/CatalogMgmrImplTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.when; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import org.apache.http.client.ClientProtocolException; @@ -40,7 +39,6 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum; import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum.Deletionpending; import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpClientProcessorInf; import org.onap.vfc.nfvo.driver.vnfm.svnfm.http.client.HttpResult; -import org.springframework.web.bind.annotation.RequestMethod; import com.google.gson.Gson; @@ -55,17 +53,18 @@ public class CatalogMgmrImplTest { private Gson gson = new Gson(); + private HttpResult httpResult = new HttpResult(); + @Before public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - AdaptorEnv env = new AdaptorEnv(); - catalogMgmr.setAdaptorEnv(env); - MockitoAnnotations.initMocks(this); } @Test public void testQueryVnfPackage() throws ClientProtocolException, IOException { + MockitoAnnotations.initMocks(this); + AdaptorEnv env = new AdaptorEnv(); + catalogMgmr.setAdaptorEnv(env); CatalogQueryVnfResponse response = new CatalogQueryVnfResponse(); List vnfInstanceInfos = new ArrayList(); VnfInstanceInfo vnfInstanceInfo = new VnfInstanceInfo(); @@ -101,14 +100,15 @@ public class CatalogMgmrImplTest { Deletionpending deletionPending = CommonEnum.Deletionpending.fALSE; packageInfo.setDeletionPending(deletionPending ); - response.setPackageInfo(packageInfo ); + response.setPackageInfo(packageInfo); String json = gson.toJson(packageInfo); - HttpResult httpResult = new HttpResult(); httpResult.setContent(json); - when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult); +// when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult); + when(httpClientProcessor.process(Mockito.anyString())).thenReturn(httpResult); + VnfPackageInfo packageInfo1 = catalogMgmr.queryVnfPackage(vnfPackageId); Assert.assertEquals("1.3.5.6", packageInfo.getDownloadUri()); Assert.assertEquals("name", packageInfo.getName()); -- cgit 1.2.3-korg