Index: lams_common/properties.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/Attic/properties.xml,v diff -u -r1.8 -r1.9 --- lams_common/properties.xml 4 Feb 2005 06:14:09 -0000 1.8 +++ lams_common/properties.xml 9 Feb 2005 00:33:40 -0000 1.9 @@ -61,8 +61,8 @@ - - + + Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/BaseTestCase.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dbConnection.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/learningDesignApplicationContext.xml,v diff -u -r1.5 -r1.6 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml 7 Feb 2005 05:14:01 -0000 1.5 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml 9 Feb 2005 00:29:55 -0000 1.6 @@ -6,109 +6,33 @@ --> - - - - - - - /org/lamsfoundation/lams/learningdesign/dbConnection.properties - - - - - messages - - - - - - - - ${jdbc.driverClassName} - ${jdbc.url} - ${jdbc.username} - ${jdbc.password} - - - - - - - - - - - org/lamsfoundation/lams/learningdesign/Activity.hbm.xml - org/lamsfoundation/lams/learningdesign/Group.hbm.xml - org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml - org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml - org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml - org/lamsfoundation/lams/learningdesign/Transition.hbm.xml - - - - org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml - org/lamsfoundation/lams/lesson/Lesson.hbm.xml - - - org/lamsfoundation/lams/tool/Tool.hbm.xml - org/lamsfoundation/lams/tool/ToolSession.hbm.xml - org/lamsfoundation/lams/tool/ToolContent.hbm.xml - - - - org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml - org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml - org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml - org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml - org/lamsfoundation/lams/usermanagement/Role.hbm.xml - org/lamsfoundation/lams/usermanagement/User.hbm.xml - org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml - org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml - org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml - org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml - - - - - - ${hibernate.dialect} - ${hibernate.show_sql} - ${hibernate.c3p0.minPoolSize} - ${hibernate.c3p0.maxPoolSize} - ${hibernate.c3p0.timeout} - ${hibernate.c3p0.max_statement} - - - - - - - - - - - - + - + - + - + + + + - + + + + + + Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestActivityDAO.java,v diff -u -r1.2 -r1.3 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java 2 Feb 2005 02:29:05 -0000 1.2 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java 9 Feb 2005 00:32:04 -0000 1.3 @@ -1,13 +1,11 @@ package org.lamsfoundation.lams.learningdesign.dao; -import java.util.List; - +import org.lamsfoundation.lams.AbstractLamsCommonTestCase; import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO; 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.learningdesign.BaseTestCase; /* * Created on Dec 3, 2004 @@ -22,25 +20,47 @@ * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ -public class TestActivityDAO extends BaseTestCase { - +public class TestActivityDAO extends AbstractLamsCommonTestCase { + protected ActivityDAO activityDAO; protected Activity activity; protected LearningDesignDAO learningDesignDAO; protected LearningLibraryDAO learningLibraryDAO; protected GroupingDAO groupingDAO; + + /** + * @param name + */ + public TestActivityDAO(String name) { + super(name); + } + public void setUp() throws Exception { super.setUp(); activityDAO =(ActivityDAO) context.getBean("activityDAO"); learningLibraryDAO =(LearningLibraryDAO)context.getBean("learningLibraryDAO"); learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO"); groupingDAO = (GroupingDAO)context.getBean("groupingDAO"); } - public void testGetActivitiesByParentActivityId() { - List list = activityDAO.getActivitiesByParentActivityId(new Long(17)); + /*public void testGetActivitiesByParentActivityId() { + List list = activityDAO.getActivitiesByParentActivityId(new Long(14)); System.out.print("SIZE:" + list.size()); + }*/ + public void test(){ + activity = activityDAO.getActivityByActivityId(new Long(22)); + Transition transition = activity.getTransitionTo(); + System.out.println("Transition TO:" + transition.getTransitionId()); + transition = activity.getTransitionFrom(); + System.out.println("Transition FROM:" + transition.getActivityByToActivityId()); } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() { + return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", + "applicationContext.xml"}; + } /*protected void tearDown() throws Exception { super.tearDown(); Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningDesignDAO.java,v diff -u -r1.2 -r1.3 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java 7 Feb 2005 03:50:54 -0000 1.2 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java 9 Feb 2005 00:32:04 -0000 1.3 @@ -3,7 +3,7 @@ */ package org.lamsfoundation.lams.learningdesign.dao; -import org.lamsfoundation.lams.learningdesign.BaseTestCase; +import org.lamsfoundation.lams.AbstractLamsCommonTestCase; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO; import org.lamsfoundation.lams.usermanagement.User; @@ -17,15 +17,20 @@ * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ -public class TestLearningDesignDAO extends BaseTestCase { +public class TestLearningDesignDAO extends AbstractLamsCommonTestCase { + private LearningDesignDAO learningDesignDAO; protected WorkspaceFolderDAO workspaceFolderDAO; private UserDAO userDAO; private User user; private LearningDesign learningDesign; + public TestLearningDesignDAO(String name) { + super(name); + } public void setUp() throws Exception{ + super.setUp(); learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO"); workspaceFolderDAO =(WorkspaceFolderDAO)context.getBean("workspaceFolderDAO"); } @@ -84,4 +89,11 @@ System.out.print(workspaceFolder.getName()); } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() { + return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", + "applicationContext.xml"}; + } } Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningLibraryDAO.java,v diff -u -r1.2 -r1.3 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java 2 Feb 2005 02:29:05 -0000 1.2 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java 9 Feb 2005 00:32:04 -0000 1.3 @@ -5,26 +5,38 @@ * Window - Preferences - Java - Code Style - Code Templates */ package org.lamsfoundation.lams.learningdesign.dao; -import org.lamsfoundation.lams.learningdesign.BaseTestCase; - +import org.lamsfoundation.lams.AbstractLamsCommonTestCase; import org.lamsfoundation.lams.learningdesign.LearningLibrary; import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO; /** * @author manpreet */ -public class TestLearningLibraryDAO extends BaseTestCase { +public class TestLearningLibraryDAO extends AbstractLamsCommonTestCase { protected LearningLibraryDAO libraryDAO; protected LearningLibrary library; + public TestLearningLibraryDAO(String name) { + super(name); + } + public void setUp() throws Exception{ + super.setUp(); libraryDAO =(LearningLibraryDAO) context.getBean("learningLibraryDAO"); } public void testGetAllLibraries(){ LearningLibrary lib = libraryDAO.getLearningLibraryById(new Long(8)); assertNotNull(lib.getTitle()); System.out.println(lib.getTitle()); } + /** + * (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() { + return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", + "applicationContext.xml"}; + } } Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestTransitionDAO.java,v diff -u -r1.3 -r1.4 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java 8 Feb 2005 06:03:33 -0000 1.3 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java 9 Feb 2005 00:32:04 -0000 1.4 @@ -8,7 +8,7 @@ import java.util.List; -import org.lamsfoundation.lams.learningdesign.BaseTestCase; +import org.lamsfoundation.lams.AbstractLamsCommonTestCase; import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO; @@ -18,11 +18,16 @@ * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ -public class TestTransitionDAO extends BaseTestCase{ +public class TestTransitionDAO extends AbstractLamsCommonTestCase{ protected TransitionDAO transitionDAO; protected Transition transition; + + public TestTransitionDAO(String name) { + super(name); + } + public void setUp() throws Exception { super.setUp(); transitionDAO =(TransitionDAO) context.getBean("transitionDAO"); @@ -34,5 +39,13 @@ System.out.println(transition.getTitle()); } + /** + * (non-Javadoc) + * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation() + */ + protected String[] getContextConfigLocation() { + return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", + "applicationContext.xml"}; + } }