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=61466269069050142ed39adc002a224b147dbae7;hb=4be6886a011ddbc4543e8c27b759a27ff3415c18;hp=de752b94b0264ee487031eca4eff37f5ec5d4c02;hpb=cfa6a7030d736083a074f878c00c238caacb3291;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 de752b94..61466269 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
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modifications Copyright © 2018 IBM.
+ * ================================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -46,77 +48,119 @@ import org.onap.portalapp.portal.domain.EPUserApp;
 
 public class EPUserAppTest {
 
-	public EPUserApp mockEPUserApp(){
-		
-		EPApp epApp = new EPApp();
-		epApp.setName("test");
-		epApp.setImageUrl("test");
-		epApp.setDescription("test");
-		epApp.setNotes("test");
-		epApp.setUrl("test");
-		epApp.setAlternateUrl("test");
-		epApp.setAppRestEndpoint("test");
-		epApp.setMlAppName("test");
-		epApp.setMlAppAdminId("test");
-		epApp.setMotsId((long)1);
-		epApp.setUsername("test");
-		epApp.setAppPassword("test");
-			
-		
-		//Role
-		EPRole epRole = new EPRole();
-		epRole.setName("test");
-		epRole.setActive(false);
-		epRole.setPriority(1);
-		epRole.setAppId((long)1);
-		epRole.setAppRoleId((long)1);
-		
-		EPUserApp user = new EPUserApp();
-		user.setUserId((long)1);
-		user.setApp(epApp);
-		user.setRole(epRole);
-		user.setPriority((short)32767);
-		
-		
-		return user;
-	}
-	
-	@Test
-	public void userTest(){
-		EPUserApp user = mockEPUserApp();
-		
-		EPApp epApp = new EPApp();
-		epApp.setName("test");
-		epApp.setImageUrl("test");
-		epApp.setDescription("test");
-		epApp.setNotes("test");
-		epApp.setUrl("test");
-		epApp.setAlternateUrl("test");
-		epApp.setAppRestEndpoint("test");
-		epApp.setMlAppName("test");
-		epApp.setMlAppAdminId("test");
-		epApp.setMotsId((long)1);
-		epApp.setUsername("test");
-		epApp.setAppPassword("test");
-		user.setApp(epApp);
-		
-		//Role
-		EPRole epRole = new EPRole();
-		epRole.setName("test");
-		epRole.setActive(false);
-		epRole.setPriority(1);
-		epRole.setAppId((long)1);
-		epRole.setAppRoleId((long)1);
-		
-		
+    public EPUserApp mockEPUserApp(){
+        
+        EPApp epApp = new EPApp();
+        epApp.setName("test");
+        epApp.setImageUrl("test");
+        epApp.setDescription("test");
+        epApp.setNotes("test");
+        epApp.setUrl("test");
+        epApp.setAlternateUrl("test");
+        epApp.setAppRestEndpoint("test");
+        epApp.setMlAppName("test");
+        epApp.setMlAppAdminId("test");
+        epApp.setMotsId((long)1);
+        epApp.setUsername("test");
+        epApp.setAppPassword("test");
+            
+        
+        //Role
+        EPRole epRole = new EPRole();
+        epRole.setName("test");
+        epRole.setActive(false);
+        epRole.setPriority(1);
+        epRole.setAppId((long)1);
+        epRole.setAppRoleId((long)1);
+        
+        EPUserApp user = new EPUserApp();
+        user.setUserId((long)1);
+        user.setApp(epApp);
+        user.setRole(epRole);
+        user.setPriority((short)32767);
+        
+        
+        return user;
+    }
+    
+    @Test
+    public void userTest(){
+        EPUserApp user = mockEPUserApp();
+        
+        EPApp epApp = new EPApp();
+        epApp.setName("test");
+        epApp.setImageUrl("test");
+        epApp.setDescription("test");
+        epApp.setNotes("test");
+        epApp.setUrl("test");
+        epApp.setAlternateUrl("test");
+        epApp.setAppRestEndpoint("test");
+        epApp.setMlAppName("test");
+        epApp.setMlAppAdminId("test");
+        epApp.setMotsId((long)1);
+        epApp.setUsername("test");
+        epApp.setAppPassword("test");
+        user.setApp(epApp);
+        
+        //Role
+        EPRole epRole = new EPRole();
+        epRole.setName("test");
+        epRole.setActive(false);
+        epRole.setPriority(1);
+        epRole.setAppId((long)1);
+        epRole.setAppRoleId((long)1);
+        
+        
         assertEquals(user.getUserId(),Long.valueOf(1));
-		assertEquals(user.getApp(), epApp); 
-		assertEquals(user.getPriority().getClass(), Short.class);
-	
-		assertEquals(user.toString(), "[u: 1; a: null, r: null; appRoleId: 1]");
-		
-		assertEquals(user.hashCode(), user.hashCode());
-		
-		
-		}
+        assertEquals(user.getApp(), epApp); 
+        assertEquals(user.getPriority().getClass(), Short.class);
+    
+        assertEquals(user.toString(), "[u: 1; a: null, r: null; appRoleId: 1]");
+        
+        assertEquals(user.hashCode(), user.hashCode());
+        
+        
+        }
+    
+    @Test
+    public void testEquals(){
+        
+        EPRole epRole = new EPRole();
+        epRole.setId((long) 12345);
+        epRole.setName("test");
+        epRole.setActive(false);
+        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);
+        
+        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.setAppRestEndpoint("test");
+        epApp.setMlAppName("test");
+        epApp.setMlAppAdminId("test");
+        epApp.setMotsId((long)1);
+        epApp.setUsername("test");
+        epApp.setAppPassword("test");
+        return epApp;
+    }
+
 }