Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestComplexActivityStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/TestComplexActivityStrategy.java,v
diff -u -r1.6 -r1.7
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestComplexActivityStrategy.java	17 Sep 2006 06:14:19 -0000	1.6
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestComplexActivityStrategy.java	29 May 2007 11:12:00 -0000	1.7
@@ -80,8 +80,8 @@
         testSubParallelActivityQA = activityDAO.getActivityByActivityId(TEST_QA_ACTIVITY_ID);
         testSubParallelActivityMB = activityDAO.getActivityByActivityId(TEST_MB_ACTIVITY_ID);
         
-        super.testLearnerProgress.setProgressState(testSubParallelActivityQA,LearnerProgress.ACTIVITY_COMPLETED);
-        super.testLearnerProgress.setProgressState(testSubParallelActivityMB,LearnerProgress.ACTIVITY_COMPLETED);
+        super.testLearnerProgress.setProgressState(testSubParallelActivityQA,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
+        super.testLearnerProgress.setProgressState(testSubParallelActivityMB,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
         
         assertTrue("should be completed",((ComplexActivity)testParallelActivity).areChildrenCompleted(super.testLearnerProgress));
     }
@@ -90,7 +90,7 @@
     {
         testSubParallelActivityQA = activityDAO.getActivityByActivityId(TEST_QA_ACTIVITY_ID);
        
-        super.testLearnerProgress.setProgressState(testSubParallelActivityQA,LearnerProgress.ACTIVITY_COMPLETED);
+        super.testLearnerProgress.setProgressState(testSubParallelActivityQA,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
 
         assertTrue("should not be completed",!((ComplexActivity)testParallelActivity).areChildrenCompleted(super.testLearnerProgress));
     }
@@ -101,16 +101,16 @@
         testSubSeuqenceActivityQNA = activityDAO.getActivityByActivityId(TEST_QNA_ACTIVITY_ID);
 
         
-        super.testLearnerProgress.setProgressState(testSubSeuquencActivitySR,LearnerProgress.ACTIVITY_COMPLETED);
-        super.testLearnerProgress.setProgressState(testSubSeuqenceActivityQNA,LearnerProgress.ACTIVITY_COMPLETED);
+        super.testLearnerProgress.setProgressState(testSubSeuquencActivitySR,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
+        super.testLearnerProgress.setProgressState(testSubSeuqenceActivityQNA,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
         assertTrue("should be completed",((ComplexActivity)testSequenceActivity).areChildrenCompleted(super.testLearnerProgress));
     }
     
     public void testChildrenInCompletedForSequenceActivity()
     {
         testSubSeuquencActivitySR = activityDAO.getActivityByActivityId(TEST_SR_ACTIVITY_ID);
         
-        super.testLearnerProgress.setProgressState(testSubSeuquencActivitySR,LearnerProgress.ACTIVITY_COMPLETED);
+        super.testLearnerProgress.setProgressState(testSubSeuquencActivitySR,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
         assertTrue("should not be completed",!((ComplexActivity)testSequenceActivity).areChildrenCompleted(super.testLearnerProgress));
     }
     
@@ -119,7 +119,7 @@
         testSubOptionsActivityNB = activityDAO.getActivityByActivityId(TEST_NB_ACTIVITY_ID);
         testSubOptionsActivityMC = activityDAO.getActivityByActivityId(TEST_MC_ACTIVITY_ID);
         
-        super.testLearnerProgress.setProgressState(testSubOptionsActivityNB,LearnerProgress.ACTIVITY_COMPLETED);
+        super.testLearnerProgress.setProgressState(testSubOptionsActivityNB,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
         assertTrue("should be completed",((ComplexActivity)testOptionsActivity).areChildrenCompleted(super.testLearnerProgress));
     }
     
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/dao/Attic/TestLearnerProgressDAO.java,v
diff -u -r1.14 -r1.15
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java	17 Sep 2006 06:14:20 -0000	1.14
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java	29 May 2007 11:12:00 -0000	1.15
@@ -149,9 +149,9 @@
 
         Activity firstActivity = this.testLesson.getLearningDesign().getFirstActivity();
         
-        progress.setProgressState(firstActivity,LearnerProgress.ACTIVITY_COMPLETED);
-        progress.setProgressState(testParallelActivity,LearnerProgress.ACTIVITY_COMPLETED);
-        progress.setProgressState(testToolActivity,LearnerProgress.ACTIVITY_ATTEMPTED);
+        progress.setProgressState(firstActivity,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
+        progress.setProgressState(testParallelActivity,LearnerProgress.ACTIVITY_COMPLETED, activityDAO);
+        progress.setProgressState(testToolActivity,LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
         progress.setRestarting(true);
         
         super.learnerProgressDao.updateLearnerProgress(progress);