improve code coverage and update log directory

[vfc/nfvo/driver/vnfm/svnfm.git] / 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 5667908..f732099 100644 (file)
--- 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
@@ -34,12 +34,12 @@ 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.catalog.bo.entity.VnfPackageInfo;
 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;
@@ -77,7 +77,6 @@ public class CatalogMgmrImplTest {
                response.setVnfInstanceInfo(vnfInstanceInfos);
                
                response.setCsarId("csarId");
-               List<ImageInfo> imageInfos = new ArrayList<ImageInfo>();
                ImageInfo imageInfo = new ImageInfo();
                imageInfo.setFileName("fileName");
                imageInfo.setImageId("imageId");
@@ -86,9 +85,7 @@ public class CatalogMgmrImplTest {
                imageInfo.setTenant("tenant");
                imageInfo.setVimId("vimId");
                imageInfo.setVimUser("vimUser");
-               
-               imageInfos.add(imageInfo);
-               response.setImageInfo(imageInfos);
+               response.setImageInfo(imageInfo);
                
                VnfPackageInfo packageInfo = new VnfPackageInfo();
                packageInfo.setDownloadUri("1.3.5.6");
@@ -98,6 +95,9 @@ public class CatalogMgmrImplTest {
                packageInfo.setVnfdProvider("vnfdProvider");
                packageInfo.setVnfdVersion("vnfdVersion");
                packageInfo.setVnfVersion("vnfVersion");
+               packageInfo.setProvider("provider");
+               packageInfo.setVnfdProvider("vnfdProvider");
+               packageInfo.setVersion("version");
                Deletionpending deletionPending = CommonEnum.Deletionpending.fALSE;
                packageInfo.setDeletionPending(deletionPending );
                
@@ -111,6 +111,26 @@ public class CatalogMgmrImplTest {
                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());
+               Assert.assertEquals("name", packageInfo.getName());
+               Assert.assertEquals("onBoardState", packageInfo.getOnBoardState());
+               Assert.assertEquals("vnfdId", packageInfo.getVnfdId());
+               Assert.assertEquals("provider", packageInfo.getProvider());
+               Assert.assertEquals("vnfdProvider", packageInfo.getVnfdProvider());
+               Assert.assertEquals("vnfdVersion", packageInfo.getVnfdVersion());
+               Assert.assertEquals("vnfVersion", packageInfo.getVnfVersion());
+               Assert.assertEquals("version", packageInfo.getVersion());
+               Assert.assertEquals(CommonEnum.Deletionpending.fALSE, packageInfo.getDeletionPending());
+               
+               Assert.assertEquals("csarId", response.getCsarId());
+               Assert.assertEquals("fileName", response.getImageInfo().getFileName());
+               Assert.assertEquals("imageId", response.getImageInfo().getImageId());
+               Assert.assertEquals("index", response.getImageInfo().getIndex());
+               Assert.assertEquals("status", response.getImageInfo().getStatus());
+               Assert.assertEquals("tenant", response.getImageInfo().getTenant());
+               Assert.assertEquals("vimId", response.getImageInfo().getVimId());
+               Assert.assertEquals("vimUser", response.getImageInfo().getVimUser());
+               Assert.assertEquals("vnfInstanceId", response.getVnfInstanceInfo().get(0).getVnfInstanceId());
+               Assert.assertEquals("vnfInstanceName", response.getVnfInstanceInfo().get(0).getVnfInstanceName());
        }
 
 }