Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java =================================================================== diff -u -r8d93f5d5bd53830f6e4788fabbc015fc3d1c5b31 -r28d64aab07ef56ac02ca94111b73322d520c967f --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java (.../TestActivityDAO.java) (revision 8d93f5d5bd53830f6e4788fabbc015fc3d1c5b31) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java (.../TestActivityDAO.java) (revision 28d64aab07ef56ac02ca94111b73322d520c967f) @@ -29,6 +29,7 @@ protected LearningDesignDAO learningDesignDAO; protected LearningLibraryDAO learningLibraryDAO; protected GroupingDAO groupingDAO; + protected LearningDesign learningDesign; /** * @param name @@ -44,6 +45,7 @@ learningLibraryDAO =(LearningLibraryDAO)context.getBean("learningLibraryDAO"); learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO"); groupingDAO = (GroupingDAO)context.getBean("groupingDAO"); + learningDesign = learningDesignDAO.getLearningDesignById(new Long(1)); } public void testGetActivitiesByParentActivityId() { List list = activityDAO.getActivitiesByParentActivityId(new Long(14)); @@ -72,6 +74,54 @@ List activities = activityDAO.getActivitiesByLibraryID(new Long(1)); assertNotNull(activities); System.out.println("SIZE:" + activities.size()); + } + public void testIsComplexActivity(){ + activity = activityDAO.getActivityByActivityId(new Long(14)); + boolean result = activity.isComplexActivity(); + assertTrue(result); } + public void testGetContributionType(){ + activity = activityDAO.getActivityByActivityId(new Long(18)); + Integer as[]=activity.getContributionType(); + for(int i=0;i