Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java =================================================================== diff -u -rea33dbf01ef0e0cd3474279bb471fc0b09d2295e -rf37b055d5a357bb4ac3ad938f04bf8f56ebcc772 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision ea33dbf01ef0e0cd3474279bb471fc0b09d2295e) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision f37b055d5a357bb4ac3ad938f04bf8f56ebcc772) @@ -1,5 +1,8 @@ package org.lamsfoundation.lams.tool.mc; +import java.util.Date; +import java.util.HashSet; + import org.lamsfoundation.lams.test.AbstractLamsTestCase; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McContentDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO; @@ -78,9 +81,87 @@ super.tearDown(); } - public void testDummy() + public void testInitTestData() { - System.out.println("dummy McDataAccessTestCase"); + //create new mc content + McContent mc = new McContent(); + mc.setMcContentId(TEST_CONTENT_ID); + mc.setTitle("New - Put Title Here"); + mc.setInstructions("New - Put instructions here."); + mc.setQuestionsSequenced(false); + mc.setUsernameVisible(false); + mc.setCreatedBy(0); + mc.setMonitoringReportTitle("New-Monitoring Report title"); + mc.setReportTitle("New-Report title"); + mc.setRunOffline(false); + mc.setDefineLater(false); + mc.setSynchInMonitor(false); + mc.setOnlineInstructions("New- online instructions"); + mc.setOfflineInstructions("New- offline instructions"); + mc.setEndLearningMessage("New- endLearningMessage"); + mc.setContentInUse(false); + mc.setRetries(false); + mc.setShowFeedback(false); + mc.setShowTopUsers(false); + mc.setMcQueContents(new HashSet()); + mc.setMcSessions(new HashSet()); + mcContentDAO.saveMcContent(mc); + + McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID); + McQueContent mcQueContent= new McQueContent(TEST_QUE_ID1, + "What planet are you from?", + new Integer(444), + mcContent, + new HashSet(), + new HashSet() + ); + mcQueContentDAO.saveOrUpdateMcQueContent(mcQueContent); + + + McQueContent mcExistingQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1); + McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcExistingQueContent, new HashSet()); + mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent); + + McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcExistingQueContent, new HashSet()); + mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2); + + McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcExistingQueContent, new HashSet()); + mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3); + + + McContent mcExistingContent = 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, + mcExistingContent, + new HashSet()); + mcSessionDAO.saveMcSession(mcSession); + + + McSession mcExistingSession = mcSessionDAO.findMcSessionById(TEST_SESSION_ID_OTHER); + McQueUsr mcQueUsr= new McQueUsr(TEST_NEW_USER_ID, + "ozgur", + "Ozgur Demirtas", + mcExistingSession, + new HashSet()); + mcUserDAO.saveMcUser(mcQueUsr); + + + McQueContent mcExistingQueContent2 = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1); + McOptsContent mcExistingOptionsContent2=mcOptionsContentDAO.findMcOptionsContentById(new Long(888)); + McQueUsr mcExistingQueUsr2=mcUserDAO.findMcUserById(TEST_NEW_USER_ID); + + McUsrAttempt mcUsrAttempt= new McUsrAttempt(new Long(33), + new Date(System.currentTimeMillis()), + "Sydney", + mcExistingQueContent2, + mcExistingQueUsr2, + mcExistingOptionsContent2 + ); + + mcUsrAttemptDAO.saveMcUsrAttempt(mcUsrAttempt); + } } Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java =================================================================== diff -u -rce15a50800493473e4482242244c3209ead2f853 -rf37b055d5a357bb4ac3ad938f04bf8f56ebcc772 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision ce15a50800493473e4482242244c3209ead2f853) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision f37b055d5a357bb4ac3ad938f04bf8f56ebcc772) @@ -45,7 +45,8 @@ super(name); } - + + /* public void testCreateNewMcContent() { //create new mc content @@ -128,6 +129,6 @@ { mcContentDAO.removeMcById(TEST_CONTENT_ID_OTHER); } - + */ } \ No newline at end of file Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java =================================================================== diff -u -rce15a50800493473e4482242244c3209ead2f853 -rf37b055d5a357bb4ac3ad938f04bf8f56ebcc772 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java (.../TestMcQueUsr.java) (revision ce15a50800493473e4482242244c3209ead2f853) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java (.../TestMcQueUsr.java) (revision f37b055d5a357bb4ac3ad938f04bf8f56ebcc772) @@ -49,7 +49,6 @@ public void testCreateNewUser() { McSession mcSession = mcSessionDAO.findMcSessionById(TEST_SESSION_ID_OTHER); - McQueUsr mcQueUsr= new McQueUsr(TEST_NEW_USER_ID, "john", "John Baker", Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/dbConnection.properties =================================================================== diff -u -rea33dbf01ef0e0cd3474279bb471fc0b09d2295e -rf37b055d5a357bb4ac3ad938f04bf8f56ebcc772 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/dbConnection.properties (.../dbConnection.properties) (revision ea33dbf01ef0e0cd3474279bb471fc0b09d2295e) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/dbConnection.properties (.../dbConnection.properties) (revision f37b055d5a357bb4ac3ad938f04bf8f56ebcc772) @@ -6,8 +6,8 @@ jdbc.driverClassName=org.gjt.mm.mysql.Driver jdbc.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -jdbc.username=root -jdbc.password=root +jdbc.username=lams +jdbc.password=lamsdemo #Hibernate configuration hibernate.show_sql=true