Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java =================================================================== diff -u -rff17b0772b7b8c76838d302f4587e4ac56552919 -r33d943ef572ffddd7b9f3f134b4c6661138bd4c7 --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision ff17b0772b7b8c76838d302f4587e4ac56552919) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision 33d943ef572ffddd7b9f3f134b4c6661138bd4c7) @@ -22,13 +22,15 @@ /* * Created on May 11, 2005 + * Modified: 1 July 2005 */ package org.lamsfoundation.lams.tool.noticeboard; import org.lamsfoundation.lams.AbstractLamsTestCase; 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.NoticeboardContent; import java.util.Date; @@ -43,12 +45,14 @@ //--------------------------------------------------------------------- private NoticeboardContentDAO noticeboardDAO; private NoticeboardSessionDAO nbSessionDAO; + private NoticeboardUserDAO nbUserDAO; //--------------------------------------------------------------------- // Domain Object instances //--------------------------------------------------------------------- protected NoticeboardContent nbContent; protected NoticeboardSession nbSession; + protected NoticeboardUser nbUser; //--------------------------------------------------------------------- // DATA USED FOR TESTING PURPOSES ONLY @@ -69,11 +73,16 @@ protected final Date TEST_DATE_UPDATED = new Date(); protected final Long TEST_CREATOR_USER_ID = new Long(1300); - protected final Long TEST_SESSION_ID = new Long("1400"); + protected final Long TEST_SESSION_ID = new Long(1400); protected final Date TEST_SESSION_START_DATE = new Date(System.currentTimeMillis()); protected final Date TEST_SESSION_END_DATE = new Date(System.currentTimeMillis() + ONE_DAY); protected final String TEST_SESSION_STATUS = NoticeboardSession.NOT_ATTEMPTED; + protected final Long TEST_USER_ID = new Long(1600); + protected final String TEST_USERNAME = "testUsername"; + protected final String TEST_FULLNAME = "Hamish Andy"; + protected final String TEST_USER_STATUS = NoticeboardUser.INCOMPLETE; + //--------------------------------------------------------------------- // DEFAULT DATA INSERTED BY BUILD-DB ANT TASK //--------------------------------------------------------------------- @@ -87,6 +96,10 @@ protected final Long DEFAULT_CREATOR_USER_ID = new Long(2300); protected final Long DEFAULT_SESSION_ID = new Long(2400); protected final String DEFAULT_SESSION_STATUS = NoticeboardSession.NOT_ATTEMPTED; + protected final Long DEFAULT_USER_ID = new Long(2600); + protected final String DEFAULT_USERNAME = "test"; + protected final String DEFAULT_FULLNAME = "test"; + protected final String DEFAULT_USER_STATUS = NoticeboardUser.INCOMPLETE; @@ -104,6 +117,7 @@ super.setUp(); noticeboardDAO = (NoticeboardContentDAO) this.context.getBean("nbContentDAO"); nbSessionDAO = (NoticeboardSessionDAO) this.context.getBean("nbSessionDAO"); + nbUserDAO = (NoticeboardUserDAO) this.context.getBean("nbUserDAO"); } protected void tearDown() throws Exception { @@ -142,6 +156,7 @@ protected void cleanNbContentData(Long contentId) { noticeboardDAO.removeNoticeboard(contentId); + //it correspondingly removes all the sessions and users along with it. } @@ -168,11 +183,26 @@ } + protected void initNbUserData() + { + NoticeboardSession ns = nbSessionDAO.findNbSessionById(TEST_SESSION_ID); + + NoticeboardUser user = new NoticeboardUser(TEST_USER_ID, + ns, + TEST_USERNAME, + TEST_FULLNAME, + TEST_USER_STATUS); + + nbUserDAO.saveNbUser(user); + + ns.getNbUsers().add(user); + } protected void initAllData() { initNbContentData(); - initNbSessionContent(); + initNbSessionContent(); + initNbUserData(); } //=========================== @@ -206,7 +236,7 @@ protected void assertContentEqualsDefaultData(NoticeboardContent content) { - assertEquals(content.getNbContentId(), DEFAULT_CONTENT_ID); + assertEquals(content.getTitle(), DEFAULT_TITLE); assertEquals(content.getContent(), DEFAULT_CONTENT); assertEquals(content.getOnlineInstructions(), DEFAULT_ONLINE_INSTRUCTIONS); @@ -230,12 +260,30 @@ NoticeboardSession nsObject = nbSessionDAO.findNbSessionById(sessionId); assertNull(nsObject); } - /* - * - * @author mtruong - * - * TODO write a test case to test the getter and setter methods - * for the POJO - */ + protected void assertEqualsForNbUser(NoticeboardUser user) + { + assertEquals("Validate user id",user.getUserId(), TEST_USER_ID); + assertEquals("Validate username",user.getUsername(), TEST_USERNAME); + assertEquals("Validate fullname", user.getFullname(), TEST_FULLNAME); + assertEquals("Validate user status", user.getUserStatus(), TEST_USER_STATUS); + assertEquals("Validate session id",user.getNbSession().getNbSessionId(), TEST_SESSION_ID); + + } + + protected void assertEqualsForDefaultNbUser(NoticeboardUser user) + { + assertEquals("Validate user id",user.getUserId(), DEFAULT_USER_ID); + assertEquals("Validate username",user.getUsername(), DEFAULT_USERNAME); + assertEquals("Validate fullname", user.getFullname(), DEFAULT_FULLNAME); + assertEquals("Validate user status", user.getUserStatus(), DEFAULT_USER_STATUS); + assertEquals("Validate session id",user.getNbSession().getNbSessionId(), DEFAULT_SESSION_ID); + + } + + protected void assertUserObjectIsNull(Long userId) + { + NoticeboardUser user = nbUserDAO.getNbUserByID(userId); + assertNull(user); + } }