From: <ac...@us...> - 2008-04-22 02:06:46
|
Revision: 46 http://drawbridge.svn.sourceforge.net/drawbridge/?rev=46&view=rev Author: acresse Date: 2008-04-21 19:06:41 -0700 (Mon, 21 Apr 2008) Log Message: ----------- I shoulda remembered the unit tests Modified Paths: -------------- trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/DeleteDriverSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/DeleteGroupSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/AddOrEditUserSubmitControllerTest.java trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/DeleteUserSubmitControllerTest.java Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java =================================================================== --- trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/AbstractDrawbridgeController.java 2008-04-22 02:06:41 UTC (rev 46) @@ -32,6 +32,10 @@ @Autowired protected DrawbridgeService drawbridgeService; + + public void setDrawbridgeService(DrawbridgeService drawbridgeService) { + this.drawbridgeService=drawbridgeService; + } protected String getValueFromRequestOrSession(String name, HttpServletRequest request){ return getValueFromRequestOrSession(name, request, true); Modified: trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java =================================================================== --- trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/MainMenuController.java 2008-04-22 02:06:41 UTC (rev 46) @@ -20,6 +20,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import net.sf.drawbridge.domain.DrawbridgeService; + import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/AddOrEditDatabaseSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -58,7 +58,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDatabasesRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDatabases.do",mav.getViewName()); assertEquals(new HashMap<String, Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -81,7 +81,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDatabasesRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDatabases.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -105,7 +105,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDatabasesRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDatabases.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -129,7 +129,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDatabasesRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDatabases.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/database/DeleteDatabaseSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -51,7 +51,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDatabasesRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDatabases.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -70,7 +70,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDatabasesRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDatabases.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/AddOrEditDriverSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -55,7 +55,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDriversRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDrivers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -76,7 +76,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDriversRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDrivers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -98,7 +98,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDriversRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDrivers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -120,7 +120,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDriversRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDrivers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/DeleteDriverSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/DeleteDriverSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/driver/DeleteDriverSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -51,7 +51,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDriversRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDrivers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -70,7 +70,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageDriversRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageDrivers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/AddOrEditGroupSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -60,7 +60,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageGroupsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageGroups.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -86,7 +86,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageGroupsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageGroups.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -109,7 +109,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageGroupsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageGroups.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -132,7 +132,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageGroupsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageGroups.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/DeleteGroupSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/DeleteGroupSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/group/DeleteGroupSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -51,7 +51,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageGroupsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageGroups.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -70,7 +70,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageGroupsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageGroups.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/AddOrEditJobSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -66,7 +66,7 @@ mockRequest.setParameter("schedule", "schedule"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageJobsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageJobs.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -91,7 +91,7 @@ mockRequest.setParameter("schedule", "schedule"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageJobsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageJobs.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -118,7 +118,7 @@ mockRequest.setParameter("schedule", "schedule"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageJobsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageJobs.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> expected=new ArrayList<StatusMessage>(); @@ -150,7 +150,7 @@ mockRequest.setParameter("schedule", "schedule"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageJobsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageJobs.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> expected=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/job/DeleteJobSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -58,7 +58,7 @@ mockRequest.setParameter("jobId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageJobsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageJobs.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -76,7 +76,7 @@ mockRequest.setParameter("jobId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageJobsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageJobs.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/AddOrEditRunAsSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -56,7 +56,7 @@ mockRequest.setParameter("databaseId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageRunAsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageRunAsAccounts.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -77,7 +77,7 @@ mockRequest.setParameter("databaseId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageRunAsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageRunAsAccounts.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -99,7 +99,7 @@ mockRequest.setParameter("databaseId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageRunAsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageRunAsAccounts.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -121,7 +121,7 @@ mockRequest.setParameter("databaseId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageRunAsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageRunAsAccounts.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/runas/DeleteRunAsSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -49,7 +49,7 @@ mockRequest.setParameter("runAsId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageRunAsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageRunAsAccounts.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -66,7 +66,7 @@ mockRequest.setParameter("runAsId", "1"); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageRunAsRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageRunAsAccounts.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/AddOrEditUserSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/AddOrEditUserSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/AddOrEditUserSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -66,7 +66,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageUsersRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageUsers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -95,7 +95,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageUsersRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageUsers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -121,7 +121,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageUsersRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageUsers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -147,7 +147,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageUsersRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageUsers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); Modified: trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/DeleteUserSubmitControllerTest.java =================================================================== --- trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/DeleteUserSubmitControllerTest.java 2008-04-22 01:45:33 UTC (rev 45) +++ trunk/drawbridge/src/test/net/sf/drawbridge/controller/user/DeleteUserSubmitControllerTest.java 2008-04-22 02:06:41 UTC (rev 46) @@ -52,7 +52,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageUsersRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageUsers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); @@ -71,7 +71,7 @@ login(mockRequest); ModelAndView mav=target.handleRequestInternal(mockRequest, null); - assertEquals("manageUsersRedirectView",mav.getViewName()); + assertEquals("redirect:/ManageUsers.do",mav.getViewName()); assertEquals(new HashMap<String,Object>(),mav.getModel()); List<StatusMessage> messageList=new ArrayList<StatusMessage>(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |