X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Fmsb%2Fimpl%2FMsbMgmrImplTest.java;h=aa1a021751ded246671c5a46147d41627875bda6;hb=32686c4efae298d7b1785365162b2df3e8afedfc;hp=8e175e6390f342fe5878ca28c69b8b9f19e7407e;hpb=745f0040b6ad786862b5548cf9285267d209d613;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

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 8e175e63..aa1a0217 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
@@ -16,14 +16,22 @@
 
 package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.impl;
 
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.http.client.ClientProtocolException;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.onap.msb.sdk.discovery.common.RouteException;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
 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;
 
 public class MsbMgmrImplTest {
 	@InjectMocks
@@ -40,23 +48,29 @@ public class MsbMgmrImplTest {
 		env.setMsbPort(80);
 		msbMgmr.setAdaptorEnv(env);
 		MockitoAnnotations.initMocks(this);
+		
+		String json = "{\"serviceName\":\"catalog\", \"url\":\"/api/catalog/v1\"}";
+		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(expected = RuntimeException.class)
+	@Test
 	public void testRegister()
 	{
 		msbMgmr.register();
 	}
 	
-	@Test(expected = RuntimeException.class)
+	@Test
 	public void testunRegister()
 	{
 		msbMgmr.unregister();
 	}
 	
-	@Test(expected = RouteException.class)
-	public void testGetServiceUrlInMsbBySeriveNameAndPort() throws RouteException
+	@Test
+	public void testGetServiceUrlInMsbBySeriveNameAndPort() throws ClientProtocolException, IOException
 	{
-		msbMgmr.getServiceUrlInMsbBySeriveNameAndPort("serviceName", "88");
+		msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion("serviceName", "88");
 	}
 }