diff options
Diffstat (limited to 'ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service')
2 files changed, 14 insertions, 33 deletions
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java index 785522d4..736f8341 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java @@ -95,6 +95,7 @@ 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.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -142,6 +143,9 @@ public class UserRolesCommonServiceImplTest { @Mock Transaction transaction; + + @Mock + AdminRolesService adminRolesService; @InjectMocks UserRolesCommonServiceImpl userRolesCommonServiceImpl = new UserRolesCommonServiceImpl(); @@ -356,11 +360,11 @@ public class UserRolesCommonServiceImplTest { Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp); List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>(); RoleInAppForUser mockRoleInAppForUser = new RoleInAppForUser(); - mockRoleInAppForUser.setIsApplied(false); + mockRoleInAppForUser.setIsApplied(true); mockRoleInAppForUser.setRoleId(333l); mockRoleInAppForUser.setRoleName("test1"); RoleInAppForUser mockRoleInAppForUser2 = new RoleInAppForUser(); - mockRoleInAppForUser2.setIsApplied(false); + mockRoleInAppForUser2.setIsApplied(true); mockRoleInAppForUser2.setRoleId(777l); mockRoleInAppForUser2.setRoleName("test2"); RoleInAppForUser mockRoleInAppForUser3 = new RoleInAppForUser(); @@ -666,7 +670,7 @@ public class UserRolesCommonServiceImplTest { Mockito.when(session.createSQLQuery("update fn_role set app_id = null where app_id = 1 ")) .thenReturn(epsetAppWithUserRoleUpdateEPRoleQuery); ExternalRequestFieldsValidator actual = userRolesCommonServiceImpl.setAppWithUserRoleStateForUser(user, mockWithRolesForUser); - assertFalse(actual.isResult()); + assertTrue(actual.isResult()); } private List<EcompUserAppRoles> getCurrentUserRoles(EPUser user, EPApp mockApp) { @@ -1245,7 +1249,10 @@ public class UserRolesCommonServiceImplTest { mockUserApplicationRoles2.setRoles(mockRemoteRoleList2); mockUserApplicationRolesList.add(mockUserApplicationRoles); mockUserApplicationRolesList.add(mockUserApplicationRoles2); - Mockito.when((List<EPUser>) dataAccessService.executeNamedQuery("getActiveUsers", null, null)) + Map<String, Object> params = new HashMap<>(); + params.put("id", 1l); + params.put("active", true); + Mockito.when((List<EPUser>) dataAccessService.executeNamedQuery("getActiveUsersForApp", params, null)) .thenReturn(mockEpUserList); assertEquals(userRolesCommonServiceImpl.getUsersFromAppEndpoint(1l).size(), mockUserApplicationRolesList.size()); diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/WidgetMServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/WidgetMServiceImplTest.java index 2ed86bfe..9da834e4 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/WidgetMServiceImplTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/WidgetMServiceImplTest.java @@ -37,54 +37,28 @@ */ package org.onap.portalapp.portal.service; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.mockito.Mockito.*; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.onap.portalapp.portal.utils.EcompPortalUtils; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import com.orbitz.consul.Consul; -import com.orbitz.consul.HealthClient; -import com.orbitz.consul.model.ConsulResponse; -import com.orbitz.consul.model.health.ServiceHealth; -import com.orbitz.consul.Consul.Builder; -import com.orbitz.consul.model.health.Node; -import com.orbitz.consul.model.health.Service; + @RunWith(PowerMockRunner.class) -@PrepareForTest({ Consul.class ,EcompPortalUtils.class}) +@PrepareForTest({ EcompPortalUtils.class}) public class WidgetMServiceImplTest { private static final String TEST="test"; @InjectMocks WidgetMServiceImpl widgetMServiceImpl; - @Mock - Builder builder; - @Mock - Consul consul ; - @Mock - HealthClient healthClient; - @Mock - ServiceHealth serviceHealth; - @Mock - ConsulResponse<List<ServiceHealth>> response; - @Mock - Node node; - @Mock - Service service; + @Before public void setup() { |