Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 6 Oct 2005 16:00:35 -0000 1.1
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 7 Oct 2005 10:21:22 -0000 1.2
@@ -62,6 +62,23 @@
>
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 6 Oct 2005 16:00:35 -0000 1.4
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 7 Oct 2005 10:21:22 -0000 1.5
@@ -76,5 +76,24 @@
class="org.lamsfoundation.lams.tool.mc.McOptsContent"
/>
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/model/lams_tool_mc.clay,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/db/model/lams_tool_mc.clay 6 Oct 2005 17:30:03 -0000 1.9
+++ lams_tool_lamc/db/model/lams_tool_mc.clay 7 Oct 2005 10:21:22 -0000 1.10
@@ -660,6 +660,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/create_lams_tool_lamc.sql,v
diff -u -r1.7 -r1.8
Binary files differ
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 7 Oct 2005 10:21:22 -0000 1.2
@@ -62,6 +62,23 @@
>
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.java,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java 6 Oct 2005 16:01:07 -0000 1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java 7 Oct 2005 10:21:22 -0000 1.2
@@ -28,14 +28,6 @@
private Set mcUsrAttempts;
- /** full constructor */
- public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent) {
- this.mcQueOptionId=mcQueOptionId;
- this.correctOption = correctOption;
- this.mcQueOptionText = mcQueOptionText;
- this.mcQueContent = mcQueContent;
- }
-
public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, Set mcUsrAttempts) {
this.mcQueOptionId=mcQueOptionId;
this.correctOption = correctOption;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 7 Oct 2005 10:21:22 -0000 1.5
@@ -76,5 +76,24 @@
class="org.lamsfoundation.lams.tool.mc.McOptsContent"
/>
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McUsrAttempt.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java 6 Oct 2005 16:01:07 -0000 1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java 7 Oct 2005 10:21:22 -0000 1.3
@@ -30,7 +30,8 @@
private org.lamsfoundation.lams.tool.mc.McOptsContent mcOptionsContent;
/** full constructor */
- public McUsrAttempt(Long attemptId, Date attemptTime, String timeZone, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, org.lamsfoundation.lams.tool.mc.McQueUsr mcQueUsr, org.lamsfoundation.lams.tool.mc.McOptsContent mcOptionsContent) {
+ public McUsrAttempt(Long attemptId, Date attemptTime, String timeZone, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent,
+ org.lamsfoundation.lams.tool.mc.McQueUsr mcQueUsr, org.lamsfoundation.lams.tool.mc.McOptsContent mcOptionsContent) {
this.attemptId = attemptId;
this.attemptTime = attemptTime;
this.timeZone = timeZone;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java 4 Oct 2005 09:47:37 -0000 1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java 7 Oct 2005 10:21:22 -0000 1.3
@@ -49,7 +49,7 @@
* @param userId The id of a McQueUsr
* @return the persistent instance of a McQueUsr or null if not found.
*/
- public McQueUsr getMcUserByID(Long userId);
+ public McQueUsr findMcUserById(Long userId);
/**
* Persist the given persistent instance of McQueUsr.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java 4 Oct 2005 09:47:37 -0000 1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java 7 Oct 2005 10:21:22 -0000 1.3
@@ -48,8 +48,10 @@
.get(McQueUsr.class, uid);
}
+
+
/** @see org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO#getMcUserByID(java.lang.Long) */
- public McQueUsr getMcUserByID(Long userId)
+ public McQueUsr findMcUserById(Long userId)
{
String query = "from McQueUsr user where user.queUsrId=?";
List users = getHibernateTemplate().find(query,userId);
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.1
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 7 Oct 2005 10:21:22 -0000 1.2
@@ -62,6 +62,23 @@
>
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.3
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 7 Oct 2005 10:21:22 -0000 1.4
@@ -76,5 +76,24 @@
class="org.lamsfoundation.lams.tool.mc.McOptsContent"
/>
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/TestMcOptionsContent.java,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java 6 Oct 2005 17:30:03 -0000 1.3
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java 7 Oct 2005 10:21:22 -0000 1.4
@@ -9,6 +9,8 @@
package org.lamsfoundation.lams.tool.mc;
+import java.util.HashSet;
+
/*
*
* @author ozgurd
@@ -34,17 +36,18 @@
super(name);
}
+
public void testCreateMcOptionsContent()
{
McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1);
- McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent);
+ McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent, new HashSet());
mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent);
- McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent);
+ McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent, new HashSet());
mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2);
- McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent);
+ McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent, new HashSet());
mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3);
}
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/TestMcUsrAttempt.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java 7 Oct 2005 10:21:22 -0000 1.1
@@ -0,0 +1,75 @@
+/* ********************************************************************************
+ * Copyright Notice
+ * =================
+ * This file contains propriety information of LAMS Foundation.
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2004
+ * Created on 2004-12-23
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.tool.mc;
+
+import java.util.Date;
+
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
+
+
+
+/*
+ *
+ * @author ozgurd
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+
+
+public class TestMcUsrAttempt extends McDataAccessTestCase
+{
+ public org.lamsfoundation.lams.tool.dao.IToolDAO toolDAO;
+ public ILamsToolService lamsToolService;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+ public TestMcUsrAttempt(String name)
+ {
+ super(name);
+ }
+
+
+ public void testCreateNewMcUsrAttempt()
+ {
+ McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1);
+
+ McOptsContent mcOptionsContent=mcOptionsContentDAO.findMcOptionsContentById(new Long(888));
+
+ McQueUsr mcQueUsr=mcUserDAO.findMcUserById(TEST_NEW_USER_ID);
+
+ McUsrAttempt mcUsrAttempt= new McUsrAttempt(new Long(33),
+ new Date(System.currentTimeMillis()),
+ "Sydney",
+ mcQueContent,
+ mcQueUsr,
+ mcOptionsContent
+ );
+
+ McUsrAttempt mcUsrAttempt2= new McUsrAttempt(new Long(34),
+ new Date(System.currentTimeMillis()),
+ "ACT",
+ mcQueContent,
+ mcQueUsr,
+ mcOptionsContent
+ );
+
+ mcUsrAttemptDAO.saveMcUsrAttempt(mcUsrAttempt2);
+ }
+
+}
\ No newline at end of file