Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rbded5f003fed0807016eb890b55c227956f3cf6d --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java (.../TestGateAction.java) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/web/TestGateAction.java (.../TestGateAction.java) (revision bded5f003fed0807016eb890b55c227956f3cf6d) @@ -72,17 +72,26 @@ */ protected String getContextConfigLocation() { - return "/WEB-INF/spring/applicationContext.xml " - +"/WEB-INF/spring/monitoringApplicationContext.xml " - +"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml " - +"/WEB-INF/spring/authoringApplicationContext.xml " - +"/WEB-INF/spring/learningApplicationContext.xml " - +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml " - +"/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml " - +"/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml"; + return "/org/lamsfoundation/lams/applicationContext.xml "+ + "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml "+ + "/org/lamsfoundation/lams/tool/toolApplicationContext.xml "+ + "/org/lamsfoundation/lams/learning/learningApplicationContext.xml "+ + "/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml "+ + "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml "+ + "/org/lamsfoundation/lams/tool/survey/applicationContext.xml "; } - + /* protected String getContextConfigLocation() + { + return "/WEB-INF/spring/applicationContext.xml " + +"/WEB-INF/spring/monitoringApplicationContext.xml " + +"/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml " + +"/WEB-INF/spring/authoringApplicationContext.xml " + +"/WEB-INF/spring/learningApplicationContext.xml " + +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml " + +"/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml " + +"/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml"; + } */ /** * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName() */ @@ -107,7 +116,7 @@ { addRequestParameter("method", "viewGate"); addRequestParameter("lessonId",TEST_LESSON_ID); - addRequestParameter("activityId",TEST_SYNCH_GATE_ID); + addRequestParameter("activityId",TEST_SCHEUDLE_GATE_ID); actionPerform(); @@ -119,7 +128,7 @@ { addRequestParameter("method", "viewGate"); addRequestParameter("lessonId",TEST_LESSON_ID); - addRequestParameter("activityId",TEST_SYNCH_GATE_ID); + addRequestParameter("activityId",TEST_PERMISSION_GATE_ID); actionPerform(); @@ -135,6 +144,6 @@ actionPerform(); verifyNoActionErrors(); - verifyTilesForward("openGate",".openGate"); + verifyTilesForward("viewSynchGate",".viewSynchGate"); } }