Updated Branches: refs/heads/master 3d03a6a50 -> 6b5bcf651
WICKET-4850 BaseWicketTester discards cookies with MaxAge = -1 when processing a new request Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6b5bcf65 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6b5bcf65 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6b5bcf65 Branch: refs/heads/master Commit: 6b5bcf65126682eb555cc3460043bfb34e099f5f Parents: 8ba4602 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Nov 2 16:31:18 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Nov 2 16:31:18 2012 +0200 ---------------------------------------------------------------------- .../wicket/util/tester/BaseWicketTester.java | 5 ++++- .../wicket/util/tester/WicketTesterTest.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6b5bcf65/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java index 0a637e2..eca06ee 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java @@ -429,7 +429,10 @@ public class BaseWicketTester { for (Cookie cookie : cookies) { - if (cookie.getMaxAge() > 0) + // maxAge == -1 -> means session cookie + // maxAge == 0 -> delete the cookie + // maxAge > 0 -> the cookie will expire after this age + if (cookie.getMaxAge() != 0) { request.addCookie(cookie); } http://git-wip-us.apache.org/repos/asf/wicket/blob/6b5bcf65/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java index 06501c2..f85c0b9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java @@ -1085,14 +1085,14 @@ public class WicketTesterTest extends WicketTestCase } /** - * Tests that setting a cookie with age < 0 will not be stored after the request cycle. + * Tests that setting a cookie with age == 0 will not be stored after the request cycle. */ @Test public void dontTransferCookiesWithNegativeAge() { String cookieName = "wicket4289Name"; String cookieValue = "wicket4289Value"; - int cookieAge = -1; // age < 0 => do not store it + int cookieAge = 0; // age = 0 => do not store it Cookie cookie = new Cookie(cookieName, cookieValue); cookie.setMaxAge(cookieAge);
