You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/02/17 08:20:38 UTC
svn commit: r1071524 - in /wicket/branches/wicket-1.4.x/wicket/src:
main/java/org/apache/wicket/protocol/http/MockWebApplication.java
test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Author: ivaynberg
Date: Thu Feb 17 07:20:38 2011
New Revision: 1071524
URL: http://svn.apache.org/viewvc?rev=1071524&view=rev
Log:
Issue: WICKET-1886
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=1071524&r1=1071523&r2=1071524&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Thu Feb 17 07:20:38 2011
@@ -558,13 +558,9 @@ public class MockWebApplication
if (httpResponse.isRedirect())
{
lastRenderedPage = generateLastRenderedPage(cycle);
-
- MockHttpServletRequest newHttpRequest = new MockHttpServletRequest(application,
- servletSession, application.getServletContext());
- newHttpRequest.setRequestToRedirectString(httpResponse.getRedirectLocation());
- wicketRequest = application.newWebRequest(newHttpRequest);
-
- cycle = createRequestCycle();
+ String redirectLocation = httpResponse.getRedirectLocation();
+ cycle = setupRequestAndResponse(false);
+ servletRequest.setRequestToRedirectString(redirectLocation);
cycle.request();
}
else
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=1071524&r1=1071523&r2=1071524&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Thu Feb 17 07:20:38 2011
@@ -40,6 +40,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.protocol.http.MockPage;
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy;
import org.apache.wicket.util.tester.MockPageParameterPage.MockInnerClassPage;
@@ -792,6 +793,30 @@ public class WicketTesterTest extends Te
assertEquals("value", tester.getWicketRequest().getCookie("name").getValue());
}
+ /**
+ * @see WICKET-1886
+ */
+ public void testCookiesIsFoundOnRedirectRequest()
+ {
+ MockPageWithLink testPage = new MockPageWithLink();
+ testPage.add(new Link<Void>(MockPageWithLink.LINK_ID)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick()
+ {
+ setResponsePage(MockPage.class);
+ setRedirect(true);
+ }
+ });
+ tester.startPage(testPage);
+ tester.getServletResponse().addCookie(new Cookie("name", "value"));
+ tester.clickLink(MockPageWithLink.LINK_ID);
+ tester.assertRenderedPage(MockPage.class);
+ assertEquals("value", tester.getWicketRequest().getCookie("name").getValue());
+ }
+
private void setTextFieldAndAssertSubmit(boolean expected)
{
tester.executeAjaxEvent("form:text", "onkeyup");