Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java =================================================================== diff -u -r35d5350252748108494c7cb4bfc2e7d5f2271cba -r8171e99285e7666cfde843b3f8a132ad0361922b --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java (.../TestActivityDAO.java) (revision 35d5350252748108494c7cb4bfc2e7d5f2271cba) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java (.../TestActivityDAO.java) (revision 8171e99285e7666cfde843b3f8a132ad0361922b) @@ -8,6 +8,8 @@ import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO; import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO; import org.lamsfoundation.lams.learningdesign.*; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO; /* * Created on Dec 3, 2004 @@ -30,7 +32,7 @@ protected LearningLibraryDAO learningLibraryDAO; protected GroupingDAO groupingDAO; protected LearningDesign learningDesign; - + protected UserDAO userDAO; /** * @param name */ @@ -45,6 +47,7 @@ learningLibraryDAO =(LearningLibraryDAO)context.getBean("learningLibraryDAO"); learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO"); groupingDAO = (GroupingDAO)context.getBean("groupingDAO"); + userDAO = (UserDAO)context.getBean("userDAO"); learningDesign = learningDesignDAO.getLearningDesignById(new Long(1)); } public void testGetActivitiesByParentActivityId() { @@ -122,6 +125,31 @@ activityDAO.insert(parallelActivity); } assertNotNull(parallelActivity.getActivityId()); - } + } + + public void testUpdateGateActivity() + { + User learner = userDAO.getUserById(new Integer(1)); + Activity synchGate = activityDAO.getActivityByActivityId(new Long(26)); + + //add waiting learner. + ((GateActivity)synchGate).addWaitingLeaner(learner); + ((GateActivity)synchGate).setGateOpen(new Boolean(true)); + + activityDAO.updateActivity(synchGate); + + synchGate = activityDAO.getActivityByActivityId(new Long(26)); + assertTrue("gate status should be open",((GateActivity)synchGate).getGateOpen().booleanValue()); + assertEquals("should be one learner waiting",1,((GateActivity)synchGate).getWaitingLearners().size()); + + //remove waiting learner + ((GateActivity)synchGate).getWaitingLearners().clear(); + + activityDAO.updateActivity(synchGate); + synchGate = activityDAO.getActivityByActivityId(new Long(26)); + assertTrue("gate status should be open",((GateActivity)synchGate).getGateOpen().booleanValue()); + assertEquals("should be no learner waiting",0,((GateActivity)synchGate).getWaitingLearners().size()); + + } }