You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/10/23 10:41:16 UTC
svn commit: r1026577 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/ test/java/org/apache/wicket/markup/html/link/
Author: mgrigorov
Date: Sat Oct 23 08:41:16 2010
New Revision: 1026577
URL: http://svn.apache.org/viewvc?rev=1026577&view=rev
Log:
Re-enable BookmarkablePageLinkTest
Use RequestCycle#replaceCurrentRequestHandler() instead of #scheduleRequestHandlerAfterCurrent() because the test pages have no markup and without this change the processing fails with "Markup for page not found". Now it behaves as in Wicket 1.4
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableContinueToPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=1026577&r1=1026576&r2=1026577&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java Sat Oct 23 08:41:16 2010
@@ -128,7 +128,7 @@ public class RestartResponseAtInterceptP
{
data.continueOk = true;
String url = RequestCycle.get().getUrlRenderer().renderUrl(data.originalUrl);
- RequestCycle.get().scheduleRequestHandlerAfterCurrent(new RedirectRequestHandler(url));
+ RequestCycle.get().replaceCurrentRequestHandler(new RedirectRequestHandler(url));
return true;
}
return false;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableContinueToPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableContinueToPage.java?rev=1026577&r1=1026576&r2=1026577&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableContinueToPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableContinueToPage.java Sat Oct 23 08:41:16 2010
@@ -30,8 +30,7 @@ public class BookmarkableContinueToPage
*/
public BookmarkableContinueToPage()
{
- // TODO NG
- // getPageMap().continueToOriginalDestination();
+ continueToOriginalDestination();
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=1026577&r1=1026576&r2=1026577&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Sat Oct 23 08:41:16 2010
@@ -50,10 +50,6 @@ public class BookmarkablePageLinkTest ex
*/
public void testBookmarkableRequestWithIntercept() throws Exception
{
- // TODO Wicket NG
- if (true)
- return;
-
tester.startPage(BookmarkableThrowsInterceptPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableSetSecurityPage.class);