diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org')
4 files changed, 33 insertions, 11 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java index 1810820e..8a2090fd 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java @@ -145,7 +145,8 @@ public class VnfmDriverMgmrImplTest { execInfo.setJobId(100L); execInfo.setVnfmExecutionId("executionId_001"); execInfo.setVnfInstanceId(vnfInstanceId); - + execInfo.setOperateStartTime(1234567); + execInfo.setOperateEndTime(2345678); when(jobDbManager.findNewestJobInfo()).thenReturn(execInfo); } @@ -212,6 +213,8 @@ public class VnfmDriverMgmrImplTest { execInfo.setJobId(1L); execInfo.setVnfmExecutionId("executionId_001"); execInfo.setStatus("finished"); + execInfo.setVnfInstanceId(vnfInstanceId); + execInfo.toString(); when(jobDbManager.findOne(Mockito.anyLong())).thenReturn(execInfo); CBAMQueryOperExecutionResponse cbamResponse = new CBAMQueryOperExecutionResponse(); @@ -222,7 +225,12 @@ public class VnfmDriverMgmrImplTest { // when(cbamMgmr.queryOperExecution(Mockito.anyString())).thenReturn(cbamResponse); OperStatusVnfResponse response = vnfmDriverMgmr.getOperStatus(vnfmId, "1"); // -// Assert.assertEquals("executionId_001", response.getJobId()); + Assert.assertEquals(0, execInfo.getOperateStartTime()); + Assert.assertEquals(0, execInfo.getOperateEndTime()); + Assert.assertEquals(1, execInfo.getJobId()); + Assert.assertEquals("executionId_001", execInfo.getVnfmExecutionId()); + Assert.assertEquals("finished", execInfo.getStatus()); + Assert.assertEquals(vnfInstanceId, execInfo.getVnfInstanceId()); } @Test 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<VnfInstanceInfo> vnfInstanceInfos = new ArrayList<VnfInstanceInfo>(); 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()); diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/impl/CbamMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/impl/CbamMgmrImplTest.java index 92561966..9a05e23b 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/impl/CbamMgmrImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/impl/CbamMgmrImplTest.java @@ -420,6 +420,19 @@ public class CbamMgmrImplTest { { String execId = "execId_001"; CBAMQueryOperExecutionResponse response = cbamMgmr.queryOperExecution(execId); + Assert.assertEquals("id", response.getId()); + Assert.assertEquals(null, response.getGrantId()); + Assert.assertEquals(null, response.get_links()); + Assert.assertEquals(null, response.getAdditionalData()); + Assert.assertEquals(null, response.getCancelMode()); + Assert.assertEquals(false, response.isCancelPending()); + Assert.assertEquals(null, response.getMetadata()); + Assert.assertEquals(null, response.getOperationName()); + Assert.assertEquals(null, response.getOperationParams()); + Assert.assertEquals(null, response.getOperationType()); + Assert.assertEquals(null, response.getStartTime()); + Assert.assertEquals(null, response.getStatus()); + Assert.assertEquals(null, response.getVnfInstanceId()); } @Test diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImplTest.java index 1b9be3b4..50a32fae 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImplTest.java @@ -55,6 +55,7 @@ public class MsbMgmrImplTest { httpResult.setStatusCode(200); when(httpClientProcessor.process(Mockito.anyString(), Mockito.any(RequestMethod.class), Mockito.any(HashMap.class), Mockito.anyString())).thenReturn(httpResult); + when(httpClientProcessor.process(Mockito.anyString())).thenReturn(httpResult); } @Test |