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 2016/09/07 03:13:25 UTC
[2/4] wicket git commit: Uses PageRequestHandlerTracker to check last
IRequestHandler encapsulated in IRequestHandlerDelegate
Uses PageRequestHandlerTracker to check last IRequestHandler encapsulated in IRequestHandlerDelegate
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ee51697b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ee51697b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ee51697b
Branch: refs/heads/wicket-7.x
Commit: ee51697b6807e9f73f82fcf430720f48918a8d66
Parents: 1496b9f
Author: Artur Micha\u0142owski <am...@gmail.com>
Authored: Mon Sep 5 02:29:44 2016 +0200
Committer: Artur Micha\u0142owski <am...@gmail.com>
Committed: Mon Sep 5 02:29:44 2016 +0200
----------------------------------------------------------------------
.../cycle/PageRequestHandlerTrackerTest.java | 80 +++++++++++++++++++-
1 file changed, 78 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ee51697b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
index a4dda7c..7d0d00d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java
@@ -18,11 +18,19 @@ package org.apache.wicket.request.cycle;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
+import org.apache.wicket.core.request.handler.RequestSettingRequestHandler;
+import org.apache.wicket.core.request.mapper.CryptoMapper;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.mapper.IRequestMapperDelegate;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -30,6 +38,13 @@ import org.junit.Test;
*/
public class PageRequestHandlerTrackerTest extends WicketTestCase
{
+
+ @Before
+ public void before()
+ {
+ tester.getApplication().getRequestCycleListeners().add(new PageRequestHandlerTracker());
+ }
+
/**
* Uses PageRequestHandlerTracker to track the requested page and the response page
* https://issues.apache.org/jira/browse/WICKET-4624
@@ -37,10 +52,21 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
@Test
public void trackPages()
{
- tester.getApplication().getRequestCycleListeners().add(new PageRequestHandlerTracker());
tester.startPage(new PageA());
-
}
+
+ /**
+ * Uses PageRequestHandlerTracker to check last IRequestHandler encapsulated in IRequestHandlerDelegate
+ */
+ @Test
+ public void trackPagesWithMapperDelegate()
+ {
+ IRequestMapper mapper = tester.getApplication().getRootRequestMapper();
+ tester.getApplication().setRootRequestMapper(new MapperDelegate(mapper));
+ tester.startPage(new PageA());
+ tester.getApplication().setRootRequestMapper(mapper);
+ }
+
/**
* The requested page
@@ -51,6 +77,10 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
protected void onBeforeRender()
{
super.onBeforeRender();
+
+ IPageRequestHandler lastHandler = PageRequestHandlerTracker.getLastHandler(getRequestCycle());
+ assertNotNull("Last handler is null: probably issue in IRequestHandlerDelegate support", lastHandler);
+
setResponsePage(new PageB());
}
@@ -86,4 +116,50 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase
return new StringResourceStream("<html/>");
}
}
+
+ /**
+ * Mapper which imitate behavior of {@link CryptoMapper#mapRequest(Request)}
+ */
+ private static class MapperDelegate implements IRequestMapperDelegate
+ {
+ IRequestMapper mapper;
+
+ public MapperDelegate(IRequestMapper mapper)
+ {
+ this.mapper = mapper;
+ }
+
+ @Override
+ public IRequestHandler mapRequest(Request request)
+ {
+ Request decryptedRequest = request.cloneWithUrl(request.getUrl());
+ IRequestHandler handler = mapper.mapRequest(decryptedRequest);
+
+ if (handler != null)
+ {
+ handler = new RequestSettingRequestHandler(decryptedRequest, handler);
+ }
+
+ return handler;
+ }
+
+ @Override
+ public int getCompatibilityScore(Request request)
+ {
+ return mapper.getCompatibilityScore(request);
+ }
+
+ @Override
+ public Url mapHandler(IRequestHandler requestHandler)
+ {
+ return mapper.mapHandler(requestHandler);
+ }
+
+ @Override
+ public IRequestMapper getDelegateMapper()
+ {
+ return mapper;
+ }
+
+ }
}