Fixed health check issue

[portal.git] / ecomp-portal-BE-common / src / test / java / org / onap / portalapp / util / EPUserUtilsTest.java

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java
index 7383330..c7def37 100644 (file)
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/util/EPUserUtilsTest.java
@@ -59,7 +59,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.codec.binary.Hex;
-import org.drools.core.command.assertion.AssertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -256,7 +255,7 @@ public class EPUserUtilsTest {
                PowerMockito.when(AppUtils.getSession(mockedRequest)).thenReturn(session);
                PowerMockito.when(SystemProperties.getProperty(Matchers.anyString())).thenReturn("12");
                Mockito.when(session.getAttribute(Matchers.anyString())).thenReturn(roles);
-               roles=EPUserUtils.getRoles(mockedRequest);
+               roles= (HashMap) EPUserUtils.getRoles(mockedRequest);
                assertEquals(roles,expected);
 
 
@@ -279,7 +278,7 @@ public class EPUserUtilsTest {
                Mockito.when(session.getAttribute("attr_name")).thenReturn(user);
                Mockito.when(user.getEPRoles()).thenReturn(role);
                Mockito.when(session.getAttribute("12")).thenReturn(null);
-               roles=EPUserUtils.getRoles(mockedRequest);
+               roles= (HashMap) EPUserUtils.getRoles(mockedRequest);
                assertEquals(roles,expected);
 
        }
@@ -320,7 +319,7 @@ public class EPUserUtilsTest {
                Mockito.when(epRole.getChildRoles()).thenReturn(childRoles);
                Mockito.when(user.getEPUserApps()).thenReturn(epUserApps);
                Mockito.when(session.getAttribute("12")).thenReturn(null);
-               roles=  EPUserUtils.getRoles(mockedRequest);
+               roles= (HashMap) EPUserUtils.getRoles(mockedRequest);
                assertNotNull(roles);
        }
        
@@ -334,7 +333,7 @@ public class EPUserUtilsTest {
        @Test(expected=RoleFunctionException.class)
        public void decodeFunctionCodeTestWithException() throws DecoderException, RoleFunctionException {
                PowerMockito.mockStatic(Hex.class);
-               PowerMockito.when(Hex.decodeHex(Matchers.any())).thenThrow(DecoderException.class);
+               PowerMockito.when(Hex.decodeHex(Matchers.anyString().toCharArray())).thenThrow(DecoderException.class);
                EPUserUtils.decodeFunctionCode("n+");
        }
        
@@ -358,7 +357,7 @@ public class EPUserUtilsTest {
                Mockito.when(epRoleFunctionService.getRoleFunctions()).thenReturn(roleFunctions);
                Mockito.when(MenuBuilder.filterMenu(applicationMenuData, mockedRequest)).thenReturn(applicationMenuData);
                PowerMockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("12");
-        EPUserUtils.setUserSession(mockedRequest, user, applicationMenuData, businessDirectMenuData, "login_method", epRoleFunctionService);
+        EPUserUtils.setUserSession(mockedRequest, user, applicationMenuData, businessDirectMenuData,  epRoleFunctionService);
         assertNotNull(session);
 
 
@@ -383,7 +382,7 @@ public class EPUserUtilsTest {
                Mockito.when(epRoleFunctionService.getRoleFunctions()).thenReturn(null);
                Mockito.when(MenuBuilder.filterMenu(applicationMenuData, mockedRequest)).thenReturn(applicationMenuData);
                PowerMockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("12");
-        EPUserUtils.setUserSession(mockedRequest, user, applicationMenuData, businessDirectMenuData, "login_method", epRoleFunctionService);
+        EPUserUtils.setUserSession(mockedRequest, user, applicationMenuData, businessDirectMenuData,  epRoleFunctionService);
         assertNotNull(session);
        }
        
@@ -408,7 +407,7 @@ public class EPUserUtilsTest {
                Mockito.when(epRoleFunctionService.getRoleFunctions()).thenReturn(null);
                Mockito.when(MenuBuilder.filterMenu(applicationMenuData, mockedRequest)).thenReturn(applicationMenuData);
                PowerMockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("12");
-        EPUserUtils.setUserSession(mockedRequest, user, applicationMenuData, businessDirectMenuData, "login_method", epRoleFunctionService);
+        EPUserUtils.setUserSession(mockedRequest, user, applicationMenuData, businessDirectMenuData, epRoleFunctionService);
         assertNotNull(session);