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
/
domain
/
EPUserAppTest.java
diff --git
a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
index
6146626
..
eddbe41
100644
(file)
--- a/
ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
+++ b/
ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
@@
-53,16
+53,16
@@
public class EPUserAppTest {
EPApp epApp = new EPApp();
epApp.setName("test");
epApp.setImageUrl("test");
EPApp epApp = new EPApp();
epApp.setName("test");
epApp.setImageUrl("test");
- epApp.setDescription("test");
- epApp.setNotes("test");
- epApp.set
Url
("test");
- epApp.setAlternate
Url
("test");
+ epApp.set
App
Description("test");
+ epApp.set
App
Notes("test");
+ epApp.set
LandingPage
("test");
+ epApp.setAlternate
LandingPage
("test");
epApp.setAppRestEndpoint("test");
epApp.setMlAppName("test");
epApp.setMlAppAdminId("test");
epApp.setMotsId((long)1);
epApp.setAppRestEndpoint("test");
epApp.setMlAppName("test");
epApp.setMlAppAdminId("test");
epApp.setMotsId((long)1);
- epApp.setUsername("test");
- epApp.setAppPassword("test");
+ epApp.set
AppBasicAuth
Username("test");
+ epApp.setApp
BasicAuth
Password("test");
//Role
//Role
@@
-77,7
+77,7
@@
public class EPUserAppTest {
user.setUserId((long)1);
user.setApp(epApp);
user.setRole(epRole);
user.setUserId((long)1);
user.setApp(epApp);
user.setRole(epRole);
- user.setPriority((
short
)32767);
+ user.setPriority((
Integer
)32767);
return user;
return user;
@@
-90,16
+90,16
@@
public class EPUserAppTest {
EPApp epApp = new EPApp();
epApp.setName("test");
epApp.setImageUrl("test");
EPApp epApp = new EPApp();
epApp.setName("test");
epApp.setImageUrl("test");
- epApp.setDescription("test");
- epApp.setNotes("test");
- epApp.set
Url
("test");
- epApp.setAlternate
Url
("test");
+ epApp.set
App
Description("test");
+ epApp.set
App
Notes("test");
+ epApp.set
LandingPage
("test");
+ epApp.setAlternate
LandingPage
("test");
epApp.setAppRestEndpoint("test");
epApp.setMlAppName("test");
epApp.setMlAppAdminId("test");
epApp.setMotsId((long)1);
epApp.setAppRestEndpoint("test");
epApp.setMlAppName("test");
epApp.setMlAppAdminId("test");
epApp.setMotsId((long)1);
- epApp.setUsername("test");
- epApp.setAppPassword("test");
+ epApp.set
AppBasicAuth
Username("test");
+ epApp.setApp
BasicAuth
Password("test");
user.setApp(epApp);
//Role
user.setApp(epApp);
//Role
@@
-113,7
+113,7
@@
public class EPUserAppTest {
assertEquals(user.getUserId(),Long.valueOf(1));
assertEquals(user.getApp(), epApp);
assertEquals(user.getUserId(),Long.valueOf(1));
assertEquals(user.getApp(), epApp);
- assertEquals(user.getPriority().getClass(),
Short
.class);
+ assertEquals(user.getPriority().getClass(),
Integer
.class);
assertEquals(user.toString(), "[u: 1; a: null, r: null; appRoleId: 1]");
assertEquals(user.toString(), "[u: 1; a: null, r: null; appRoleId: 1]");
@@
-121,10
+121,9
@@
public class EPUserAppTest {
}
}
-
+
@Test
public void testEquals(){
@Test
public void testEquals(){
-
EPRole epRole = new EPRole();
epRole.setId((long) 12345);
epRole.setName("test");
EPRole epRole = new EPRole();
epRole.setId((long) 12345);
epRole.setName("test");
@@
-132,34
+131,37
@@
public class EPUserAppTest {
epRole.setPriority(1);
epRole.setAppId((long)1);
epRole.setAppRoleId((long)1);
epRole.setPriority(1);
epRole.setAppId((long)1);
epRole.setAppRoleId((long)1);
-
+
EPUserApp user1 = mockEPUserApp();
user1.setApp(mockEPApp());
user1.setRole(epRole);
EPUserApp user1 = mockEPUserApp();
user1.setApp(mockEPApp());
user1.setRole(epRole);
-
+
EPUserApp user2 = mockEPUserApp();
user2.setApp(mockEPApp());
user2.setRole(epRole);
EPUserApp user2 = mockEPUserApp();
user2.setApp(mockEPApp());
user2.setRole(epRole);
-
+
+ EPUserApp nullUser = null;
+
+ assertTrue(user1.equals(user1));
+ assertFalse(user1.equals(nullUser));
+ assertFalse(user1.equals(Long.valueOf(1)));
assertTrue(user1.equals(user2));
assertTrue(user1.equals(user2));
-
}
}
-
private EPApp mockEPApp() {
EPApp epApp = new EPApp();
epApp.setId((long) 12345);
epApp.setName("test");
epApp.setImageUrl("test");
private EPApp mockEPApp() {
EPApp epApp = new EPApp();
epApp.setId((long) 12345);
epApp.setName("test");
epApp.setImageUrl("test");
- epApp.setDescription("test");
- epApp.setNotes("test");
- epApp.set
Url
("test");
- epApp.setAlternate
Url
("test");
+ epApp.set
App
Description("test");
+ epApp.set
App
Notes("test");
+ epApp.set
LandingPage
("test");
+ epApp.setAlternate
LandingPage
("test");
epApp.setAppRestEndpoint("test");
epApp.setMlAppName("test");
epApp.setMlAppAdminId("test");
epApp.setMotsId((long)1);
epApp.setAppRestEndpoint("test");
epApp.setMlAppName("test");
epApp.setMlAppAdminId("test");
epApp.setMotsId((long)1);
- epApp.setUsername("test");
- epApp.setAppPassword("test");
+ epApp.set
AppBasicAuth
Username("test");
+ epApp.setApp
BasicAuth
Password("test");
return epApp;
}
return epApp;
}