Added Junits

Issue-ID: PORTAL-155

Includes JUNITS, security issues fix


Change-Id: I7c4032808163c46bf53477195823c7ed9dc99edc
Signed-off-by:GUJJA <kg811t@research.att.com>

2 files changed, 404 insertions, 37 deletions

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/MicroserviceProxyControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/MicroserviceProxyControllerTest.java
index 446c11c4..6f9ce496 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/MicroserviceProxyControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/MicroserviceProxyControllerTest.java
@@ -37,6 +37,7 @@
  */
 package org.onap.portalapp.portal.controller;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import javax.servlet.http.HttpServletRequest;
@@ -106,7 +107,7 @@ public class MicroserviceProxyControllerTest extends MockitoTestSuite {
 		Mockito.when(microserviceProxyService.proxyToDestination(1, user, mockedRequest))
 				.thenThrow(httpClientErrorException);
 		String acutualString = microserviceProxyController.getMicroserviceProxy(mockedRequest, getMockedResponse(), 1);
-		assertTrue(acutualString.equals("{\"error\":\"\"}"));
+		assertEquals("", acutualString);
 	}
 
 	@Test
@@ -138,6 +139,6 @@ public class MicroserviceProxyControllerTest extends MockitoTestSuite {
 				.thenThrow(httpClientErrorException);
 		String acutualString = microserviceProxyController.getMicroserviceProxyByWidgetId(mockedRequest,
 				getMockedResponse(), 1);
-		assertTrue(acutualString.equals("{\"error\":\"\"}"));
-	}
+		assertEquals("", acutualString);
+		}
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetsCatalogControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetsCatalogControllerTest.java
index 50291f07..d8aba5fc 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetsCatalogControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/WidgetsCatalogControllerTest.java
@@ -37,6 +37,9 @@
  */
 package org.onap.portalapp.portal.controller;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -44,17 +47,23 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.controller.WidgetsCatalogController;
 import org.onap.portalapp.portal.core.MockEPUser;
+import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.MicroserviceParameter;
 import org.onap.portalapp.portal.domain.WidgetCatalog;
+import org.onap.portalapp.portal.domain.WidgetCatalogParameter;
+import org.onap.portalapp.portal.domain.WidgetParameterResult;
 import org.onap.portalapp.portal.domain.WidgetServiceHeaders;
+import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.ConsulHealthService;
 import org.onap.portalapp.portal.service.ConsulHealthServiceImpl;
@@ -65,29 +74,38 @@ import org.onap.portalapp.portal.service.WidgetParameterServiceImpl;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.util.EPUserUtils;
+import org.onap.portalsdk.core.onboarding.exception.CipherUtilException;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.mock.web.MockMultipartHttpServletRequest;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-
-@Ignore
+@SuppressWarnings("rawtypes")
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({EPUserUtils.class, EcompPortalUtils.class, SystemProperties.class, EPCommonSystemProperties.class})
+@PrepareForTest({ EPUserUtils.class, CipherUtil.class, EcompPortalUtils.class, SystemProperties.class,
+		EPCommonSystemProperties.class, EPUserUtils.class })
 public class WidgetsCatalogControllerTest {
 
 	@Mock
 	ConsulHealthService consulHealthService = new ConsulHealthServiceImpl();
-	
+
 	@Mock
 	MicroserviceService microserviceService = new MicroserviceServiceImpl();
-	
+
 	@Mock
 	WidgetParameterService widgetParameterService = new WidgetParameterServiceImpl();
-	
+
 	@InjectMocks
 	WidgetsCatalogController widgetsCatalogController = new WidgetsCatalogController();
 
@@ -95,10 +113,10 @@ public class WidgetsCatalogControllerTest {
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
 	}
+
 	@Mock
-	WidgetServiceHeaders widgetServiceHeaders ;
-	
-	
+	WidgetServiceHeaders widgetServiceHeaders;
+
 	@Mock
 	RestTemplate template = new RestTemplate();
 
@@ -108,32 +126,380 @@ public class WidgetsCatalogControllerTest {
 	HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
 
 	NullPointerException nullPointerException = new NullPointerException();
-	
+
 	MockEPUser mockUser = new MockEPUser();
-	
-	@Mock
-	HttpEntity mockHttpEntity; 
-	
+
+	@Test
+	public void getUserWidgetCatalogTest() throws RestClientException, Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		List<WidgetCatalog> widgetsList = new ArrayList<>();
+		WidgetCatalog widgetCatalog = new WidgetCatalog();
+		widgetCatalog.setId(1l);
+		widgetCatalog.setName("test");
+		widgetsList.add(widgetCatalog);
+		ResponseEntity<List> ans = new ResponseEntity<>(widgetsList, HttpStatus.OK);
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.GET), Matchers.<HttpEntity<?>>any(),
+				Matchers.eq(List.class))).thenReturn(ans);
+		List<WidgetCatalog> expectedWidgets = widgetsCatalogController.getUserWidgetCatalog("guestT");
+		assertEquals(expectedWidgets, widgetsList);
+	}
+
+	@Test
+	public void getUserWidgetCatalogExceptionTest() throws RestClientException, Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.doThrow(new NullPointerException()).when(template).exchange(Matchers.anyString(),
+				Matchers.eq(HttpMethod.GET), Matchers.<HttpEntity<?>>any(), Matchers.eq(List.class));
+		List<WidgetCatalog> expectedWidgets = widgetsCatalogController.getUserWidgetCatalog("guestT");
+		assertNull(expectedWidgets);
+	}
+
+	@Test
+	public void getWidgetCatalogTest() throws CipherUtilException {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		List<WidgetCatalog> widgetsList = new ArrayList<>();
+		WidgetCatalog widgetCatalog = new WidgetCatalog();
+		widgetCatalog.setId(1l);
+		widgetCatalog.setName("test");
+		widgetsList.add(widgetCatalog);
+		ResponseEntity<List> ans = new ResponseEntity<>(widgetsList, HttpStatus.OK);
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.GET), Matchers.<HttpEntity<?>>any(),
+				Matchers.eq(List.class))).thenReturn(ans);
+		List<WidgetCatalog> expectedWidgets = widgetsCatalogController.getWidgetCatalog();
+		assertEquals(expectedWidgets, widgetsList);
+	}
+
+	@Test
+	public void getWidgetCatalogExceptionTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.doThrow(new NullPointerException()).when(template).exchange(Matchers.anyString(),
+				Matchers.eq(HttpMethod.GET), Matchers.<HttpEntity<?>>any(), Matchers.eq(List.class));
+		List<WidgetCatalog> expectedWidgets = widgetsCatalogController.getUserWidgetCatalog("guestT");
+		assertNull(expectedWidgets);
+	}
+
+	@Test
+	public void updateWidgetCatalogTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		ResponseEntity<List> ans = new ResponseEntity<>(HttpStatus.OK);
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.PUT), Matchers.<HttpEntity<?>>any(),
+				Matchers.eq(List.class))).thenReturn(ans);
+		WidgetCatalog widget = new WidgetCatalog();
+		widget.setId(1l);
+		widgetsCatalogController.updateWidgetCatalog(widget, 1);
+	}
+
+	@Test
+	public void deleteOnboardingWidgetTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		ResponseEntity<List> ans = new ResponseEntity<>(HttpStatus.OK);
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.DELETE),
+				Matchers.<HttpEntity<?>>any(), Matchers.eq(List.class))).thenReturn(ans);
+		widgetsCatalogController.deleteOnboardingWidget(1l);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	public void updateWidgetCatalogWithFilesTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		String ans = "success";
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.postForObject(Mockito.any(String.class), Mockito.any(HttpEntity.class),
+				Mockito.any(Class.class))).thenReturn(ans);
+		MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
+		byte[] mockData = "test".getBytes();
+		String originalFilename = "Test_File.zip";
+		MockMultipartFile mockMultipartFile = new MockMultipartFile("file", originalFilename, "application/zip",
+				mockData);
+		request.addFile(mockMultipartFile);
+		String actual = widgetsCatalogController.updateWidgetCatalogWithFiles(request, 1l);
+		assertEquals(ans, actual);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	public void createWidgetCatalogTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		String ans = "success";
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.postForObject(Mockito.any(String.class), Mockito.any(HttpEntity.class),
+				Mockito.any(Class.class))).thenReturn(ans);
+		MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
+		byte[] mockData = "test".getBytes();
+		String originalFilename = "Test_File.zip";
+		MockMultipartFile mockMultipartFile = new MockMultipartFile("file", originalFilename, "application/zip",
+				mockData);
+		request.addFile(mockMultipartFile);
+		String actual = widgetsCatalogController.createWidgetCatalog(request);
+		assertEquals(ans, actual);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	public void getWidgetFrameworkTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.getForObject(Mockito.anyString(), Mockito.any(Class.class), Mockito.any(String.class)))
+				.thenReturn("test123");
+		String result = widgetsCatalogController.getWidgetFramework(1l);
+		assertNull(result);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	public void getWidgetControllerTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.getForObject(Mockito.anyString(), Mockito.any(Class.class), Mockito.any(String.class)))
+				.thenReturn("test123");
+		String result = widgetsCatalogController.getWidgetController(1);
+		assertNull(result);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	public void getWidgetCSSTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.getForObject(Mockito.anyString(), Mockito.any(Class.class), Mockito.any(String.class)))
+				.thenReturn("test123");
+		String result = widgetsCatalogController.getWidgetCSS(1);
+		assertNull(result);
+	}
+
+	@Test
+	public void getWidgetParameterResultTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		PowerMockito.mockStatic(EPUserUtils.class);
+		EPUser user = mockUser.mockEPUser();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		Mockito.when(EPUserUtils.getUserSession(request)).thenReturn(user);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		ResponseEntity<Long> ans = new ResponseEntity<>(1l, HttpStatus.OK);
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.GET), Matchers.<HttpEntity<?>>any(),
+				Matchers.eq(Long.class))).thenReturn(ans);
+		List<MicroserviceParameter> defaultParam = new ArrayList<>();
+		MicroserviceParameter microserviceParameter = new MicroserviceParameter();
+		microserviceParameter.setId(1l);
+		microserviceParameter.setPara_key("test");
+		MicroserviceParameter microserviceParameter2 = new MicroserviceParameter();
+		microserviceParameter2.setId(2l);
+		microserviceParameter2.setPara_key("test2");
+		defaultParam.add(microserviceParameter);
+		defaultParam.add(microserviceParameter2);
+		Mockito.when(microserviceService.getParametersById(1)).thenReturn(defaultParam);
+		Mockito.when(widgetParameterService.getUserParamById(1l, user.getId(), 1l)).thenReturn(null);
+		WidgetCatalogParameter userValue = new WidgetCatalogParameter();
+		userValue.setUser_value("test123");
+		Mockito.when(widgetParameterService.getUserParamById(1l, user.getId(), 2l)).thenReturn(userValue);
+		PortalRestResponse<List<WidgetParameterResult>> actual = widgetsCatalogController
+				.getWidgetParameterResult(request, 1);
+		PortalRestResponse<List<WidgetParameterResult>> expected = new PortalRestResponse<List<WidgetParameterResult>>(
+				PortalRestStatusEnum.OK, "SUCCESS", new ArrayList<>());
+		assertEquals(expected.getStatus(), actual.getStatus());
+	}
+
 	@SuppressWarnings("unchecked")
 	@Test
-	public void getUserWidgetCatalogTest() throws RestClientException, Exception{
-		
-		String resourceType = null;
-		List<WidgetCatalog> widgets = new ArrayList<>();
-        PowerMockito.mockStatic(EcompPortalUtils.class);	
-        PowerMockito.mockStatic(SystemProperties.class);
-        PowerMockito.mockStatic(EPCommonSystemProperties.class);
-        Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
-        Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
-//        Mockito.when(WidgetServiceHeaders.getInstance()).thenReturn(HttpHeaders.ACCEPT);
-        Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
-        Mockito.when(consulHealthService.getServiceLocation("widgets-service",
-							"test")).thenReturn("test.com");
-        Mockito.when(new HttpEntity(WidgetServiceHeaders.getInstance())).thenReturn(mockHttpEntity);
-//        HttpEntity<String> entity = new HttpEntity<String>("helloWorld");
-//		ResponseEntity<ArrayList> ans = new ResponseEntity<>(statusCode);
-//		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.GET),
-//				Matchers.<HttpEntity<?>>any(), Matchers.eq(ArrayList.class))).thenReturn(ans);
-//		List<WidgetCatalog> expectedWidgets  = 	widgetsCatalogController.getUserWidgetCatalog(mockedRequest, mockedResponse, "guestT");
+	public void doDownloadTest() throws Exception {
+		PowerMockito.mockStatic(EcompPortalUtils.class);
+		PowerMockito.mockStatic(SystemProperties.class);
+		PowerMockito.mockStatic(EPCommonSystemProperties.class);
+		PowerMockito.mockStatic(CipherUtil.class);
+		Mockito.when(EcompPortalUtils.widgetMsProtocol()).thenReturn("test1");
+		Mockito.when(SystemProperties.getProperty(EPCommonSystemProperties.WIDGET_MS_PROTOCOL)).thenReturn("https");
+		Mockito.when(SystemProperties.getProperty("microservices.widget.local.port")).thenReturn("test");
+		Mockito.when(EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user"))
+				.thenReturn("test");
+		Mockito.when(CipherUtil
+				.decryptPKC(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password")))
+				.thenReturn("abc");
+		Mockito.when(consulHealthService.getServiceLocation("widgets-service", "test")).thenReturn("test.com");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		ResponseEntity<byte[]> mockData = new ResponseEntity("testfile.zip".getBytes(), HttpStatus.OK);
+		Mockito.when(template.exchange(Matchers.anyString(), Matchers.eq(HttpMethod.GET), Matchers.<HttpEntity<?>>any(),
+				Matchers.eq(byte[].class))).thenReturn(mockData);
+		widgetsCatalogController.doDownload(request, response, 1l);
+	}
+
+	@Test
+	public void saveWidgetParameterTest() {
+		PowerMockito.mockStatic(EPUserUtils.class);
+		EPUser user = mockUser.mockEPUser();
+		WidgetCatalogParameter widgetCatalogParameter = new WidgetCatalogParameter();
+		widgetCatalogParameter.setId(1l);
+		widgetCatalogParameter.setParamId(1l);
+		widgetCatalogParameter.setUserId(user.getId());
+		widgetCatalogParameter.setUser_value("test123");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		Mockito.when(EPUserUtils.getUserSession(request)).thenReturn(user);
+		Mockito.when(widgetParameterService.getUserParamById(widgetCatalogParameter.getWidgetId(),
+				widgetCatalogParameter.getUserId(), widgetCatalogParameter.getParamId())).thenReturn(widgetCatalogParameter);
+		PortalRestResponse<String> response = widgetsCatalogController.saveWidgetParameter(request,
+				widgetCatalogParameter);
+		PortalRestResponse<String> expected = new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+		assertEquals(expected.getMessage(), response.getMessage());
+	}
+	
+	@Test
+	public void saveWidgetParameterExceptionTest() {
+		PowerMockito.mockStatic(EPUserUtils.class);
+		EPUser user = mockUser.mockEPUser();
+		WidgetCatalogParameter widgetCatalogParameter = new WidgetCatalogParameter();
+		widgetCatalogParameter.setId(1l);
+		widgetCatalogParameter.setParamId(1l);
+		widgetCatalogParameter.setUserId(user.getId());
+		widgetCatalogParameter.setUser_value("test123");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		Mockito.when(EPUserUtils.getUserSession(request)).thenReturn(user);
+		Mockito.doThrow(new NullPointerException()).when(widgetParameterService).getUserParamById(widgetCatalogParameter.getWidgetId(),
+				widgetCatalogParameter.getUserId(), widgetCatalogParameter.getParamId());
+		PortalRestResponse<String> response = widgetsCatalogController.saveWidgetParameter(request,
+				widgetCatalogParameter);
+		PortalRestResponse<String> expected = new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", "");
+		assertEquals(expected.getMessage(), response.getMessage());
 	}
 }