Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/Attic/NbDataAccessTestCase.java,v diff -u -r1.9 -r1.10 --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java 23 Dec 2005 01:58:23 -0000 1.9 +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java 4 Jan 2006 00:31:21 -0000 1.10 @@ -142,9 +142,9 @@ protected String[] getContextConfigLocation() { return new String[] { "org/lamsfoundation/lams/localApplicationContext.xml", - //"org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - //"org/lamsfoundation/lams/tool/toolApplicationContext.xml", - //"org/lamsfoundation/lams/learning/learningApplicationContext.xml", + "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", + "org/lamsfoundation/lams/tool/toolApplicationContext.xml", + "org/lamsfoundation/lams/learning/learningApplicationContext.xml", "org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml"}; } @@ -240,27 +240,22 @@ initNbUserData(); } - protected void restoreDefaultContent() + protected void restoreDefaultContent(Long defaultContentId) { - nbContent = new NoticeboardContent(DEFAULT_CONTENT_ID, + nbContent = new NoticeboardContent(defaultContentId, DEFAULT_TITLE, DEFAULT_CONTENT, DEFAULT_ONLINE_INSTRUCTIONS, DEFAULT_OFFLINE_INSTRUCTIONS, DEFAULT_DEFINE_LATER, DEFAULT_FORCE_OFFLINE, DEFAULT_CONTENT_IN_USE, - DEFAULT_CREATOR_USER_ID, + null, TEST_DATE_CREATED, - TEST_DATE_UPDATED); + null); noticeboardDAO.saveNbContent(nbContent); - - nbSession = new NoticeboardSession(DEFAULT_SESSION_ID, - nbContent, - TEST_DATE_CREATED, - DEFAULT_SESSION_STATUS); - nbSessionDAO.saveNbSession(nbSession); + } //===========================