Updated asserts for testing equals() method in DocumentLink.java and HibernateDocumentNoteDAO.java

Author: gdesiato

logicaldoc-core/src/test/java/com/logicaldoc/core/document/DocumentLinkTest.java

@@ -99,11 +99,11 @@ public void testEquals() throws PersistenceException {
 		link2.setDocument2(doc2);
 
 		assertEquals(link1, link1);
-		assertNotSame(link2, link1);
-		assertNotSame(link1, link2);
+		assertEquals(false, link2.equals(link1));
+		assertEquals(false, link1.equals(link2));
 
 		link2 = null;
-		assertNotSame(link1, link2);
+		assertEquals(false, link1.equals(link2));
 
 		link1 = new DocumentLink();
 		link1.setDocument1(null);
@@ -114,15 +114,15 @@ public void testEquals() throws PersistenceException {
 		link2.setDocument2(doc3);
 		DocumentLink link3 = new DocumentLink();
 		link3.setDocument2(doc2);
-		assertNotSame(link2, link3);
+		assertEquals(false, link2.equals(link3));
 
 		link1 = new DocumentLink();
 		link1.setType("linkType1");
 		assertNotNull(link1.getType());
 		link2 = new DocumentLink();
 		link2.setType("linkType2");
 		assertNotNull(link2.getType());
-		assertNotSame(link1, link2);
-		assertNotSame(link2, link1);
+		assertEquals(false, link1.equals(link2));
+		assertEquals(false, link2.equals(link1));
 	}
 }

logicaldoc-core/src/test/java/com/logicaldoc/core/document/HibernateDocumentNoteDAOTest.java

@@ -70,37 +70,38 @@ public void testEquals() throws PersistenceException {
 
 		String notANote = "Not a DocumentNote";
 
-		assertNotSame(note1, note2);
+		assertEquals(false, note1.equals(note2));
 
 		note2.setId(note1.getId());
-		assertNotSame(note1, note2);
+		assertEquals(false, note1.equals(note2));
 
 		note1.setDate(null);
-		assertNotSame(note1, note2);
+		assertEquals(false, note1.equals(note2));
 
 		note1.setDate(new Date());
 		assertNotSame(note1, note2);
+		assertEquals(false, note1.equals(note2));
 
 		assertEquals(note1, note1);
 
 		DocumentNote nullNote = null;
-		assertNotSame(note1, nullNote);
-		assertNotSame(note1, new Object());
-		assertNotSame(note1, notANote);
+		assertEquals(false, note1.equals(nullNote));
+		assertEquals(false, note1.equals(new Object()));
+		assertEquals(false, note1.equals(notANote));
 
 		note1 = dao.findById(1);
 		note2 = dao.findById(2);
 		assertEquals(note1.getDate(), note2.getDate());
 
 		note2.setDate(null);
-		assertNotSame(note1.getDate(), note2.getDate());
-		assertNotSame(note2, note1);
+		assertEquals(false, note1.getDate().equals(note2.getDate()));
+		assertEquals(false, note1.equals(note2));
 
 		note1 = dao.findById(1);
 		note2 = dao.findById(2);
 		note2.setFileVersion(null);
-		assertNotSame(note1.getFileVersion(), note2.getFileVersion());
-		assertNotSame(note2, note1);
+		assertEquals(false, note1.getFileVersion().equals(note2.getFileVersion()));
+		assertEquals(false, note1.equals(note2));
 	}
 
 	@Test