Index: lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/Attic/TestExportPortfolioService.java,v diff -u -r1.9 -r1.10 --- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java 18 Jun 2006 04:55:53 -0000 1.9 +++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java 3 Jul 2006 00:21:47 -0000 1.10 @@ -118,11 +118,12 @@ toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO"); transitionDao = (TransitionDAO)this.context.getBean("transitionDAO"); exportService = (IExportPortfolioService) this.context.getBean("exportService"); - testUser = usermanageService.getUserById(TEST_USER_ID); + /* Commented out as usermanageService.getUserById has been removed + * testUser = usermanageService.getUserById(TEST_USER_ID); testLesson = lessonDao.getLesson(TEST_LESSON_ID); testLesson_fromCommon = lessonDao.getLesson(TEST_LESSON_ID_fromCommon); - testUser_fromCommon = usermanageService.getUserById(TEST_USER_ID_fromCommon); + testUser_fromCommon = usermanageService.getUserById(TEST_USER_ID_fromCommon); */ } /* Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/service/Attic/TestLearnerService.java,v diff -u -r1.35 -r1.36 --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java 18 Jun 2006 13:06:55 -0000 1.35 +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java 3 Jul 2006 00:21:47 -0000 1.36 @@ -72,7 +72,8 @@ //--------------------------------------------------------------------- // Testing Data - Constants //--------------------------------------------------------------------- - private final Integer TEST_USER_ID = new Integer(2); + private final Integer TEST_USER_ID = new Integer(4); + private final String TEST_USER_LOGIN = "mmm"; private final Long Test_Lesson_ID = new Long(2); private final long TEST_TOOL_SESSION_ID = 1; //--------------------------------------------------------------------- @@ -121,7 +122,7 @@ toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO"); activityDao = (IActivityDAO)this.context.getBean("activityDAO"); - testUser = usermanageService.getUserById(TEST_USER_ID); + testUser = usermanageService.getUserByLogin(TEST_USER_LOGIN); testLesson = lessonDao.getLesson(Test_Lesson_ID); } @@ -344,7 +345,7 @@ public void testKnockSynchGateOpen() { - User testUser2= usermanageService.getUserById(new Integer(1)); + User testUser2= usermanageService.getUserByLogin(TEST_USER_LOGIN); //get sync gate GateActivity synchGate = (GateActivity)learnerService.getActivity(new Long(TEST_SYNCHGATE_ACTIVITY_ID));