Merge "Blackduck scan fixes and PenTest"

1 files changed, 1 insertions, 67 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java
index fc0871a9..e3158bf2 100644
--- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java
@@ -108,73 +108,7 @@ public class ProfileControllerTest {
 	@Mock
 	UserUtils userUtils = new UserUtils();
 
-	@Test
-	public void profileTest() throws IOException {
-		ModelAndView actualModelAndView = new ModelAndView("profile");
-		User user = new User();
-		user.setOrgUserId("test");
-		Long profileId = null;
-		PowerMockito.mockStatic(AppUtils.class);
-		PowerMockito.mockStatic(UserUtils.class);
-		Mockito.when(mockedRequest.getRequestURI()).thenReturn("self_profile.htm");
-		Mockito.when(mockedRequest.getParameter("profile_id")).thenReturn("test");
-		Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(AppUtils.getLookupList("FN_LU_STATE", "STATE_CD", "STATE", null, "STATE_CD"))
-				.thenReturn(new ArrayList<>());
-		Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(user);
-		ModelAndView expectedModelAndView = profileController.profile(mockedRequest);
-		assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-	}
-
-	@Test
-	public void profileRequestURITest() throws IOException {
-		ModelAndView actualModelAndView = new ModelAndView("profile");
-		User user = new User();
-		user.setOrgUserId("test");
-		int profileId = 1;
-		PowerMockito.mockStatic(AppUtils.class);
-		PowerMockito.mockStatic(UserUtils.class);
-		Mockito.when(mockedRequest.getRequestURI()).thenReturn("test");
-		Mockito.when(mockedRequest.getParameter("profile_id")).thenReturn("1");
-		Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(user);
-		Mockito.when(AppUtils.getLookupList("FN_LU_STATE", "STATE_CD", "STATE", null, "STATE_CD"))
-				.thenReturn(new ArrayList<>());
-		Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(user);
-		ModelAndView expectedModelAndView = profileController.profile(mockedRequest);
-		assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-	}
-
-	@Test
-	public void profileExceptionTest() throws IOException {
-		ModelAndView actualModelAndView = new ModelAndView("profile");
-		User profile = null;
-		Long profileId = null;
-		Mockito.when(mockedRequest.getRequestURI()).thenReturn("self_profile.htm");
-		Mockito.when(mockedRequest.getParameter("profile_id")).thenReturn("test");
-		Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(profile);
-		ModelAndView expectedModelAndView = profileController.profile(mockedRequest);
-		assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-	}
-
-	@Test
-	public void selfProfileTest() throws Exception {
-		ModelAndView actualModelAndView = new ModelAndView("profile");
-		PowerMockito.mockStatic(AppUtils.class);
-		PowerMockito.mockStatic(UserUtils.class);
-		Mockito.when(AppUtils.getLookupList("FN_LU_STATE", "STATE_CD", "STATE", null, "STATE_CD"))
-				.thenReturn(new ArrayList<>());
-		Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		ModelAndView expectedModelAndView = profileController.selfProfile(mockedRequest);
-		assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-	}
-
-	@Test
-	public void selfProfileExceptionTest() throws Exception {
-		Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		profileController.selfProfile(mockedRequest);
-	}
+	
 
 	@SuppressWarnings("rawtypes")
 	@Test