Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java =================================================================== diff -u -rafdcd71e8101534954d0eae0e6015e9d52cd6217 -rd62b6dd9025c676bb6c066f82941148f0dd91014 --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision afdcd71e8101534954d0eae0e6015e9d52cd6217) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision d62b6dd9025c676bb6c066f82941148f0dd91014) @@ -31,6 +31,7 @@ import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardContentDAO; import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardSessionDAO; import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardUserDAO; +import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardAttachmentDAO; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; import java.util.Date; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants; @@ -47,13 +48,15 @@ private NoticeboardContentDAO noticeboardDAO; private NoticeboardSessionDAO nbSessionDAO; private NoticeboardUserDAO nbUserDAO; + private NoticeboardAttachmentDAO attachmentDAO; //--------------------------------------------------------------------- // Domain Object instances //--------------------------------------------------------------------- protected NoticeboardContent nbContent; protected NoticeboardSession nbSession; protected NoticeboardUser nbUser; + //--------------------------------------------------------------------- // DATA USED FOR TESTING PURPOSES ONLY @@ -85,6 +88,11 @@ protected final String TEST_FULLNAME = "Hamish Andy"; protected final String TEST_USER_STATUS = NoticeboardUser.INCOMPLETE; + protected final String TEST_FILENAME = "testFilename"; + protected final boolean TEST_IS_ONLINE_FILE = true; + protected final Long TEST_UUID = new Long(2002); + + //--------------------------------------------------------------------- // DEFAULT DATA INSERTED BY BUILD-DB ANT TASK //--------------------------------------------------------------------- @@ -121,6 +129,7 @@ noticeboardDAO = (NoticeboardContentDAO) this.context.getBean("nbContentDAO"); nbSessionDAO = (NoticeboardSessionDAO) this.context.getBean("nbSessionDAO"); nbUserDAO = (NoticeboardUserDAO) this.context.getBean("nbUserDAO"); + attachmentDAO = (NoticeboardAttachmentDAO)this.context.getBean("nbAttachmentDAO"); } protected void tearDown() throws Exception { @@ -201,6 +210,20 @@ ns.getNbUsers().add(user); } + + protected void initNbAttachmentData() + { + NoticeboardAttachment attachment = new NoticeboardAttachment(); + NoticeboardContent nb = noticeboardDAO.findNbContentById(TEST_NB_ID); + + attachment.setFilename(TEST_FILENAME); + attachment.setOnlineFile(TEST_IS_ONLINE_FILE); + attachment.setNbContent(nbContent); + attachment.setUuid(TEST_UUID); + + attachmentDAO.saveAttachment(attachment); + + } protected void initAllData() { @@ -313,4 +336,12 @@ NoticeboardUser user = nbUserDAO.getNbUserByID(userId); assertNull(user); } + + protected void assertAttachmentData(NoticeboardAttachment attachment) + { + assertEquals("Validating the filename:", attachment.getFilename(), TEST_FILENAME); + assertEquals("Validating whether it is an online file", attachment.isOnlineFile(), TEST_IS_ONLINE_FILE); + assertEquals("Validating the tool content id", attachment.getNbContent().getNbContentId(), TEST_NB_ID); + assertEquals("Validating the Uuid", attachment.getUuid(), TEST_UUID); + } }