Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r423b223b1f02178855d88ece0f389defe3da05be --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java (.../NbDataAccessTestCase.java) (revision 423b223b1f02178855d88ece0f389defe3da05be) @@ -70,6 +70,8 @@ protected final String TEST_ONLINE_INSTRUCTIONS = "Put your online instructions here"; protected final String TEST_OFFLINE_INSTRUCTIONS = "Put your offline instructions here"; protected final boolean TEST_DEFINE_LATER = false; + protected final boolean TEST_REFLECT_ON_ACTIVITY = false; + protected final String TEST_REFLECT_INSTRUCTIONS = "Put your reflections instructions here"; protected final boolean TEST_FORCE_OFFLINE = false; protected final boolean TEST_CONTENT_IN_USE = false; protected final Date TEST_DATE_CREATED = new Date(System.currentTimeMillis()); @@ -160,8 +162,10 @@ TEST_ONLINE_INSTRUCTIONS, TEST_OFFLINE_INSTRUCTIONS, TEST_DEFINE_LATER, - TEST_CONTENT_IN_USE, TEST_FORCE_OFFLINE, + TEST_REFLECT_ON_ACTIVITY, + TEST_REFLECT_INSTRUCTIONS, + TEST_CONTENT_IN_USE, TEST_CREATOR_USER_ID, TEST_DATE_CREATED, TEST_DATE_UPDATED); @@ -249,6 +253,8 @@ DEFAULT_FORCE_OFFLINE, DEFAULT_CONTENT_IN_USE, null, + DEFAULT_CONTENT_IN_USE, + TEST_CREATOR_USER_ID, TEST_DATE_CREATED, null); @@ -333,7 +339,7 @@ protected void assertUserObjectIsNull(Long userId) { - NoticeboardUser user = nbUserDAO.getNbUserByID(userId); + NoticeboardUser user = nbUserDAO.getNbUser(userId, TEST_SESSION_ID); assertNull(user); } Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardSessionDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r423b223b1f02178855d88ece0f389defe3da05be --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardSessionDAO.java (.../TestNoticeboardSessionDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardSessionDAO.java (.../TestNoticeboardSessionDAO.java) (revision 423b223b1f02178855d88ece0f389defe3da05be) @@ -203,7 +203,7 @@ nbSessionDAO.addNbUsers(TEST_SESSION_ID, newUser); - NoticeboardUser retrievedUser = nbUserDAO.getNbUserByID(newUserId); + NoticeboardUser retrievedUser = nbUserDAO.getNbUser(newUserId, TEST_SESSION_ID); assertEquals(retrievedUser.getNbSession().getNbSessionId(), TEST_SESSION_ID); } Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r423b223b1f02178855d88ece0f389defe3da05be --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardUserDAO.java (.../TestNoticeboardUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardUserDAO.java (.../TestNoticeboardUserDAO.java) (revision 423b223b1f02178855d88ece0f389defe3da05be) @@ -68,7 +68,7 @@ public void testGetNbUserByID() { - nbUser = nbUserDAO.getNbUserByID(TEST_USER_ID); + nbUser = nbUserDAO.getNbUser(TEST_USER_ID, TEST_SESSION_ID); assertEqualsForNbUser(nbUser); @@ -91,24 +91,24 @@ nbUserDAO.saveNbUser(newUserObj); //Retrieve the newly added session object and test its values - nbUser = nbUserDAO.getNbUserByID(newUserId); + nbUser = nbUserDAO.getNbUser(newUserId, TEST_SESSION_ID); assertEquals(nbUser.getUserId(), newUserId); assertEquals(nbUser.getNbSession().getNbSessionId(),TEST_SESSION_ID); } public void testUpdateNbUser() { - nbUser = nbUserDAO.getNbUserByID(TEST_USER_ID); + nbUser = nbUserDAO.getNbUser(TEST_USER_ID, TEST_SESSION_ID); nbUser.setUserStatus(NoticeboardUser.COMPLETED); nbUserDAO.updateNbUser(nbUser); - NoticeboardUser modifiedUser = nbUserDAO.getNbUserByID(TEST_USER_ID); + NoticeboardUser modifiedUser = nbUserDAO.getNbUser(TEST_USER_ID, TEST_SESSION_ID); assertEquals(modifiedUser.getUserStatus(), NoticeboardUser.COMPLETED); } public void testRemoveNbUserById() { - nbUser = nbUserDAO.getNbUserByID(TEST_USER_ID); + nbUser = nbUserDAO.getNbUser(TEST_USER_ID, TEST_SESSION_ID); nbSession = nbUser.getNbSession(); nbSession.getNbUsers().remove(nbUser); @@ -120,7 +120,7 @@ public void testRemoveNbUser() { - nbUser = nbUserDAO.getNbUserByID(TEST_USER_ID); + nbUser = nbUserDAO.getNbUser(TEST_USER_ID, TEST_SESSION_ID); nbSession = nbUser.getNbSession(); nbSession.getNbUsers().remove(nbUser); @@ -132,7 +132,7 @@ public void testGetNumberOfUsers() { - nbUser = nbUserDAO.getNbUserByID(TEST_USER_ID); + nbUser = nbUserDAO.getNbUser(TEST_USER_ID, TEST_SESSION_ID); nbSession = nbUser.getNbSession(); int numberOfUsers = nbUserDAO.getNumberOfUsers(nbSession); System.out.println(numberOfUsers); Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestNoticeboardServicePOJO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r423b223b1f02178855d88ece0f389defe3da05be --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestNoticeboardServicePOJO.java (.../TestNoticeboardServicePOJO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestNoticeboardServicePOJO.java (.../TestNoticeboardServicePOJO.java) (revision 423b223b1f02178855d88ece0f389defe3da05be) @@ -251,7 +251,8 @@ nbService.removeNoticeboardUsersFromSession(nbSession); - nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID); + nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID, TEST_SESSION_ID); + assertNull(nbUser); } @@ -262,7 +263,7 @@ */ public void testRetrieveNoticeboardUser() { - nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID); + nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID, TEST_SESSION_ID); assertEqualsForNbUser(nbUser); } @@ -278,35 +279,35 @@ nbService.saveNoticeboardUser(user); - NoticeboardUser userInDb = nbService.retrieveNoticeboardUser(newUserId); + NoticeboardUser userInDb = nbService.retrieveNoticeboardUser(newUserId, TEST_SESSION_ID); assertEquals(userInDb.getUserId(), newUserId); assertEquals(userInDb.getNbSession().getNbSessionId(), TEST_SESSION_ID); } public void testUpdateNoticeboardUser() { - nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID); + nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID, TEST_SESSION_ID); nbUser.setUserStatus(NoticeboardUser.COMPLETED); nbService.updateNoticeboardUser(nbUser); - NoticeboardUser updatedUser = nbService.retrieveNoticeboardUser(TEST_USER_ID); + NoticeboardUser updatedUser = nbService.retrieveNoticeboardUser(TEST_USER_ID, TEST_SESSION_ID); assertEquals(updatedUser.getUserStatus(), NoticeboardUser.COMPLETED); } public void testRemoveUserById() { - nbService.removeUser(TEST_USER_ID); + nbService.removeUser(TEST_USER_ID, TEST_SESSION_ID); assertUserObjectIsNull(TEST_USER_ID); } public void testRemoveUser() { - nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID); + nbUser = nbService.retrieveNoticeboardUser(TEST_USER_ID, TEST_SESSION_ID); nbService.removeUser(nbUser); @@ -331,7 +332,7 @@ NoticeboardUser newUser = new NoticeboardUser(userId); nbService.addUser(TEST_SESSION_ID, newUser); - NoticeboardUser user = nbService.retrieveNoticeboardUser(userId); + NoticeboardUser user = nbService.retrieveNoticeboardUser(userId, TEST_SESSION_ID); assertEquals(user.getNbSession().getNbSessionId(), TEST_SESSION_ID); } Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r423b223b1f02178855d88ece0f389defe3da05be --- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java (.../TestToolContentManager.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java (.../TestToolContentManager.java) (revision 423b223b1f02178855d88ece0f389defe3da05be) @@ -192,7 +192,7 @@ public void testSetAsDefineLater() throws ToolException, DataMissingException { - nbContentManager.setAsDefineLater(TEST_NB_ID); + nbContentManager.setAsDefineLater(TEST_NB_ID, true); nbContent = nbService.retrieveNoticeboard(TEST_NB_ID); @@ -206,7 +206,7 @@ { try { - nbContentManager.setAsDefineLater(null); + nbContentManager.setAsDefineLater(null, true); fail("A ToolException should have been raised as the toolContentId is null"); } catch(ToolException e) @@ -223,7 +223,7 @@ try { Long idWithNoContent = new Long(8767); - nbContentManager.setAsDefineLater(idWithNoContent); + nbContentManager.setAsDefineLater(idWithNoContent, true); fail("A ToolException should have been raised as the tool content is missing for the supplied toolContentId: "+idWithNoContent); } catch(DataMissingException e) @@ -238,7 +238,7 @@ public void testsetAsRunOffline() throws DataMissingException, ToolException { - nbContentManager.setAsRunOffline(TEST_NB_ID); + nbContentManager.setAsRunOffline(TEST_NB_ID, true); nbContent = nbService.retrieveNoticeboard(TEST_NB_ID); assertTrue(nbContent.isForceOffline()); } @@ -250,7 +250,7 @@ { try { - nbContentManager.setAsRunOffline(null); + nbContentManager.setAsRunOffline(null, true); fail("A ToolException should have been raised as the toolContentId is null"); } catch(ToolException e) @@ -267,7 +267,7 @@ try { Long idWithNoContent = new Long(8767); - nbContentManager.setAsRunOffline(idWithNoContent); + nbContentManager.setAsRunOffline(idWithNoContent, true); fail("A ToolException should have been raised as the tool content is missing for the supplied toolContentId: "+idWithNoContent); } catch(DataMissingException e)