Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java	4 Jul 2005 06:11:24 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java	8 Oct 2005 15:54:07 -0000	1.3
@@ -71,7 +71,7 @@
     private QaQueContent qaQueContent;
     
     /** persistent field */
-    private Set qaUsrResps;  //surveyUsrResps 
+    private Set qaUsrResps;  
     
     public QaQueUsr()
 	{
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.14 -r1.15
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	30 Sep 2005 01:01:10 -0000	1.14
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	8 Oct 2005 15:54:08 -0000	1.15
@@ -27,7 +27,6 @@
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	30 Sep 2005 01:01:10 -0000	1.9
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	8 Oct 2005 15:54:08 -0000	1.10
@@ -27,7 +27,6 @@
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaContent.java,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	8 Oct 2005 15:11:50 -0000	1.9
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	8 Oct 2005 15:54:07 -0000	1.10
@@ -50,6 +50,7 @@
         super(name);
     }
     
+    
     public void testSimpleCreateNewQaContent()
     {
     	//create new qa content
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaQueUsr.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java	4 Oct 2005 11:41:37 -0000	1.3
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java	8 Oct 2005 15:54:07 -0000	1.4
@@ -45,8 +45,8 @@
     
     public void testCreateNewUser()
     {
-    	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID);
-		QaSession qaSession = qaSessionDAO.getQaSessionById(TEST_EXISTING_SESSION_ID);
+    	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(new Long(1).longValue() );
+		QaSession qaSession = qaSessionDAO.getQaSessionById(new Long(102).longValue());
     	
         QaQueUsr qaQueUsr= new QaQueUsr(new Long(TEST_NEW_USER_ID),
     									"john",
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaSession.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java	4 Oct 2005 11:41:37 -0000	1.3
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java	8 Oct 2005 15:54:07 -0000	1.4
@@ -9,9 +9,8 @@
 
 package org.lamsfoundation.lams.tool.qa;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.Date;
+import java.util.TreeSet;
 
 
 /*
@@ -61,7 +60,7 @@
     /*
     public void testCreateNewSession()
     {
-    	QaContent qa = qaContentDAO.getQaById(getTestQaContentID());
+    	QaContent qa = qaContentDAO.getQaById(TEST_NEW_CONTENT_ID);
 
         qaSession = new QaSession(new Long(TEST_NEW_SESSION_ID),
                                    new Date(System.currentTimeMillis()),
@@ -74,11 +73,12 @@
         qaSessionDAO.CreateQaSession(qaSession);
         System.out.println(this.getClass().getName() + " New session created: " + qaSession);
      
-        qaSessionDAO.deleteQaSession(qaSession);
-        System.out.println(this.getClass().getName() + " New session deleted: ");
+    //    qaSessionDAO.deleteQaSession(qaSession);
+    //    System.out.println(this.getClass().getName() + " New session deleted: ");
     }
     */
     
+    /*
     public void testDevToolSession()
     {
     	QaSession qaSession=qaSessionDAO.getQaSessionById(this.DEVELOPMENT_TOOL_SESSION_ID);
@@ -109,14 +109,7 @@
 	        System.out.println(this.getClass().getName() + "\n pairs.key: " + pairs.getKey());
 	    }
     	
-    	
-    	
-    	
-    	
-    	
-    	
-    	
     }
-    
+    */
 
 }
\ No newline at end of file
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaUsrResp.java,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java	4 Oct 2005 11:41:37 -0000	1.4
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java	8 Oct 2005 15:54:07 -0000	1.5
@@ -45,13 +45,15 @@
     
     public void testCreateNewResponse()
     {
-    	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID);
+    	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(new Long(1).longValue());
     	
-		QaUsrResp qaUsrResp= new QaUsrResp("I am from Mars",false,
+    	QaQueUsr qaQueUsr=qaQueUsrDAO.getQaQueUsrById(new Long(700).longValue()); 
+    	
+		QaUsrResp qaUsrResp= new QaUsrResp("I am from Sydney.",false,
 											new Date(System.currentTimeMillis()),
 											"",
 											qaQueContent,
-											getExistingUser("randomstriker","Michael Random"));
+											qaQueUsr);
 		qaUsrRespDAO.createUserResponse(qaUsrResp);
     }