Updated Branches: refs/heads/wicket-1.5.x 864f0038a -> 57ee0b76f
WICKET-4810 CLONE - BaseWicketTester.clickLink() does not work with a ResourceLink with ResourceReference Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/57ee0b76 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/57ee0b76 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/57ee0b76 Branch: refs/heads/wicket-1.5.x Commit: 57ee0b76f013e3b5815376c99eaa6d084885a232 Parents: 864f003 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Oct 10 08:24:50 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Oct 10 08:25:54 2012 +0300 ---------------------------------------------------------------------- .../wicket/util/tester/BaseWicketTester.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/57ee0b76/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 6aa8b38..6deab0e 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 @@ -41,14 +41,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import junit.framework.AssertionFailedError; - import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.IPageManagerProvider; import org.apache.wicket.IPageRendererProvider; import org.apache.wicket.IRequestCycleProvider; import org.apache.wicket.IRequestListener; -import org.apache.wicket.IResourceListener; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Page; import org.apache.wicket.RequestListenerInterface; @@ -1941,7 +1939,6 @@ public class BaseWicketTester BookmarkablePageLink<?> bookmarkablePageLink = (BookmarkablePageLink<?>)link; try { - BookmarkablePageLink.class.getDeclaredField("parameters"); Method getParametersMethod = BookmarkablePageLink.class.getDeclaredMethod( "getPageParameters", (Class<?>[])null); getParametersMethod.setAccessible(true); @@ -1959,7 +1956,17 @@ public class BaseWicketTester } else if (link instanceof ResourceLink) { - executeListener(link, IResourceListener.INTERFACE); + try + { + Method getURL = ResourceLink.class.getDeclaredMethod("getURL", new Class[0]); + getURL.setAccessible(true); + CharSequence url = (CharSequence) getURL.invoke(link); + executeUrl(url.toString()); + } + catch (Exception x) + { + throw new RuntimeException("An error occurred while clicking on a ResourceLink", x); + } } else {
