Author: jdonnerstag Date: Sat Dec 2 09:40:31 2006 New Revision: 481583 URL: http://svn.apache.org/viewvc?view=rev&rev=481583 Log: fixed [129] WicketTester cannot test applications with custom WebRequestCycle
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java?view=diff&rev=481583&r1=481582&r2=481583 ============================================================================== --- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java (original) +++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java Sat Dec 2 09:40:31 2006 @@ -26,6 +26,7 @@ import wicket.Application; import wicket.Component; +import wicket.IRequestCycleFactory; import wicket.IRequestTarget; import wicket.Page; import wicket.PageParameters; @@ -112,6 +113,9 @@ /** Session. */ private WebSession wicketSession; + /** Request cycle factory. */ + private IRequestCycleFactory requestCycleFactory; + /** The homepage */ private Class homePage; @@ -175,6 +179,7 @@ servletResponse = new MockHttpServletResponse(); wicketRequest = newWebRequest(servletRequest); wicketSession = getSession(wicketRequest); + requestCycleFactory = wicketSession.getRequestCycleFactory(); // set the default context path getApplicationSettings().setContextPath(context.getServletContextName()); @@ -274,7 +279,7 @@ public void processRequestCycle(final Component component) { setupRequestAndResponse(); - WebRequestCycle cycle = new WebRequestCycle(wicketSession, wicketRequest, wicketResponse); + WebRequestCycle cycle = createRequestCycle(); cycle.request(component); if (component instanceof Page) @@ -322,7 +327,7 @@ wicketRequest = newWebRequest(newHttpRequest); wicketSession = getSession(wicketRequest); - cycle = new WebRequestCycle(wicketSession, wicketRequest, wicketResponse); + cycle = createRequestCycle(); cycle.request(); } generateLastRenderedPage(cycle); @@ -377,7 +382,7 @@ */ public WebRequestCycle createRequestCycle() { - return new WebRequestCycle(wicketSession, wicketRequest, wicketResponse); + return (WebRequestCycle) requestCycleFactory.newRequestCycle(wicketSession, wicketRequest, wicketResponse); } /**