Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java =================================================================== diff -u -r5f015bed03f28f95ee08f3c03a1f3f03254cf426 -r89ec1520b85c8244b79c0a2f139a9bfc298e0046 --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision 89ec1520b85c8244b79c0a2f139a9bfc298e0046) @@ -45,17 +45,18 @@ //--------------------------------------------------------------------- // DAO instances for initializing data //--------------------------------------------------------------------- - private NoticeboardContentDAO noticeboardDAO; - private NoticeboardSessionDAO nbSessionDAO; - private NoticeboardUserDAO nbUserDAO; - private NoticeboardAttachmentDAO attachmentDAO; + protected NoticeboardContentDAO noticeboardDAO; + protected NoticeboardSessionDAO nbSessionDAO; + protected NoticeboardUserDAO nbUserDAO; + protected NoticeboardAttachmentDAO attachmentDAO; //--------------------------------------------------------------------- // Domain Object instances //--------------------------------------------------------------------- protected NoticeboardContent nbContent; protected NoticeboardSession nbSession; protected NoticeboardUser nbUser; + protected NoticeboardAttachment nbAttachment; //--------------------------------------------------------------------- @@ -85,7 +86,7 @@ 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_FULLNAME = "Test User Fullname"; protected final String TEST_USER_STATUS = NoticeboardUser.INCOMPLETE; protected final String TEST_FILENAME = "testFilename"; @@ -125,15 +126,16 @@ //--------------------------------------------------------------------- protected void setUp() throws Exception { - super.setUp(); + super.setUp(); 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 { - super.tearDown(); + protected void tearDown() throws Exception + { + super.tearDown(); } /** Define the context files. Overrides method in AbstractLamsTestCase */ @@ -215,6 +217,7 @@ ns.getNbUsers().add(user); } + /* TODO: have to upload attachment to repository */ protected void initNbAttachmentData() { NoticeboardAttachment attachment = new NoticeboardAttachment(); @@ -226,7 +229,8 @@ attachment.setUuid(TEST_UUID); attachmentDAO.saveAttachment(attachment); - + + nb.getNbAttachments().add(attachment); } protected void initAllData()