1 files changed, 55 insertions, 12 deletions

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 33ca1761..5667908d 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
@@ -19,7 +19,9 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.impl;
 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;
 import org.junit.Assert;
@@ -29,12 +31,19 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.CatalogQueryVnfResponse;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.ImageInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.catalog.bo.entity.VnfInstanceInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
+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.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VnfPackageInfo;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import com.google.gson.Gson;
+
 public class CatalogMgmrImplTest {
 	@InjectMocks
 	private CatalogMgmrImpl catalogMgmr;
@@ -44,29 +53,63 @@ public class CatalogMgmrImplTest {
 	
 	private String vnfPackageId = "vnfPackageId_001";
 	
+	private Gson gson = new Gson();
+	
 	@Before
 	public void setUp() throws Exception {
 		MockitoAnnotations.initMocks(this);
 		AdaptorEnv env = new AdaptorEnv();
 		catalogMgmr.setAdaptorEnv(env);
 		MockitoAnnotations.initMocks(this);
-		
-		String json = "{"
-				+ "\"csarId\":\"vnfPackageId_001\","
-				+ "\"packageInfo\":{\"downloadUri\" : \"1.3.5.6\"}"
-				+ "}"
-				+ "";
-		HttpResult httpResult = new HttpResult();
-		httpResult.setContent(json);
-		
-		when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult);
 	}
-
 	
 	@Test
 	public void testQueryVnfPackage() throws ClientProtocolException, IOException
 	{
-		VnfPackageInfo packageInfo = catalogMgmr.queryVnfPackage(vnfPackageId);
+		CatalogQueryVnfResponse response = new CatalogQueryVnfResponse();
+		List<VnfInstanceInfo> vnfInstanceInfos = new ArrayList<VnfInstanceInfo>();
+		VnfInstanceInfo vnfInstanceInfo = new VnfInstanceInfo();
+		vnfInstanceInfo.setVnfInstanceId("vnfInstanceId");
+		vnfInstanceInfo.setVnfInstanceName("vnfInstanceName");
+		vnfInstanceInfos.add(vnfInstanceInfo );
+		
+		
+		response.setVnfInstanceInfo(vnfInstanceInfos);
+		
+		response.setCsarId("csarId");
+		List<ImageInfo> imageInfos = new ArrayList<ImageInfo>();
+		ImageInfo imageInfo = new ImageInfo();
+		imageInfo.setFileName("fileName");
+		imageInfo.setImageId("imageId");
+		imageInfo.setIndex("index");
+		imageInfo.setStatus("status");
+		imageInfo.setTenant("tenant");
+		imageInfo.setVimId("vimId");
+		imageInfo.setVimUser("vimUser");
+		
+		imageInfos.add(imageInfo);
+		response.setImageInfo(imageInfos);
+		
+		VnfPackageInfo packageInfo = new VnfPackageInfo();
+		packageInfo.setDownloadUri("1.3.5.6");
+		packageInfo.setName("name");
+		packageInfo.setOnBoardState("onBoardState");
+		packageInfo.setVnfdId("vnfdId");
+		packageInfo.setVnfdProvider("vnfdProvider");
+		packageInfo.setVnfdVersion("vnfdVersion");
+		packageInfo.setVnfVersion("vnfVersion");
+		Deletionpending deletionPending = CommonEnum.Deletionpending.fALSE;
+		packageInfo.setDeletionPending(deletionPending );
+		
+		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);
+		VnfPackageInfo packageInfo1 = catalogMgmr.queryVnfPackage(vnfPackageId);
 		Assert.assertEquals("1.3.5.6", packageInfo.getDownloadUri());
 	}