X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Ftransport%2FEpNotificationItemTest.java;h=9ae4aadb39ccf178e41310715fecb1e08c4d41e4;hb=aa9b320ff93511280cf51b03d38fb9254af6b530;hp=9af91a5a3bae735e5cb97c5ecbfe98da455df2a9;hpb=fe3a67c11b65d7989a6ef648c3f34eee8abe7394;p=portal.git

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EpNotificationItemTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EpNotificationItemTest.java
index 9af91a5a..9ae4aadb 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EpNotificationItemTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/EpNotificationItemTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -36,63 +36,119 @@
  * 
  */package org.onap.portalapp.portal.transport;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.junit.Test;
-import org.onap.portalapp.portal.transport.EpNotificationItem;
 
 public class EpNotificationItemTest {
 	
+	private static final String TEST="test";
+	private static Date date=new Date();
+	
 	public EpNotificationItem mockEpNotificationItem(){
 		EpNotificationItem epNotificationItem = new EpNotificationItem();
-		
+		Set<EpRoleNotificationItem> list=new HashSet<>();
+		EpRoleNotificationItem item=new EpRoleNotificationItem();
+		item.setRoleId(3);
+		item.setId(1l);
+		list.add(item);
+	List<Long> roleIds=	list.stream().map(e->e.getId()).collect(Collectors.toList());
 		epNotificationItem.setNotificationId((long)1);
-		epNotificationItem.setIsForOnlineUsers("test");
-		epNotificationItem.setIsForAllRoles("test");
-		epNotificationItem.setActiveYn("test");
-		epNotificationItem.setMsgHeader("test");
-		epNotificationItem.setMsgDescription("test");
-		epNotificationItem.setMsgSource("test");
+		epNotificationItem.setIsForOnlineUsers(TEST);
+		epNotificationItem.setIsForAllRoles(TEST);
+		epNotificationItem.setActiveYn(TEST);
+		epNotificationItem.setMsgHeader(TEST);
+		epNotificationItem.setMsgDescription(TEST);
+		epNotificationItem.setMsgSource(TEST);
 		
 		epNotificationItem.setPriority((long)1);
 		epNotificationItem.setCreatedId((long)1);
-		epNotificationItem.setNotificationHyperlink("test");
+		epNotificationItem.setNotificationHyperlink(TEST);
+		epNotificationItem.setStartTime(date);
+		epNotificationItem.setEndTime(date);
+		epNotificationItem.setCreatedDate(date);
+		epNotificationItem.setCreatorId(1l);
+		epNotificationItem.setRoles(list);
+		epNotificationItem.setRoleIds(roleIds);
+		
 		
 		return epNotificationItem;
 	}
 	
+	
+	
 	@Test
 	public void epNotificationItemTest(){
-		EpNotificationItem epNotificationItem = mockEpNotificationItem();
-		
-		EpNotificationItem epNotificationItem1 = new EpNotificationItem();
-		epNotificationItem1.setNotificationId((long)1);
-		epNotificationItem1.setIsForOnlineUsers("test");
-		epNotificationItem1.setIsForAllRoles("test");
-		epNotificationItem1.setActiveYn("test");
-		epNotificationItem1.setMsgHeader("test");
-		epNotificationItem1.setMsgDescription("test");
-		epNotificationItem1.setMsgSource("test");
+		EpNotificationItem epNotificationItem1 = mockEpNotificationItem();
 		
-		epNotificationItem1.setPriority((long)1);
-		epNotificationItem1.setCreatedId((long)1);
-		epNotificationItem1.setNotificationHyperlink("test");
-		
-		assertEquals(epNotificationItem.getNotificationId(), new Long(1));
-		assertEquals(epNotificationItem.getIsForOnlineUsers(), "test");
-		assertEquals(epNotificationItem.getIsForAllRoles(), "test");
-		assertEquals(epNotificationItem.getActiveYn(), "test");
-		assertEquals(epNotificationItem.getMsgHeader(), "test");
-		assertEquals(epNotificationItem.getMsgDescription(), "test");
-		assertEquals(epNotificationItem.getMsgSource(), "test");
-		assertEquals(epNotificationItem.getPriority(), new Long(1));
-		assertEquals(epNotificationItem.getCreatedId(), new Long(1));
-		assertEquals(epNotificationItem.getNotificationHyperlink(), "test");
-		
-		assertEquals(epNotificationItem.toString(), "EpNotificationItem [notificationId=1, isForOnlineUsers=test, isForAllRoles=test, activeYn=test, msgHeader=test, msgDescription=test, msgSource=test, startTime=null, endTime=null, priority=1, creatorId=null, createdDate=null, roles=null, roleIds=null]");
+		EpNotificationItem epNotificationItem = new EpNotificationItem();	
+		epNotificationItem.setNotificationId(epNotificationItem1.getNotificationId());
+		epNotificationItem.setIsForOnlineUsers(epNotificationItem1.getIsForOnlineUsers());
+		epNotificationItem.setIsForAllRoles(epNotificationItem1.getIsForAllRoles());
+		epNotificationItem.setActiveYn(epNotificationItem1.getActiveYn());
+		epNotificationItem.setMsgHeader(epNotificationItem1.getMsgHeader());
+		epNotificationItem.setMsgDescription(epNotificationItem1.getMsgDescription());
+		epNotificationItem.setMsgSource(epNotificationItem1.getMsgSource());
+
+		epNotificationItem.setPriority((long)1);
+		epNotificationItem.setCreatedId(epNotificationItem1.getCreatedId());
+		epNotificationItem.setNotificationHyperlink(epNotificationItem1.getNotificationHyperlink());
+		epNotificationItem.setStartTime(new Date());
+		epNotificationItem.setEndTime(epNotificationItem1.getEndTime());
+		epNotificationItem.setCreatedDate(epNotificationItem1.getCreatedDate());
+		epNotificationItem.setCreatorId(epNotificationItem1.getCreatorId());
+		epNotificationItem.setRoles(epNotificationItem1.getRoles());
+		epNotificationItem.setRoleIds(epNotificationItem1.getRoleIds());
+		epNotificationItem.setStartTime(epNotificationItem1.getStartTime());
+		assertNotNull(epNotificationItem.toString());
+		//assertNotEquals(epNotificationItem.toString(), "EpNotificationItem [notificationId=1, isForOnlineUsers=test, isForAllRoles=test, activeYn=test, msgHeader=test, msgDescription=test, msgSource=test, startTime=null, endTime=null, priority=1, creatorId=null, createdDate=null, roles=null, roleIds=null]");
 		assertEquals(epNotificationItem.hashCode(), epNotificationItem1.hashCode());
+		EpNotificationItem epNotificationItem2 =epNotificationItem;
+		assertTrue(epNotificationItem.equals(epNotificationItem2));
 		assertTrue(epNotificationItem.equals(epNotificationItem1));
-				
+					
+		assertTrue(epNotificationItem.equals(epNotificationItem1));
+		assertFalse(epNotificationItem.equals(null));
+		epNotificationItem.setStartTime(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setRoles(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setRoleIds(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setPriority(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setNotificationId(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setMsgSource(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setMsgHeader(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setMsgDescription(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setIsForOnlineUsers(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setIsForAllRoles(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setEndTime(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setCreatedId(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setCreatedDate(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		epNotificationItem.setActiveYn(null);
+		assertFalse(epNotificationItem.equals(epNotificationItem1));
+		
+		
 	}
 
 }