Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/TestUtils.java =================================================================== diff -u -r640a9d5aeeb4b9794b93c5a764a9a20d4298b3d6 -rb086b551abc55820b5bff365aef5497659cd3281 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/TestUtils.java (.../TestUtils.java) (revision 640a9d5aeeb4b9794b93c5a764a9a20d4298b3d6) +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/TestUtils.java (.../TestUtils.java) (revision b086b551abc55820b5bff365aef5497659cd3281) @@ -45,24 +45,44 @@ ForumToolSession session = new ForumToolSession(); session.setSessionId(new Long(1)); session.setStatus(1); + Forum forum = new Forum(); + forum.setUid(new Long(1)); + forum.setContentId(new Long(1)); + session.setForum(forum); return session; } public static ForumToolSession getSessionB(){ ForumToolSession session = new ForumToolSession(); session.setSessionId(new Long(2)); session.setStatus(2); + Forum forum = new Forum(); + forum.setUid(new Long(1)); + forum.setContentId(new Long(1)); + session.setForum(forum); return session; } public static Message getMessageA() { Message msg = new Message(); msg.setBody("bodyA"); + ForumToolSession session = new ForumToolSession(); + session.setUid(new Long(1)); + msg.setToolSession(session); msg.setSubject("subjectA"); + Forum forum = new Forum(); + forum.setUid(new Long(1)); + msg.setForum(forum); return msg; } public static Message getMessageB() { Message msg = new Message(); msg.setBody("bodyB"); msg.setSubject("subjectB"); + ForumToolSession session = new ForumToolSession(); + session.setUid(new Long(1)); + msg.setToolSession(session); + Forum forum = new Forum(); + forum.setUid(new Long(1)); + msg.setForum(forum); return msg; } Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java =================================================================== diff -u -rd3558795f19f456d9caed6ac5dafdb0a71cb0029 -rb086b551abc55820b5bff365aef5497659cd3281 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java (.../ForumDAOTest.java) (revision d3558795f19f456d9caed6ac5dafdb0a71cb0029) +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java (.../ForumDAOTest.java) (revision b086b551abc55820b5bff365aef5497659cd3281) @@ -24,6 +24,7 @@ import org.lamsfoundation.lams.tool.forum.persistence.ForumDao; import org.lamsfoundation.lams.tool.forum.persistence.ForumUser; import org.lamsfoundation.lams.tool.forum.test.BaseTest; +import org.lamsfoundation.lams.tool.forum.test.TestUtils; public class ForumDAOTest extends BaseTest{ @@ -32,27 +33,36 @@ } public void testSave(){ - ForumUser user = new ForumUser(); - user.setFirstName("Steve"); - user.setUserId(new Long(1)); + Forum forum = TestUtils.getForumA(); + ForumUser user = forum.getCreatedBy(); - Forum forum = new Forum(); - - forum.setContentId(new Long(1)); - forum.setCreatedBy(user); - ForumDao forumDao = new ForumDao(); forumDao.saveOrUpdate(forum); Forum tForum = forumDao.getById(forum.getUid()); assertEquals(tForum.getContentId(),new Long(1)); assertEquals(tForum.getCreatedBy(),user); + + //remove test data + forumDao.delete(forum); } public void testDelete(){ + Forum forum = TestUtils.getForumA(); + ForumDao forumDao = new ForumDao(); + forumDao.saveOrUpdate(forum); + + //remove test data + forumDao.delete(forum); + assertNull(forumDao.getById(forum.getUid())); } public void testGetByContentId(){ + Forum forum = TestUtils.getForumA(); + ForumDao forumDao = new ForumDao(); + forumDao.saveOrUpdate(forum); + Forum tforum = forumDao.getByContentId(forum.getContentId()); + assertEquals(tforum, forum); } } Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumToolSessionDAOTest.java =================================================================== diff -u -rd3558795f19f456d9caed6ac5dafdb0a71cb0029 -rb086b551abc55820b5bff365aef5497659cd3281 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumToolSessionDAOTest.java (.../ForumToolSessionDAOTest.java) (revision d3558795f19f456d9caed6ac5dafdb0a71cb0029) +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumToolSessionDAOTest.java (.../ForumToolSessionDAOTest.java) (revision b086b551abc55820b5bff365aef5497659cd3281) @@ -20,7 +20,12 @@ */ package org.lamsfoundation.lams.tool.forum.test.dao; +import java.util.List; + +import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession; +import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao; import org.lamsfoundation.lams.tool.forum.test.BaseTest; +import org.lamsfoundation.lams.tool.forum.test.TestUtils; public class ForumToolSessionDAOTest extends BaseTest{ @@ -29,19 +34,56 @@ } - public void testDelete(){ + public void testSave(){ + ForumToolSession session = TestUtils.getSessionA(); + ForumToolSessionDao dao = new ForumToolSessionDao(); + dao.saveOrUpdate(session); + ForumToolSession tSession = dao.getBySessionId(session.getSessionId()); + + assertEquals(session,tSession); + + //remove test data + dao.delete(session); + } - - public void testSave(){ + + public void testDelete(){ + ForumToolSession session = TestUtils.getSessionA(); + ForumToolSessionDao dao = new ForumToolSessionDao(); + dao.saveOrUpdate(session); + dao.delete(session); + assertNull(dao.getBySessionId(session.getSessionId())); } public void testGetByContentId(){ + ForumToolSessionDao dao = new ForumToolSessionDao(); + ForumToolSession sessionA = TestUtils.getSessionA(); + dao.saveOrUpdate(sessionA); + ForumToolSession sessionB = TestUtils.getSessionB(); + dao.saveOrUpdate(sessionB); + List list = dao.getByContentId(new Long(1)); + + assertEquals(list.size(),2); + assertEquals(list.get(0),sessionA); + assertEquals(list.get(1),sessionB); + //remove test data + dao.delete(sessionA); + dao.delete(sessionB); } public void testGetBySessionId(){ + ForumToolSession session = TestUtils.getSessionA(); + ForumToolSessionDao dao = new ForumToolSessionDao(); + dao.saveOrUpdate(session); + ForumToolSession tSession = dao.getBySessionId(session.getSessionId()); + + assertEquals(session,tSession); + + //remove test data + dao.delete(session); } } Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumUserDAOTest.java =================================================================== diff -u -rd3558795f19f456d9caed6ac5dafdb0a71cb0029 -rb086b551abc55820b5bff365aef5497659cd3281 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumUserDAOTest.java (.../ForumUserDAOTest.java) (revision d3558795f19f456d9caed6ac5dafdb0a71cb0029) +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumUserDAOTest.java (.../ForumUserDAOTest.java) (revision b086b551abc55820b5bff365aef5497659cd3281) @@ -20,19 +20,30 @@ */ package org.lamsfoundation.lams.tool.forum.test.dao; +import org.lamsfoundation.lams.tool.forum.persistence.ForumUser; +import org.lamsfoundation.lams.tool.forum.persistence.ForumUserDao; import org.lamsfoundation.lams.tool.forum.test.BaseTest; +import org.lamsfoundation.lams.tool.forum.test.TestUtils; public class ForumUserDAOTest extends BaseTest{ public ForumUserDAOTest(String name) { super(name); } public void testSave(){ - + ForumUser user = TestUtils.getUserA(); + ForumUserDao dao = new ForumUserDao(); + dao.save(user); + ForumUser tUser = dao.getByUid(user.getUid()); + assertEquals(tUser,user); } public void testGetByUserId(){ + ForumUser user = TestUtils.getUserA(); + ForumUserDao dao = new ForumUserDao(); + dao.save(user); + ForumUser tUser = dao.getByUserId(new Long(1)); + assertEquals(tUser,user); } - } Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java =================================================================== diff -u -rd3558795f19f456d9caed6ac5dafdb0a71cb0029 -rb086b551abc55820b5bff365aef5497659cd3281 --- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java (.../MessageDAOTest.java) (revision d3558795f19f456d9caed6ac5dafdb0a71cb0029) +++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java (.../MessageDAOTest.java) (revision b086b551abc55820b5bff365aef5497659cd3281) @@ -20,7 +20,12 @@ */ package org.lamsfoundation.lams.tool.forum.test.dao; +import java.util.List; + +import org.lamsfoundation.lams.tool.forum.persistence.Message; +import org.lamsfoundation.lams.tool.forum.persistence.MessageDao; import org.lamsfoundation.lams.tool.forum.test.BaseTest; +import org.lamsfoundation.lams.tool.forum.test.TestUtils; public class MessageDAOTest extends BaseTest{ @@ -29,28 +34,114 @@ } public void testSave(){ + Message msg = TestUtils.getMessageA(); + MessageDao dao = new MessageDao(); + dao.saveOrUpdate(msg); + Message tmsg = dao.getById(msg.getUid()); + assertEquals(msg,tmsg); + dao.delete(msg.getUid()); } public void testDelete(){ + Message msg = TestUtils.getMessageA(); + MessageDao dao = new MessageDao(); + dao.saveOrUpdate(msg); + dao.delete(msg.getUid()); - } - public void testGetById(){ + assertNull(dao.getById(msg.getUid())); } + public void testGetBySession(){ + MessageDao dao = new MessageDao(); + Message msgA = TestUtils.getMessageA(); + dao.saveOrUpdate(msgA); + Message msgB = TestUtils.getMessageB(); + dao.saveOrUpdate(msgB); + List list = dao.getBySession(new Long(1)); + + assertEquals(list.size(),2); + assertEquals(list.get(0),msgA); + assertEquals(list.get(1),msgB); + + //remove test data + dao.delete(msgA.getUid()); + dao.delete(msgB.getUid()); + } public void testGetBySessionAndUser(){ + MessageDao dao = new MessageDao(); + Message msgA = TestUtils.getMessageA(); + dao.saveOrUpdate(msgA); + Message msgB = TestUtils.getMessageB(); + dao.saveOrUpdate(msgB); + List list = dao.getByUserAndSession(new Long(1),new Long(1)); + + assertEquals(list.size(),1); + assertEquals(list.get(0),msgA); + + //remove test data + dao.delete(msgA.getUid()); + dao.delete(msgB.getUid()); } public void testGetFromAuthor(){ + MessageDao dao = new MessageDao(); + Message msgA = TestUtils.getMessageA(); + msgA.setIsAuthored(true); + dao.saveOrUpdate(msgA); + Message msgB = TestUtils.getMessageB(); + msgB.setIsAuthored(false); + dao.saveOrUpdate(msgB); + List list = dao.getTopicsFromAuthor(new Long(1)); + + assertEquals(list.size(),1); + assertEquals(list.get(0),msgA); + + //remove test data + dao.delete(msgA.getUid()); + dao.delete(msgB.getUid()); + } public void testGetRootTopics(){ + MessageDao dao = new MessageDao(); + Message msgA = TestUtils.getMessageA(); + msgA.setIsAuthored(true); + dao.saveOrUpdate(msgA); + Message msgB = TestUtils.getMessageB(); + msgB.setIsAuthored(false); + msgB.setParent(msgA); + dao.saveOrUpdate(msgB); + List list = dao.getRootTopics(new Long(1)); + + assertEquals(list.size(),1); + assertEquals(list.get(0),msgA); + + //remove test data + dao.delete(msgA.getUid()); + dao.delete(msgB.getUid()); } public void testGetChildrenTopics(){ + MessageDao dao = new MessageDao(); + Message msgA = TestUtils.getMessageA(); + msgA.setIsAuthored(true); + dao.saveOrUpdate(msgA); + Message msgB = TestUtils.getMessageB(); + msgB.setIsAuthored(false); + msgB.setParent(msgA); + dao.saveOrUpdate(msgB); + List list = dao.getChildrenTopics(new Long(1)); + + assertEquals(list.size(),1); + assertEquals(list.get(0),msgB); + + //remove test data + dao.delete(msgA.getUid()); + dao.delete(msgB.getUid()); }