Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fixes for supporting non-gui application access provisioning
[portal.git]
/
ecomp-portal-BE-common
/
src
/
test
/
java
/
org
/
onap
/
portalapp
/
portal
/
service
/
UserRolesCommonServiceImplTest.java
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
785522d
..
5846fa9
100644
(file)
--- 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
@@
-81,6
+81,7
@@
import org.onap.portalapp.portal.domain.EPUserAppCatalogRoles;
import org.onap.portalapp.portal.domain.EPUserAppRoles;
import org.onap.portalapp.portal.domain.EPUserAppRolesRequest;
import org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail;
import org.onap.portalapp.portal.domain.EPUserAppRoles;
import org.onap.portalapp.portal.domain.EPUserAppRolesRequest;
import org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail;
+import org.onap.portalapp.portal.domain.EpAppType;
import org.onap.portalapp.portal.domain.ExternalSystemAccess;
import org.onap.portalapp.portal.transport.*;
import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
import org.onap.portalapp.portal.domain.ExternalSystemAccess;
import org.onap.portalapp.portal.transport.*;
import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
@@
-95,6
+96,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.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;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@
-142,6
+144,9
@@
public class UserRolesCommonServiceImplTest {
@Mock
Transaction transaction;
@Mock
Transaction transaction;
+
+ @Mock
+ AdminRolesService adminRolesService;
@InjectMocks
UserRolesCommonServiceImpl userRolesCommonServiceImpl = new UserRolesCommonServiceImpl();
@InjectMocks
UserRolesCommonServiceImpl userRolesCommonServiceImpl = new UserRolesCommonServiceImpl();
@@
-164,24
+169,24
@@
public class UserRolesCommonServiceImplTest {
EPApp app = new EPApp();
app.setName("Test");
app.setImageUrl("test");
EPApp app = new EPApp();
app.setName("Test");
app.setImageUrl("test");
- app.setDescription("test");
- app.setNotes("test");
- app.set
Url
("test");
+ app.set
App
Description("test");
+ app.set
App
Notes("test");
+ app.set
LandingPage
("test");
app.setId((long) 1);
app.setAppRestEndpoint("test");
app.setId((long) 1);
app.setAppRestEndpoint("test");
- app.setAlternate
Url
("test");
+ app.setAlternate
LandingPage
("test");
app.setName("test");
app.setMlAppName("test");
app.setMlAppAdminId("test");
app.setName("test");
app.setMlAppName("test");
app.setMlAppAdminId("test");
- app.setUsername("test");
- app.setAppPassword("test");
+ app.set
AppBasicAuth
Username("test");
+ app.setApp
BasicAuth
Password("test");
app.setOpen(false);
app.setEnabled(false);
app.setOpen(false);
app.setEnabled(false);
- app.set
CentralAuth
(true);
+ app.set
RolesInAAF
(true);
app.setUebKey("test");
app.setUebSecret("test");
app.setUebTopicName("test");
app.setUebKey("test");
app.setUebSecret("test");
app.setUebTopicName("test");
- app.setAppType(
1
);
+ app.setAppType(
EpAppType.GUI
);
return app;
}
return app;
}
@@
-257,7
+262,7
@@
public class UserRolesCommonServiceImplTest {
EPUser user = mockUser.mockEPUser();
user.setId(1l);
EPApp mockApp = mockApp();
EPUser user = mockUser.mockEPUser();
user.setId(1l);
EPApp mockApp = mockApp();
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
EPRole mockEPRole = new EPRole();
mockEPRole.setId(1l);
mockEPRole.setName("test1");
EPRole mockEPRole = new EPRole();
mockEPRole.setId(1l);
mockEPRole.setName("test1");
@@
-352,15
+357,15
@@
public class UserRolesCommonServiceImplTest {
mockEpUserList.add(user);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockEpUserList.add(user);
EPApp mockApp = mockApp();
mockApp.setId(2l);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>();
RoleInAppForUser mockRoleInAppForUser = new RoleInAppForUser();
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>();
RoleInAppForUser mockRoleInAppForUser = new RoleInAppForUser();
-
mockRoleInAppForUser.setIsApplied(fals
e);
+
mockRoleInAppForUser.setIsApplied(tru
e);
mockRoleInAppForUser.setRoleId(333l);
mockRoleInAppForUser.setRoleName("test1");
RoleInAppForUser mockRoleInAppForUser2 = new RoleInAppForUser();
mockRoleInAppForUser.setRoleId(333l);
mockRoleInAppForUser.setRoleName("test1");
RoleInAppForUser mockRoleInAppForUser2 = new RoleInAppForUser();
-
mockRoleInAppForUser2.setIsApplied(fals
e);
+
mockRoleInAppForUser2.setIsApplied(tru
e);
mockRoleInAppForUser2.setRoleId(777l);
mockRoleInAppForUser2.setRoleName("test2");
RoleInAppForUser mockRoleInAppForUser3 = new RoleInAppForUser();
mockRoleInAppForUser2.setRoleId(777l);
mockRoleInAppForUser2.setRoleName("test2");
RoleInAppForUser mockRoleInAppForUser3 = new RoleInAppForUser();
@@
-520,7
+525,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setNameSpace("com.test.com");
mockApp.setId(1l);
EPApp mockApp = mockApp();
mockApp.setNameSpace("com.test.com");
mockApp.setId(1l);
- mockApp.set
CentralAuth
(true);
+ mockApp.set
RolesInAAF
(true);
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
AppWithRolesForUser mockWithRolesForUser = new AppWithRolesForUser();
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
AppWithRolesForUser mockWithRolesForUser = new AppWithRolesForUser();
@@
-666,7
+671,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);
Mockito.when(session.createSQLQuery("update fn_role set app_id = null where app_id = 1 "))
.thenReturn(epsetAppWithUserRoleUpdateEPRoleQuery);
ExternalRequestFieldsValidator actual = userRolesCommonServiceImpl.setAppWithUserRoleStateForUser(user, mockWithRolesForUser);
- assert
Fals
e(actual.isResult());
+ assert
Tru
e(actual.isResult());
}
private List<EcompUserAppRoles> getCurrentUserRoles(EPUser user, EPApp mockApp) {
}
private List<EcompUserAppRoles> getCurrentUserRoles(EPUser user, EPApp mockApp) {
@@
-694,7
+699,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setNameSpace("com.test.com");
mockApp.setId(2l);
EPApp mockApp = mockApp();
mockApp.setNameSpace("com.test.com");
mockApp.setId(2l);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
AppWithRolesForUser mockWithRolesForUser = new AppWithRolesForUser();
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
AppWithRolesForUser mockWithRolesForUser = new AppWithRolesForUser();
@@
-827,7
+832,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setNameSpace("com.test.com");
mockApp.setId(1l);
EPApp mockApp = mockApp();
mockApp.setNameSpace("com.test.com");
mockApp.setId(1l);
- mockApp.set
CentralAuth
(true);
+ mockApp.set
RolesInAAF
(true);
Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
ExternalSystemUser externalSystemUser = new ExternalSystemUser();
List<ExternalSystemRoleApproval> mockExternalSystemRoleApprovalList = new ArrayList<>();
Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
ExternalSystemUser externalSystemUser = new ExternalSystemUser();
List<ExternalSystemRoleApproval> mockExternalSystemRoleApprovalList = new ArrayList<>();
@@
-995,7
+1000,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
ExternalSystemUser externalSystemUser = new ExternalSystemUser();
List<ExternalSystemRoleApproval> mockExternalSystemRoleApprovalList = new ArrayList<>();
ExternalSystemRoleApproval mockExternalSystemRoleApproval = new ExternalSystemRoleApproval();
ExternalSystemUser externalSystemUser = new ExternalSystemUser();
List<ExternalSystemRoleApproval> mockExternalSystemRoleApprovalList = new ArrayList<>();
ExternalSystemRoleApproval mockExternalSystemRoleApproval = new ExternalSystemRoleApproval();
@@
-1183,7
+1188,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(1l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(1l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(true);
+ mockApp.set
RolesInAAF
(true);
EPUser user = mockUser.mockEPUser();
EPUser user2 = mockUser.mockEPUser();
user2.setActive(true);
EPUser user = mockUser.mockEPUser();
EPUser user2 = mockUser.mockEPUser();
user2.setActive(true);
@@
-1245,7
+1250,10
@@
public class UserRolesCommonServiceImplTest {
mockUserApplicationRoles2.setRoles(mockRemoteRoleList2);
mockUserApplicationRolesList.add(mockUserApplicationRoles);
mockUserApplicationRolesList.add(mockUserApplicationRoles2);
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());
.thenReturn(mockEpUserList);
assertEquals(userRolesCommonServiceImpl.getUsersFromAppEndpoint(1l).size(),
mockUserApplicationRolesList.size());
@@
-1256,7
+1264,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
List<UserApplicationRoles> mockUserApplicationRolesNonCentralizedList = new ArrayList<>();
UserApplicationRoles mockUserApplicationRoles = new UserApplicationRoles();
Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
List<UserApplicationRoles> mockUserApplicationRolesNonCentralizedList = new ArrayList<>();
UserApplicationRoles mockUserApplicationRoles = new UserApplicationRoles();
@@
-1311,7
+1319,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
EPUser user = mockUser.mockEPUser();
AppWithRolesForUser appWithRolesForUser = new AppWithRolesForUser();
List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>();
EPUser user = mockUser.mockEPUser();
AppWithRolesForUser appWithRolesForUser = new AppWithRolesForUser();
List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>();
@@
-1364,7
+1372,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
List<EPRole> expected = new ArrayList<>();
EPRole epRole = new EPRole();
epRole.setAppId(mockApp.getId());
List<EPRole> expected = new ArrayList<>();
EPRole epRole = new EPRole();
epRole.setAppId(mockApp.getId());
@@
-1393,7
+1401,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
EPUser user = mockUser.mockEPUser();
List<EPUserApp> expected = new ArrayList<>();
EPUserApp epUserApp = new EPUserApp();
EPUser user = mockUser.mockEPUser();
List<EPUserApp> expected = new ArrayList<>();
EPUserApp epUserApp = new EPUserApp();
@@
-1419,7
+1427,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
EPUser user = mockUser.mockEPUser();
List<EPUserAppCatalogRoles> expected = new ArrayList<>();
EPUserAppCatalogRoles epUserAppCatalogRoles = new EPUserAppCatalogRoles();
EPUser user = mockUser.mockEPUser();
List<EPUserAppCatalogRoles> expected = new ArrayList<>();
EPUserAppCatalogRoles epUserAppCatalogRoles = new EPUserAppCatalogRoles();
@@
-1451,7
+1459,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
EPUser user = mockUser.mockEPUser();
List<EPUserApp> expected = new ArrayList<>();
EPUserApp epUserApp = new EPUserApp();
EPUser user = mockUser.mockEPUser();
List<EPUserApp> expected = new ArrayList<>();
EPUserApp epUserApp = new EPUserApp();
@@
-1481,7
+1489,7
@@
public class UserRolesCommonServiceImplTest {
EPApp mockApp2 = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
EPApp mockApp2 = mockApp();
mockApp.setId(2l);
mockApp.setEnabled(true);
- mockApp.set
CentralAuth
(false);
+ mockApp.set
RolesInAAF
(false);
EPUser user = mockUser.mockEPUser();
List<EPApp> mockEpAppList = new ArrayList<>();
mockEpAppList.add(mockApp);
EPUser user = mockUser.mockEPUser();
List<EPApp> mockEpAppList = new ArrayList<>();
mockEpAppList.add(mockApp);