X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fdomain%2FEPUserAppTest.java;h=eddbe41897e1e3878f66d225e5ae5807e9946eb5;hb=230c71614b1d2fb71a8fb482c749ff5a6dad65d8;hp=61466269069050142ed39adc002a224b147dbae7;hpb=1e3b5bdbea15453fb078ee49fe7de41efef4326f;p=portal.git

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 61466269..eddbe418 100644
--- 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.setDescription("test");
-        epApp.setNotes("test");
-        epApp.setUrl("test");
-        epApp.setAlternateUrl("test");
+        epApp.setAppDescription("test");
+        epApp.setAppNotes("test");
+        epApp.setLandingPage("test");
+        epApp.setAlternateLandingPage("test");
         epApp.setAppRestEndpoint("test");
         epApp.setMlAppName("test");
         epApp.setMlAppAdminId("test");
         epApp.setMotsId((long)1);
-        epApp.setUsername("test");
-        epApp.setAppPassword("test");
+        epApp.setAppBasicAuthUsername("test");
+        epApp.setAppBasicAuthPassword("test");
             
         
         //Role
@@ -77,7 +77,7 @@ public class EPUserAppTest {
         user.setUserId((long)1);
         user.setApp(epApp);
         user.setRole(epRole);
-        user.setPriority((short)32767);
+        user.setPriority((Integer)32767);
         
         
         return user;
@@ -90,16 +90,16 @@ public class EPUserAppTest {
         EPApp epApp = new EPApp();
         epApp.setName("test");
         epApp.setImageUrl("test");
-        epApp.setDescription("test");
-        epApp.setNotes("test");
-        epApp.setUrl("test");
-        epApp.setAlternateUrl("test");
+        epApp.setAppDescription("test");
+        epApp.setAppNotes("test");
+        epApp.setLandingPage("test");
+        epApp.setAlternateLandingPage("test");
         epApp.setAppRestEndpoint("test");
         epApp.setMlAppName("test");
         epApp.setMlAppAdminId("test");
         epApp.setMotsId((long)1);
-        epApp.setUsername("test");
-        epApp.setAppPassword("test");
+        epApp.setAppBasicAuthUsername("test");
+        epApp.setAppBasicAuthPassword("test");
         user.setApp(epApp);
         
         //Role
@@ -113,7 +113,7 @@ public class EPUserAppTest {
         
         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]");
         
@@ -121,10 +121,9 @@ public class EPUserAppTest {
         
         
         }
-    
+
     @Test
     public void testEquals(){
-        
         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);
-        
+
         EPUserApp user1 = mockEPUserApp();
         user1.setApp(mockEPApp());
         user1.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));
-        
         }
-    
     private EPApp mockEPApp() {
         EPApp epApp = new EPApp();
         epApp.setId((long) 12345);
         epApp.setName("test");
         epApp.setImageUrl("test");
-        epApp.setDescription("test");
-        epApp.setNotes("test");
-        epApp.setUrl("test");
-        epApp.setAlternateUrl("test");
+        epApp.setAppDescription("test");
+        epApp.setAppNotes("test");
+        epApp.setLandingPage("test");
+        epApp.setAlternateLandingPage("test");
         epApp.setAppRestEndpoint("test");
         epApp.setMlAppName("test");
         epApp.setMlAppAdminId("test");
         epApp.setMotsId((long)1);
-        epApp.setUsername("test");
-        epApp.setAppPassword("test");
+        epApp.setAppBasicAuthUsername("test");
+        epApp.setAppBasicAuthPassword("test");
         return epApp;
     }