Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -411,7 +411,7 @@
-
+
@@ -469,7 +469,7 @@
-
+
Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -61,7 +61,7 @@
REFERENCES lams.tl_lamc11_que_content (uid)
)TYPE=InnoDB;
-CREATE TABLE lams.tl_lamc11_tool_usr (
+CREATE TABLE lams.tl_lamc11_que_usr (
uid BIGINT(20) NOT NULL AUTO_INCREMENT
, que_usr_id BIGINT(20) NOT NULL
, mc_session_id BIGINT(20) NOT NULL
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -44,7 +44,7 @@
super(name);
}
-
+ /*
public void testCreateNewMcContent()
{
//create new mc content
@@ -74,8 +74,9 @@
mcContentDAO.saveMcContent(mc);
assertNotNull(mc);
}
+ */
- /*
+
public void testCreateNewMcContentOther()
{
//create new mc content
@@ -106,7 +107,7 @@
assertNotNull(mc);
}
-
+ /*
public void testRetrieveMcContent()
{
McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -38,14 +38,11 @@
public void testCreateMcOptionsContent()
{
McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1);
- System.out.println(this.getClass().getName() + "using mcQueContent: " + mcQueContent);
-
-
McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "which", mcQueContent);
- System.out.println(this.getClass().getName() + "will add mcOptsContent: " + mcOptionsContent);
- //mcOptionsContent.setMcQueContent(mcQueContent);
- //mcQueContent.getMcOptionsContents().add(mcOptionsContent);
mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent);
+
+ McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent);
+ mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2);
}
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java (.../TestMcQueContent.java) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java (.../TestMcQueContent.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -10,7 +10,6 @@
package org.lamsfoundation.lams.tool.mc;
import java.util.HashSet;
-import java.util.Set;
/*
@@ -42,37 +41,36 @@
public void testCreateMcQueContent()
{
McContent mcContent = mcContentDAO.findMcContentById(new Long(2));
- System.out.println(this.getClass().getName() + "retrieved mcContent: " + mcContent);
-
McQueContent mcQueContent= new McQueContent(TEST_QUE_ID1,
- "How many elephants do you see in the picture?",
- new Integer(20),
+ "What planet are you from?",
+ new Integer(99),
mcContent,
new HashSet(),
new HashSet()
);
-
- System.out.println(this.getClass().getName() + "retrieving mcQueContent: " + mcQueContent);
mcQueContentDAO.saveMcQueContent(mcQueContent);
-/*
- mcQueContent.setMcContent(mcContent);
- mcContent.getMcQueContents().add(mcQueContent);
- mcQueContentDAO.saveMcQueContent(mcQueContent);
- */
-
-
+
+ McContent mcContent2 = mcContentDAO.findMcContentById(new Long(3));
+
+ McQueContent mcQueContent2= new McQueContent(TEST_QUE_ID1,
+ "What is a good question?",
+ new Integer(55),
+ mcContent2,
+ new HashSet(),
+ new HashSet()
+ );
+ mcQueContentDAO.saveMcQueContent(mcQueContent2);
+
}
-
- /*
public void testRetrieveMcQueContent()
{
McQueContent mcQueContent= mcQueContentDAO.findMcQueContentById(new Long(20));
mcQueContent.setDisplayOrder(new Integer(88));
mcQueContentDAO.saveMcQueContent(mcQueContent);
}
- */
+
}
\ No newline at end of file
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java (.../TestMcQueUsr.java) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java (.../TestMcQueUsr.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -55,10 +55,15 @@
"John Baker",
mcSession,
new HashSet());
-
mcUserDAO.saveMcUser(mcQueUsr);
+ McQueUsr mcQueUsr2= new McQueUsr(new Long(77),
+ "ozgur",
+ "Ozgur Demirtas",
+ mcSession,
+ new HashSet());
+
+ mcUserDAO.saveMcUser(mcQueUsr2);
}
-
}
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java
===================================================================
diff -u -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c -ra5aa6499fcb35b0979189ec62458c1096883724e
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java (.../TestMcSession.java) (revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java (.../TestMcSession.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
@@ -50,17 +50,37 @@
{
McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
-
McSession mcSession = new McSession(TEST_SESSION_ID_OTHER,
new Date(System.currentTimeMillis()),
new Date(System.currentTimeMillis()+ ONE_DAY),
this.NOT_ATTEMPTED,
mcContent,
new HashSet());
-
mcSessionDAO.saveMcSession(mcSession);
- assertEquals(mcSession.getMcSessionId(),new Long(21));
+ //assertEquals(mcSession.getMcSessionId(),new Long(21));
+
+
+ McSession mcSession2 = new McSession(TEST_SESSION_ID,
+ new Date(System.currentTimeMillis()),
+ new Date(System.currentTimeMillis()+ ONE_DAY),
+ this.INCOMPLETE ,
+ mcContent,
+ new HashSet());
+
+ mcSessionDAO.saveMcSession(mcSession);
+ //assertEquals(mcSession.getMcSessionId(),new Long(20));
+
+ McSession mcSession3 = new McSession(new Long(55),
+ new Date(System.currentTimeMillis()),
+ new Date(System.currentTimeMillis()+ ONE_DAY),
+ this.NOT_ATTEMPTED,
+ mcContent,
+ new HashSet());
+
+ mcSessionDAO.saveMcSession(mcSession3);
+
+
}
}
\ No newline at end of file