Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/Attic/ForumDAOTest.java,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java	17 Jan 2006 00:17:20 -0000	1.4
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/ForumDAOTest.java	17 Jan 2006 03:00:00 -0000	1.5
@@ -45,7 +45,6 @@
 		Forum forum = TestUtils.getForumA();
 		forumDao.saveOrUpdate(forum);
 			
-		//remove test data
 		forumDao.delete(forum);
 		
 		assertNull(forumDao.getById(forum.getUid()));
@@ -57,6 +56,10 @@
 		forumDao.saveOrUpdate(forum);
 		Forum tforum = forumDao.getByContentId(forum.getContentId());
 		assertEquals(tforum, forum);
+		
+		//remove test data
+		forumDao.delete(forum);
+		
 	}
 
 }
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/Attic/MessageDAOTest.java,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java	17 Jan 2006 00:17:20 -0000	1.3
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/dao/MessageDAOTest.java	17 Jan 2006 03:00:00 -0000	1.4
@@ -151,6 +151,7 @@
 		//remove test data
 		messageDao.delete(msgB.getUid());
 		messageDao.delete(msgA.getUid());
+		forumToolSessionDao.delete(sessionA);
 	}
 	public void testGetChildrenTopics(){
 		Message msgA = TestUtils.getMessageA();
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/ForumServiceTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/Attic/ForumServiceTest.java,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/ForumServiceTest.java	17 Jan 2006 00:17:20 -0000	1.4
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/test/service/ForumServiceTest.java	17 Jan 2006 02:59:59 -0000	1.5
@@ -51,7 +51,7 @@
 	}
 	public void testUpdateForum(){
 		ForumUser user = TestUtils.getUserA();
-		forumService.createUser(user);
+		forumUserDao.save(user);
 		
 		Forum forum = TestUtils.getForumA();
 		forum.setCreatedBy(user);
@@ -202,5 +202,9 @@
 		forumService.createUser(userA);
 		ForumUser user = forumService.getUser(userA.getUid());
 		assertEquals(userA,user);
+		
+		
+//		remove test data
+		forumUserDao.delete(userA);
 	}
 }