X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FWidgetMSControllerTest.java;h=2f91eae379eafdb889eeff957c35efef0dfe151d;hb=8e83c25788017acd56271a72286f7dcbc974e76d;hp=ed75f2733554aa1bf2f25c3402fd354c53246790;hpb=6e50276a42ab82cfe34ced9cf97e545283f37f2a;p=portal.git

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetMSControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetMSControllerTest.java
index ed75f273..2f91eae3 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetMSControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetMSControllerTest.java
@@ -51,17 +51,14 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.onap.portalapp.portal.controller.WidgetMSController;
 import org.onap.portalapp.portal.domain.BEProperty;
 import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
 import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.onap.portalapp.portal.exceptions.NoHealthyServiceException;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.WidgetMService;
 import org.onap.portalapp.portal.service.WidgetMServiceImpl;
 
-import com.orbitz.consul.ConsulException;
-import com.orbitz.consul.model.health.ServiceHealth;
-
 import io.searchbox.client.config.exception.NoServerConfiguredException;
 
 public class WidgetMSControllerTest {
@@ -86,7 +83,7 @@ public class WidgetMSControllerTest {
 	HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest();
 	HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
 	NullPointerException nullPointerException = new NullPointerException();
-	ConsulException consulException = new ConsulException(nullPointerException);
+	NoHealthyServiceException exception = new NoHealthyServiceException("");
 
 	@Test
 	public void getServiceLocationTest() {
@@ -101,29 +98,29 @@ public class WidgetMSControllerTest {
 
 
 	@Test
-	public void getServiceLocationExceptionConsulExceptionTest() {
+	public void getServiceLocationExceptionConsulExceptionTest() throws Exception {
 		PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
 		ecpectedPortalRestResponse.setMessage("Error!");
 		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
 		PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
-		Mockito.when(consulHealthService.getServiceLocation(service, null)).thenThrow(consulException);
+		Mockito.when(consulHealthService.getServiceLocation(service, null)).thenThrow(exception);
 		actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
 		assertTrue(actualPortalRestRespone.getMessage().equals(ecpectedPortalRestResponse.getMessage()));
 		assertTrue(actualPortalRestRespone.getStatus().equals(ecpectedPortalRestResponse.getStatus()));
 	}
 
-	public PortalRestResponse<List<ServiceHealth>> successResponse() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = new PortalRestResponse<List<ServiceHealth>>();
-		List<ServiceHealth> healths = new ArrayList<ServiceHealth>();
+	public PortalRestResponse<List<?>> successResponse() {
+		PortalRestResponse<List<?>> ecpectedPortalRestResponse = new PortalRestResponse<List<?>>();
+		List<?> healths = new ArrayList<>();
 		ecpectedPortalRestResponse.setMessage("Success!");
 		ecpectedPortalRestResponse.setResponse(healths);
 		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK);
 		return ecpectedPortalRestResponse;
 	}
 
-	public PortalRestResponse<List<ServiceHealth>> errorResponse() {
-		PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = new PortalRestResponse<List<ServiceHealth>>();
-		List<ServiceHealth> healths = new ArrayList<ServiceHealth>();
+	public PortalRestResponse<List<?>> errorResponse() {
+		PortalRestResponse<List<?>> ecpectedPortalRestResponse = new PortalRestResponse<List<?>>();
+		List<?> healths = new ArrayList<>();
 		ecpectedPortalRestResponse.setMessage("Error!");
 		ecpectedPortalRestResponse.setResponse(healths);
 		ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR);