Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java =================================================================== diff -u -rffa7af2bba64347997658f2eab6c8cebd9280cec -reebb8a769eaea86040e70ebfe1ee27adf3435148 --- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java (.../TestLearnerProgressDAO.java) (revision ffa7af2bba64347997658f2eab6c8cebd9280cec) +++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java (.../TestLearnerProgressDAO.java) (revision eebb8a769eaea86040e70ebfe1ee27adf3435148) @@ -11,6 +11,9 @@ import net.sf.hibernate.HibernateException; +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.LessonDataAccessTestCase; @@ -22,7 +25,13 @@ */ public class TestLearnerProgressDAO extends LessonDataAccessTestCase { - + private IActivityDAO activityDAO; + private Activity testToolActivity; + private Activity testComplexActivity; + + //this is survey id we inserted in test data sql script + private static final Long TEST_TOOL_ACTIVITY_ID = new Long(20); + private static final Long TEST_COMPLEX_ACTIVITY_ID = new Long(13); /* * @see LessonDataAccessTestCase#setUp() */ @@ -31,6 +40,10 @@ super.setUp(); super.initializeTestLesson(); super.initLearnerProgressData(); + + activityDAO =(ActivityDAO) context.getBean("activityDAO"); + testToolActivity = activityDAO.getActivityByActivityId(TEST_TOOL_ACTIVITY_ID); + testComplexActivity = activityDAO.getActivityByActivityId(TEST_COMPLEX_ACTIVITY_ID); } /* @@ -100,9 +113,19 @@ super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress); LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson); + Activity firstActivity = this.testLesson.getLearningDesign().getFirstActivity(); + progress.setProgressState(firstActivity,LearnerProgress.ACTIVITY_COMPLETED); + progress.setProgressState(testComplexActivity,LearnerProgress.ACTIVITY_COMPLETED); + progress.setProgressState(testToolActivity,LearnerProgress.ACTIVITY_ATTEMPTED); + super.learnerProgressDao.updateLearnerProgress(progress); + LearnerProgress updatedProgress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson); + assertLearnerProgressInitialization(progress); + assertEquals("verify completed activity",2,updatedProgress.getCompletedActivities().size()); + assertEquals("verify attempted activity",1,updatedProgress.getAttemptedActivities().size()); + } /**