Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java =================================================================== diff -u -r5ba75a338c76b23778bf80ab835209d38e2316cb -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java (.../QaQueUsr.java) (revision 5ba75a338c76b23778bf80ab835209d38e2316cb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java (.../QaQueUsr.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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 =================================================================== diff -u -r3b5a7ca8b9fe39d0ce74e4403356c817aa4a7f86 -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 3b5a7ca8b9fe39d0ce74e4403356c817aa4a7f86) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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 =================================================================== diff -u -r3b5a7ca8b9fe39d0ce74e4403356c817aa4a7f86 -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 3b5a7ca8b9fe39d0ce74e4403356c817aa4a7f86) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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 =================================================================== diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java (.../TestQaContent.java) (revision 664a5459e87fdfde268c9c54e458618c0965f816) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java (.../TestQaContent.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java (.../TestQaQueUsr.java) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java (.../TestQaQueUsr.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java (.../TestQaSession.java) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java (.../TestQaSession.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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 =================================================================== diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java (.../TestQaUsrResp.java) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02) +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java (.../TestQaUsrResp.java) (revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6) @@ -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); }