Updated Branches: refs/heads/wicket-6.x 71eaf5161 -> ea6d61558
WICKET-5424 make sure no page instance is created in redirect Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ea6d6155 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ea6d6155 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ea6d6155 Branch: refs/heads/wicket-6.x Commit: ea6d615580e2fbe3c0debd740afc1c8493ddcb59 Parents: 71eaf51 Author: svenmeier <[email protected]> Authored: Thu Dec 19 15:16:03 2013 +0100 Committer: svenmeier <[email protected]> Committed: Thu Dec 19 15:16:03 2013 +0100 ---------------------------------------------------------------------- .../request/handler/render/WebPageRendererTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ea6d6155/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java index 3ce620c..5af4df4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java @@ -26,14 +26,16 @@ import static org.mockito.Mockito.when; import java.util.concurrent.atomic.AtomicBoolean; +import junit.framework.AssertionFailedError; + +import org.apache.wicket.core.request.handler.IPageProvider; +import org.apache.wicket.core.request.handler.RenderPageRequestHandler; +import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy; import org.apache.wicket.protocol.http.BufferedWebResponse; import org.apache.wicket.request.Url; import org.apache.wicket.request.UrlRenderer; import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.core.request.handler.IPageProvider; -import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy; import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.settings.IRequestCycleSettings; @@ -395,6 +397,9 @@ public class WebPageRendererTest }; + when(provider.getPageInstance()).thenThrow( + new AssertionFailedError("no page instance should be created")); + when(urlRenderer.getBaseUrl()).thenReturn(Url.parse("a")); when(requestCycle.mapUrlFor(eq(handler))).thenReturn(Url.parse("b"));
