Index: lams_common/lib/jakarta-commons/commons-digester.jar
===================================================================
diff -u
Binary files differ
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -rf686b51b897a2e4c136afba6f4ca9b896b493b87 -r72352f709cfb1eb543caae62477a0824a134dd5c
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision f686b51b897a2e4c136afba6f4ca9b896b493b87)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 72352f709cfb1eb543caae62477a0824a134dd5c)
@@ -54,6 +54,7 @@
     protected IOrganisationDAO orgDao;
     protected ILessonDAO lessonDao;
     protected ILessonClassDAO lessonClassDao;    
+    
     //---------------------------------------------------------------------
     // Domain Object instances
     //---------------------------------------------------------------------
@@ -223,7 +224,7 @@
                                 testLearningDesign,
                                 testLessonClass,//lesson class
                                 testOrg,
-                                new HashSet());
+                                new HashSet());//learner progress
     }
   
 
@@ -233,30 +234,31 @@
     /**
      * Helper method to validate the created lesson class. This validation
      * method can be reused by sub-classes.
+     * @param lessonClass TODO
      */
-    protected void assertLessonClass()
+    protected void assertLessonClass(LessonClass lessonClass)
     {
-        LessonClass createdLessonClass = lessonClassDao.getLessonClass(this.testLessonClass.getGroupingId());
-        assertEquals("check up number of activities",1,createdLessonClass.getActivities().size());
-        assertEquals("check up staff groups",1,createdLessonClass.getStaffGroup().getUsers().size());
-        assertEquals("check up grouping types, should be class grouping",Grouping.CLASS_GROUPING_TYPE,createdLessonClass.getGroupingTypeId());
-        assertEquals("check up learner groups",1,createdLessonClass.getGroups().size());
+        assertEquals("check up number of activities",1,lessonClass.getActivities().size());
+        assertEquals("check up staff groups",1,lessonClass.getStaffGroup().getUsers().size());
+        assertEquals("check up grouping types, should be class grouping",Grouping.CLASS_GROUPING_TYPE,lessonClass.getGroupingTypeId());
+        assertEquals("check up learner groups",1,lessonClass.getGroups().size());
     }
     /**
      * Helper method to validate the created lesson. This validation
      * method can be reused by sub-classes.
+     * @param lesson TODO
      */
-    protected void assertLesson()
+    protected void assertLesson(Lesson lesson)
     {
-        Lesson createdLesson = lessonDao.getLesson(this.testLesson.getLessonId());
         assertEquals("check up creation time",testLesson.getCreateDateTime().toString(),
-                     						  createdLesson.getCreateDateTime().toString());
-        assertEquals("check up user who created this lesson",testUser.getLogin(),createdLesson.getUser().getLogin());
-        assertEquals("check up the lesson state",Lesson.NOT_STARTED_STATE,createdLesson.getLessonStateId());
+                     						  lesson.getCreateDateTime().toString());
+        assertEquals("check up user who created this lesson",testUser.getLogin(),lesson.getUser().getLogin());
+        assertEquals("check up the lesson state",Lesson.NOT_STARTED_STATE,lesson.getLessonStateId());
         assertEquals("check up the learning design that used to create lesson",
                      							testLearningDesign.getTitle(),
-                     							createdLesson.getLearningDesign().getTitle());
-        assertEquals("check up the organization", testOrg.getName(),createdLesson.getOrganisation().getName());
+                     							lesson.getLearningDesign().getTitle());
+        assertEquals("check up the organization", testOrg.getName(),lesson.getOrganisation().getName());
+        assertEquals("check up the learner progresses",0,lesson.getLearnerProgresses().size());
         
     }
 }
\ No newline at end of file
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestInitLesson.java
===================================================================
diff -u -rf686b51b897a2e4c136afba6f4ca9b896b493b87 -r72352f709cfb1eb543caae62477a0824a134dd5c
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestInitLesson.java	(.../TestInitLesson.java)	(revision f686b51b897a2e4c136afba6f4ca9b896b493b87)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestInitLesson.java	(.../TestInitLesson.java)	(revision 72352f709cfb1eb543caae62477a0824a134dd5c)
@@ -11,6 +11,8 @@
 
 import net.sf.hibernate.HibernateException;
 
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.LessonClass;
 import org.lamsfoundation.lams.lesson.LessonDataAccessTestCase;
 
 
@@ -51,9 +53,13 @@
     public void testInitLesson() throws HibernateException
     {
         super.initializeTestLesson();
+        
+        LessonClass createdLessonClass = lessonClassDao.getLessonClass(this.testLessonClass.getGroupingId());
+        Lesson createdLesson = lessonDao.getLesson(this.testLesson.getLessonId());
+
         //checking initialization result of lesson class
-        assertLessonClass();
+        assertLessonClass(createdLessonClass);
         //checking initialization result of lesson
-        assertLesson();
+        assertLesson(createdLesson);
     }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java
===================================================================
diff -u -rf686b51b897a2e4c136afba6f4ca9b896b493b87 -r72352f709cfb1eb543caae62477a0824a134dd5c
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java	(.../TestLessonDAO.java)	(revision f686b51b897a2e4c136afba6f4ca9b896b493b87)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java	(.../TestLessonDAO.java)	(revision 72352f709cfb1eb543caae62477a0824a134dd5c)
@@ -51,8 +51,10 @@
     {
         Lesson createdLesson = this.lessonDao.getLessonWithEagerlyFetchedProgress(this.testLesson.getLessonId());
         
-        super.assertLessonClass();
-        super.assertLesson();
+        //assert the data retrieved.
+        super.assertLesson(createdLesson);
+        
+        
     }
     
 }
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
===================================================================
diff -u -rf686b51b897a2e4c136afba6f4ca9b896b493b87 -r72352f709cfb1eb543caae62477a0824a134dd5c
--- lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision f686b51b897a2e4c136afba6f4ca9b896b493b87)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision 72352f709cfb1eb543caae62477a0824a134dd5c)
@@ -72,7 +72,7 @@
 		<property name="hibernateProperties">
 			<props>
 				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
-				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.show_sql">true</prop>
 				<prop key="hibernate.c3p0.minPoolSize">5</prop>
 				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
 				<prop key="hibernate.c3p0.timeout">1800</prop>