Index: lams_common/test/java/org/lamsfoundation/lams/AbstractLamsStrutsTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/Attic/AbstractLamsStrutsTestCase.java,v diff -u -r1.2 -r1.3 --- lams_common/test/java/org/lamsfoundation/lams/AbstractLamsStrutsTestCase.java 14 Mar 2005 22:52:29 -0000 1.2 +++ lams_common/test/java/org/lamsfoundation/lams/AbstractLamsStrutsTestCase.java 12 Apr 2005 07:42:03 -0000 1.3 @@ -57,18 +57,18 @@ public abstract class AbstractLamsStrutsTestCase extends MockStrutsTestCase { //protected ApplicationContext context; - private final String CONFIG_LOCATIONS; + //private String CONFIG_LOCATIONS; protected HttpServletRequestSimulator httpRequest; protected HttpSession httpSession ; protected WebApplicationContext wac; /** * @param arg0 */ - public AbstractLamsStrutsTestCase(String testName,String location) + public AbstractLamsStrutsTestCase(String testName) { super(testName); - this.CONFIG_LOCATIONS = location; + //this.CONFIG_LOCATIONS = location; } @@ -85,7 +85,7 @@ context.setInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, XmlWebApplicationContext.class.getName()); context.setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, - CONFIG_LOCATIONS); + getContextConfigLocation()); ctxLoader.initWebApplicationContext(context); wac = WebApplicationContextUtils.getRequiredWebApplicationContext(context); @@ -108,7 +108,7 @@ protected void initializeHibernateSession() throws HibernateException { //hold the hibernate session - SessionFactory sessionFactory = (SessionFactory) this.wac.getBean("coreSessionFactory"); + SessionFactory sessionFactory = (SessionFactory) this.wac.getBean(getHibernateSessionFactoryBeanName()); Session s = sessionFactory.openSession(); TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(s)); } @@ -119,7 +119,7 @@ protected void finalizeHibernateSession() throws HibernateException { //clean the hibernate session - SessionFactory sessionFactory = (SessionFactory)this.wac .getBean("coreSessionFactory"); + SessionFactory sessionFactory = (SessionFactory)this.wac.getBean(getHibernateSessionFactoryBeanName()); SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory); if (holder != null) { Session s = holder.getSession(); @@ -128,4 +128,11 @@ SessionFactoryUtils.closeSessionIfNecessary(s, sessionFactory); } } + + /** + * @return + */ + protected abstract String getHibernateSessionFactoryBeanName(); + + protected abstract String getContextConfigLocation(); } Index: lams_common/test/java/org/lamsfoundation/lams/AbstractLamsTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/Attic/AbstractLamsTestCase.java,v diff -u -r1.2 -r1.3 --- lams_common/test/java/org/lamsfoundation/lams/AbstractLamsTestCase.java 7 Mar 2005 05:09:03 -0000 1.2 +++ lams_common/test/java/org/lamsfoundation/lams/AbstractLamsTestCase.java 12 Apr 2005 07:42:03 -0000 1.3 @@ -53,6 +53,11 @@ protected abstract String[] getContextConfigLocation(); /** + * @return + */ + protected abstract String getHibernateSessionFactoryName(); + + /** * @see TestCase#tearDown() */ protected void tearDown() throws Exception @@ -67,17 +72,19 @@ protected void initializeHibernateSession() throws HibernateException { //hold the hibernate session - SessionFactory sessionFactory = (SessionFactory) this.context.getBean("coreSessionFactory"); + SessionFactory sessionFactory = (SessionFactory) this.context.getBean(getHibernateSessionFactoryName()); Session s = sessionFactory.openSession(); TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(s)); } + + /** * @throws HibernateException */ protected void finalizeHibernateSession() throws HibernateException { //clean the hibernate session - SessionFactory sessionFactory = (SessionFactory)this.context.getBean("coreSessionFactory"); + SessionFactory sessionFactory = (SessionFactory)this.context.getBean(getHibernateSessionFactoryName()); SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory); if (holder != null&&shouldFlush) { Session s = holder.getSession(); @@ -89,13 +96,12 @@ protected Session getSession() { - SessionFactory sessionFactory = (SessionFactory)this.context.getBean("coreSessionFactory"); + SessionFactory sessionFactory = (SessionFactory)this.context.getBean(getHibernateSessionFactoryName()); SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory); if (holder != null) return holder.getSession(); else return null; - } /** * @param shouldFlush The shouldFlush to set. Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/TestActivity.java,v diff -u -r1.5 -r1.6 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java 24 Feb 2005 06:09:35 -0000 1.5 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java 12 Apr 2005 07:43:36 -0000 1.6 @@ -114,4 +114,12 @@ "applicationContext.xml"}; } + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } + } 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.11 -r1.12 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java 7 Apr 2005 03:50:02 -0000 1.11 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java 12 Apr 2005 07:43:36 -0000 1.12 @@ -151,5 +151,14 @@ assertEquals("should be no learner waiting",0,((GateActivity)synchGate).getWaitingLearners().size()); } + + + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } } Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestGroupingDAO.java,v diff -u -r1.4 -r1.5 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java 5 Apr 2005 06:52:04 -0000 1.4 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java 12 Apr 2005 07:43:36 -0000 1.5 @@ -104,5 +104,13 @@ } + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } + } 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.7 -r1.8 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java 23 Feb 2005 05:57:31 -0000 1.7 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java 12 Apr 2005 07:43:36 -0000 1.8 @@ -34,7 +34,8 @@ super.setUp(); learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO"); userDAO = (UserDAO)context.getBean("userDAO"); - } /* + } + /* public void testInsertLearningDesign(){ LearningDesign design = new LearningDesign(); @@ -59,4 +60,11 @@ return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", "applicationContext.xml"}; } + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } } 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.5 -r1.6 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java 23 Feb 2005 05:20:43 -0000 1.5 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java 12 Apr 2005 07:43:36 -0000 1.6 @@ -45,4 +45,12 @@ return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", "applicationContext.xml"}; } + + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } } 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.7 -r1.8 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java 21 Mar 2005 05:40:20 -0000 1.7 +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java 12 Apr 2005 07:43:36 -0000 1.8 @@ -43,4 +43,12 @@ return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", "applicationContext.xml"}; } + + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } } Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/Attic/LessonDataAccessTestCase.java,v diff -u -r1.19 -r1.20 --- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java 7 Mar 2005 05:09:03 -0000 1.19 +++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java 12 Apr 2005 07:43:36 -0000 1.20 @@ -284,4 +284,12 @@ assertEquals("check up the learner progresses",0,lesson.getLearnerProgresses().size()); } + + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } } \ No newline at end of file Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/Attic/ToolDataAccessTestCase.java,v diff -u -r1.11 -r1.12 --- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java 18 Mar 2005 03:19:26 -0000 1.11 +++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java 12 Apr 2005 07:43:36 -0000 1.12 @@ -144,5 +144,13 @@ testGroup, testLesson); } + + /** + * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName() + */ + protected String getHibernateSessionFactoryName() + { + return "coreSessionFactory"; + } }