Fix nexus-iq commons-httpclient issues

Change-Id: I96c6140accfb8a1c35f08eb9ac66a4a8ff27e88f
Issue-ID: VFC-863
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>

2 files changed, 29 insertions, 1 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 8a2090fd..beb70763 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
@@ -52,6 +52,7 @@ 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.ScaleType;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmJobExecutionInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmSubscriptionInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmJobExecutionMapper;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.mapper.VnfmSubscriptionsMapper;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
@@ -239,7 +240,7 @@ public class VnfmDriverMgmrImplTest {
 		mockCbamResponse.setId("subscriptionId_001");
 		mockCbamResponse.setCallbackUrl("callbackUrl");
 		when(cbamMgmr.createSubscription(Mockito.any(CBAMCreateSubscriptionRequest.class))).thenReturn(mockCbamResponse);
-		doNothing().when(subscriptionsMapper).insert(Mockito.anyString());
+		doNothing().when(subscriptionsMapper).insert(Mockito.any(VnfmSubscriptionInfo.class));
 		CreateSubscriptionRequest request = new CreateSubscriptionRequest();
 		CreateSubscriptionResponse response = vnfmDriverMgmr.createSubscription(request);
 		Assert.assertEquals("callbackUrl", response.getCallbackUri());
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverControllerTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverControllerTest.java
index 103b394b..9bacde42 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverControllerTest.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverControllerTest.java
@@ -305,5 +305,32 @@ public class VnfmDriverControllerTest {
 		JSONObject jsonObj = new JSONObject(responseString);
 		Assert.assertEquals("jobId is ", mockResponse.getCallbackUri(), jsonObj.get("callbackUri"));
 	}
+	
+	@Test
+	public void testNotificationVnfCreateSubscripitonPost() throws Exception {
+		CreateSubscriptionResponse mockResponse = new CreateSubscriptionResponse();
+		mockResponse.setCallbackUri("callbackUri");
+		String jsonString = "{\"callbackUri\":\"callbackUri\"," + "\"authentication\":{\"userName\":\"userName\",\"password\":\"password\",\"clientName\":\"clientName\"}}";
+		
+		when(vnfmDriverMgmr.createSubscription(Mockito.any(CreateSubscriptionRequest.class))).thenReturn(mockResponse);
+		
+		mockMvc.perform(
+				post("/api/nokiavnfmdriver/v1/notifications").
+				characterEncoding("UTF-8").
+				accept(MediaType.APPLICATION_JSON).
+				contentType(MediaType.APPLICATION_JSON).
+				content(jsonString))
+				.andDo(print())
+				.andExpect(status().isNoContent())
+				.andReturn().getResponse().getContentAsString();
+	}
+	
+	@Test
+	public void testNotificationVnfCreateSubscripitonGet() throws Exception {
+		mockMvc.perform(
+				get("/api/nokiavnfmdriver/v1/notifications"))
+				.andDo(print())
+				.andExpect(status().isNoContent());
+	}
 
 }