Index: lams_monitoring/build.xml =================================================================== diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r214a1446ca64680e16978f703dab68540a1c8a68 --- lams_monitoring/build.xml (.../build.xml) (revision 62a9d980560721c476979fc695ce1e9a5508dc75) +++ lams_monitoring/build.xml (.../build.xml) (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -156,7 +156,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml =================================================================== diff -u --- lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml (revision 0) +++ lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml =================================================================== diff -u --- lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml (revision 0) +++ lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml =================================================================== diff -u --- lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml (revision 0) +++ lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml =================================================================== diff -u --- lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml (revision 0) +++ lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml =================================================================== diff -u --- lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml (revision 0) +++ lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml =================================================================== diff -u --- lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml (revision 0) +++ lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_monitoring/lib/lams/lams-authoring.jar =================================================================== diff -u -r1a7c63095329d28b04079ad6b6a67c68a4141e09 -r214a1446ca64680e16978f703dab68540a1c8a68 Binary files differ Index: lams_monitoring/lib/lams/lams-tool-survey.jar =================================================================== diff -u Binary files differ Index: lams_monitoring/lib/lams/lams.jar =================================================================== diff -u -r1a7c63095329d28b04079ad6b6a67c68a4141e09 -r214a1446ca64680e16978f703dab68540a1c8a68 Binary files differ Index: lams_monitoring/lib/lams/src/lams_tool_survey_src.zip =================================================================== diff -u Binary files differ Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -r1a7c63095329d28b04079ad6b6a67c68a4141e09 -r214a1446ca64680e16978f703dab68540a1c8a68 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 1a7c63095329d28b04079ad6b6a67c68a4141e09) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -16,15 +16,36 @@ /** - * + * Interface defines all monitoring services needed by presentation tier. * @author Jacky Fang 2/02/2005 */ public interface IMonitoringService { - + + /** + * Create a new lesson so as to start the learning process. It needs to + * notify lams which learning design it belongs to and who will be + * involved in this lesson. + * + * @param learningDesignId the selected learning design + * @param user user the user who want to create this lesson. + * @param organisation the organization this lesson belongs to. + * @param organizationUsers a list of learner will be in this new lessons. + * @param staffs a list of staffs who will be in charge of this lesson. + */ public void createLesson(long learningDesignId,User user,Organisation organisation,List organizationUsers,List staffs);; + /** + * Start the specified the lesson. It must be created before calling this + * service. + * @param lessonId the specified the lesson id. + */ public void startlesson(long lessonId); + /** + * Force the learner to complete all the activities for current lesson. + * @param learnerProgressId the learner progress belongs to the user who + * will be force complete + */ public void forceCompleteLessonByUser(long learnerProgressId); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r1a7c63095329d28b04079ad6b6a67c68a4141e09 -r214a1446ca64680e16978f703dab68540a1c8a68 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 1a7c63095329d28b04079ad6b6a67c68a4141e09) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -24,6 +24,7 @@ import org.lamsfoundation.lams.lesson.LessonClass; import org.lamsfoundation.lams.lesson.dao.ILessonClassDAO; import org.lamsfoundation.lams.lesson.dao.ILessonDAO; +import org.lamsfoundation.lams.tool.ToolContentIDGenerator; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; @@ -33,15 +34,29 @@ /** + *

This is the major service facade for all monitoring functionalities. It is + * configured as a Spring factory bean so as to utilize the Spring's IOC and + * declarative transaction management.

+ *

It needs to implement ApplicationContextAware interface + * because we need to load up tool's service dynamically according to the + * selected learning design.

* * @author Jacky Fang 2/02/2005 */ public class MonitoringService implements IMonitoringService,ApplicationContextAware { + //--------------------------------------------------------------------- + // Instance variables + //--------------------------------------------------------------------- private ILessonDAO lessonDAO; private ILessonClassDAO lessonClassDAO; private IAuthoringService authoringService; private ApplicationContext context; + private ToolContentIDGenerator contentIDGenerator; + + //--------------------------------------------------------------------- + // Inversion of Control Methods - Method injection + //--------------------------------------------------------------------- /** * @param authoringService The authoringService to set. */ @@ -70,16 +85,27 @@ { this.context=context; } - + /** - * + * @param contentIDGenerator The contentIDGenerator to set. */ - public MonitoringService() + public void setContentIDGenerator(ToolContentIDGenerator contentIDGenerator) { - super(); + this.contentIDGenerator = contentIDGenerator; } - + + //--------------------------------------------------------------------- + // Service Methods + //--------------------------------------------------------------------- /** + *

Create new lesson according to the learning design specified by the + * user. This involves following major steps:

+ * + *
  • 1. Make a runtime copy of static learning design defined in authoring
    • + *
  • 2. Go through all the tool activities defined in the learning design, + * create a runtime copy of all tool's content.
    • + *
  • 3. Create a new lesson with all staffs and learners involved.
    • + * * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLesson(long, org.lamsfoundation.lams.usermanagement.User, java.util.List, java.util.List) */ public void createLesson(long learningDesignId, @@ -97,29 +123,14 @@ { Activity currentActivity = (Activity)i.next(); if(currentActivity.getActivityTypeId().intValue()==Activity.TOOL_ACTIVITY_TYPE) - { - ToolContentManager contentManager = (ToolContentManager)context.getBean(((ToolActivity)currentActivity).getTool().getToolSignature()); - contentManager.copyToolContent(((ToolActivity)currentActivity).getToolContentId(),new Long(1)); - } + copyToolContent((ToolActivity)currentActivity); } - //create a new lesson object - LessonClass newLessonClass = createNewLessonClass(copiedLearningDesign); - lessonClassDAO.saveLessonClass(newLessonClass); - - //setup staff group - newLessonClass.setStaffGroup(Group.createStaffGroup(newLessonClass,new HashSet(staffs))); - //setup learner group - newLessonClass.getGroups().add(Group.createLearnerGroup(newLessonClass,new HashSet(organizationUsers))); - lessonClassDAO.updateLessonClass(newLessonClass); - - //create new Lesson object - Lesson newLesson = Lesson.createNewLesson(user, organisation, copiedLearningDesign, newLessonClass); - newLessonClass.setLesson(newLesson); - lessonDAO.saveLesson(newLesson); + createNewLesson(user, organisation, organizationUsers, staffs, copiedLearningDesign); } + /** * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#startlesson(long) */ @@ -137,11 +148,45 @@ // TODO Auto-generated method stub } - + + + //--------------------------------------------------------------------- + // Helper Methods + //--------------------------------------------------------------------- /** - * @param copiedLearningDesign - * @return + * Create a new lesson and setup all the staffs and learners who will be + * participating this less. + * @param user the user who created this lesson. + * @param organisation the organization this lesson belongs to. + * @param organizationUsers a list of learner will be in this new lessons. + * @param staffs a list of staffs who will be in charge of this lesson. + * @param copiedLearningDesign the new run-time learning design copy + * for this lesson. */ + private void createNewLesson(User user, Organisation organisation, List organizationUsers, List staffs, LearningDesign copiedLearningDesign) + { + //create a new lesson object + LessonClass newLessonClass = createNewLessonClass(copiedLearningDesign); + lessonClassDAO.saveLessonClass(newLessonClass); + + //setup staff group + newLessonClass.setStaffGroup(Group.createStaffGroup(newLessonClass,new HashSet(staffs))); + //setup learner group + newLessonClass.getGroups().add(Group.createLearnerGroup(newLessonClass,new HashSet(organizationUsers))); + lessonClassDAO.updateLessonClass(newLessonClass); + + //create new Lesson object + Lesson newLesson = Lesson.createNewLesson(user, organisation, copiedLearningDesign, newLessonClass); + newLessonClass.setLesson(newLesson); + lessonDAO.saveLesson(newLesson); + } + + /** + * Setup the empty lesson class according to the run-time learning design + * copy. + * @param copiedLearningDesign the run-time learning design instance. + * @return the new empty lesson class. + */ private LessonClass createNewLessonClass(LearningDesign copiedLearningDesign) { //make a copy of lazily initialized activities @@ -155,5 +200,45 @@ return newLessonClass; } + /** + * Make a copy of all tools content which belongs to this learning design. + * + * @param toolActivity the tool activity defined in the design. + */ + private void copyToolContent(ToolActivity toolActivity) + { + //This is just for testing purpose because only service is available + //at the moment. TODO we need to remove this once all done. + if(shouldCopy(toolActivity)) + { + ToolContentManager contentManager = (ToolContentManager)findToolService(toolActivity); + contentManager.copyToolContent(toolActivity.getToolContentId(), + contentIDGenerator.getNextToolContentIDFor(toolActivity.getTool())); + + } + } + + /** + * Find a tool's service registered inside lams. It is implemented using + * Spring now. We might need to extract this method to a proxy class to + * find different service such as EJB or Web service. + * @param toolActivity the tool activity defined in the design. + * @return the service object from tool. + */ + private Object findToolService(ToolActivity toolActivity) + { + return context.getBean(toolActivity.getTool().getServiceName()); + } + /** + * This is more for testing purpose. + * @param toolActivity the tool activity defined in the design. + * @return + */ + private boolean shouldCopy(ToolActivity toolActivity) + { + return toolActivity.getTool().getServiceName().equals("surveyService"); + } + + } Index: lams_monitoring/test/java/log4j.properties =================================================================== diff -u --- lams_monitoring/test/java/log4j.properties (revision 0) +++ lams_monitoring/test/java/log4j.properties (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,4 @@ +log4j.rootLogger=INFO,stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p (%F:%L) - %m%n \ No newline at end of file Index: lams_monitoring/test/java/org/lamsfoundation/lams/authoring/mockAuthoringApplicationContext.xml =================================================================== diff -u --- lams_monitoring/test/java/org/lamsfoundation/lams/authoring/mockAuthoringApplicationContext.xml (revision 0) +++ lams_monitoring/test/java/org/lamsfoundation/lams/authoring/mockAuthoringApplicationContext.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED,readOnly + + + + \ No newline at end of file Index: lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java =================================================================== diff -u --- lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java (revision 0) +++ lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,121 @@ +/* ******************************************************************************** + * Copyright Notice + * ================= + * This file contains propriety information of LAMS Foundation. + * Copying or reproduction with prior written permission is prohibited. + * Copyright (c) 2005 + * Created on 9/02/2005 + ******************************************************************************** */ + +package org.lamsfoundation.lams.authoring.service; + +import java.util.List; + +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO; +import org.lamsfoundation.lams.usermanagement.User; + + +/** + * + * @author Jacky Fang 9/02/2005 + * + */ +public class MockAuthoringService implements IAuthoringService +{ + protected LearningDesignDAO learningDesignDAO; + + /** + * @param learningDesignDAO The learningDesignDAO to set. + */ + public void setLearningDesignDAO(LearningDesignDAO learningDesignDAO) { + this.learningDesignDAO = learningDesignDAO; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getLearningDesign(java.lang.Long) + */ + public LearningDesign getLearningDesign(Long arg0) + { + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#copyLearningDesign(java.lang.Long) + */ + public LearningDesign copyLearningDesign(Long learningDesignId) + { + return learningDesignDAO.getLearningDesignById(new Long(1)); + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getAllLearningDesigns() + */ + public List getAllLearningDesigns() + { + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#saveLearningDesign(org.lamsfoundation.lams.learningdesign.LearningDesign) + */ + public void saveLearningDesign(LearningDesign arg0) + { + // TODO Auto-generated method stub + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#updateLearningDesign(java.lang.Long) + */ + public void updateLearningDesign(Long arg0) + { + // TODO Auto-generated method stub + + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getAllLearningLibraries() + */ + public List getAllLearningLibraries() + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#requestLearningLibraryWDDX() + */ + public String requestLearningLibraryWDDX() + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#requestLearningDesignWDDX(java.lang.Long) + */ + public String requestLearningDesignWDDX(Long arg0) + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#requestLearningDesignListWDDX() + */ + public String requestLearningDesignListWDDX() + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#requestLearningDesignWDDX(org.lamsfoundation.lams.usermanagement.User) + */ + public String requestLearningDesignWDDX(User arg0) + { + // TODO Auto-generated method stub + return null; + } + +} Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml =================================================================== diff -u --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (revision 0) +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED + + + + + Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java =================================================================== diff -u --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (revision 0) +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -0,0 +1,141 @@ +/* ******************************************************************************** + * Copyright Notice + * ================= + * This file contains propriety information of LAMS Foundation. + * Copying or reproduction with prior written permission is prohibited. + * Copyright (c) 2005 + * Created on 9/02/2005 + ******************************************************************************** */ + +package org.lamsfoundation.lams.monitoring.service; + +import java.util.LinkedList; + +import org.lamsfoundation.lams.AbstractLamsTestCase; +import org.lamsfoundation.lams.learningdesign.Grouping; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.lesson.dao.ILessonDAO; +import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; + + +/** + * + * @author Jacky Fang 9/02/2005 + * + */ +public class TestMonitoringService extends AbstractLamsTestCase +{ + //--------------------------------------------------------------------- + // Dependent services + //--------------------------------------------------------------------- + private IMonitoringService monitoringService; + private IUserManagementService usermanageService; + private ILessonDAO lessonDao; + //--------------------------------------------------------------------- + // Testing Data - Constants + //--------------------------------------------------------------------- + private final Integer TEST_USER_ID = new Integer(1); + private final Integer TEST_LEARNER_ID = new Integer(2); + private final Integer TEST_STAFF_ID = new Integer(3); + private final long TEST_LEARNING_DESIGN_ID = 1; + private final Integer TEST_ORGANIZATION_ID = new Integer(1); + //it might be different because it is automatically generated by database + //TODO create a get lesson by design method in lesson dao. + private final Long TEST_LESSON_ID = new Long(1); + //--------------------------------------------------------------------- + // Testing Data - Instance Variables + //--------------------------------------------------------------------- + private User testUser; + private User testStaff; + private User testLearner; + private Organisation testOrganisation; + /* + * @see AbstractLamsCommonTestCase#setUp() + */ + protected void setUp() throws Exception + { + super.setUp(); + monitoringService = (IMonitoringService)this.context.getBean("monitoringService"); + usermanageService = (IUserManagementService)this.context.getBean("userManagementService"); + lessonDao = (LessonDAO)this.context.getBean("lessonDAO"); + + initializeTestingData(); + } + /** + * @see AbstractLamsCommonTestCase#tearDown() + */ + protected void tearDown() throws Exception + { + super.tearDown(); + } + + /** + * Constructor for TestMonitoringService. + * @param name + */ + public TestMonitoringService(String name) + { + super(name); + } + + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() + { + return new String[] { "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", + "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml", + "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", + "/org/lamsfoundation/lams/authoring/mockAuthoringApplicationContext.xml", + "/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml", + "/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml", + "applicationContext.xml"}; + } + + public void testCreateLesson() + { + LinkedList learners = new LinkedList(); + learners.add(testLearner); + LinkedList staffs = new LinkedList(); + staffs.add(testStaff); + + monitoringService.createLesson(TEST_LEARNING_DESIGN_ID, + testUser, + testOrganisation, + learners, + staffs); + + Lesson createdLesson = lessonDao.getLesson(TEST_LESSON_ID); + assertNotNull(createdLesson); + assertEquals("verify the design",TEST_LEARNING_DESIGN_ID,createdLesson.getLearningDesign().getLearningDesignId().longValue()); + assertEquals("verify the user", TEST_USER_ID,createdLesson.getUser().getUserId()); + assertEquals("verify the organization",TEST_ORGANIZATION_ID,createdLesson.getOrganisation().getOrganisationId()); + assertEquals("verify the lesson state",Lesson.CREATED,createdLesson.getLessonStateId()); + + assertEquals("verify the lesson class",Grouping.CLASS_GROUPING_TYPE,createdLesson.getLessonClass().getGroupingTypeId()); + assertEquals("verify the staff group",staffs.size(),createdLesson.getLessonClass().getStaffGroup().getUsers().size()); + assertEquals("verify the learner group",1,createdLesson.getLessonClass().getGroups().size()); + } + + public void testStartlesson() + { + } + + public void testForceCompleteLessonByUser() + { + } + + /** + * Initialize all instance variables for testing + */ + private void initializeTestingData() + { + testUser = usermanageService.getUserById(TEST_USER_ID); + testStaff = usermanageService.getUserById(TEST_STAFF_ID); + testLearner = usermanageService.getUserById(TEST_LEARNER_ID); + testOrganisation = usermanageService.getOrganisationById(TEST_ORGANIZATION_ID); + } +} Fisheye: Tag 214a1446ca64680e16978f703dab68540a1c8a68 refers to a dead (removed) revision in file `lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/applicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 214a1446ca64680e16978f703dab68540a1c8a68 refers to a dead (removed) revision in file `lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/learningDesignApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 214a1446ca64680e16978f703dab68540a1c8a68 refers to a dead (removed) revision in file `lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/monitoringApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/spring/applicationContext.xml =================================================================== diff -u -r1a7c63095329d28b04079ad6b6a67c68a4141e09 -r214a1446ca64680e16978f703dab68540a1c8a68 --- lams_monitoring/web/spring/applicationContext.xml (.../applicationContext.xml) (revision 1a7c63095329d28b04079ad6b6a67c68a4141e09) +++ lams_monitoring/web/spring/applicationContext.xml (.../applicationContext.xml) (revision 214a1446ca64680e16978f703dab68540a1c8a68) @@ -62,7 +62,6 @@ org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml org/lamsfoundation/lams/lesson/Lesson.hbm.xml - org/lamsfoundation/lams/tool/Tool.hbm.xml