svn commit: r909968 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

[iv...@apache.org]

Author: ivaynberg
Date: Sun Feb 14 04:19:07 2010
New Revision: 909968

URL: http://svn.apache.org/viewvc?rev=909968&view=rev
Log:
more tweaks

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=909968&r1=909967&r2=909968&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Sun Feb 14 04:19:07 2010
@@ -479,7 +479,9 @@
 	 */
 	public Url urlFor(IRequestHandler handler)
 	{
-		return application.getRootRequestMapper().mapHandler(handler);
+		Url url = application.getRootRequestMapper().mapHandler(handler);
+		transform(url);
+		return url;
 	}
 
 
@@ -579,6 +581,7 @@
 	public void executeBehavior(final AbstractAjaxBehavior behavior)
 	{
 		Url url = Url.parse(behavior.getCallbackUrl().toString());
+		transform(url);
 		processRequest(new MockWebRequest(url), null);
 	}
 
@@ -1006,6 +1009,7 @@
 						bookmarkablePageLink, (Object[])null);
 
 					startPage(bookmarkablePageLink.getPageClass(), parameters);
+					return;
 				}
 				catch (Exception e)
 				{
@@ -1040,13 +1044,24 @@
 		Url url = Url.parse(form.urlFor(IFormSubmitListener.INTERFACE).toString());
 
 		// make url absolute
+		transform(url);
+
+		request.setUrl(url);
+		processRequest();
+	}
+
+	/**
+	 * make url suitable for wicket tester use. usually this involves stripping any leading ..
+	 * segments to make the url absolute
+	 * 
+	 * @param url
+	 */
+	private void transform(Url url)
+	{
 		while (url.getSegments().size() > 0 && url.getSegments().get(0).equals(".."))
 		{
 			url.getSegments().remove(0);
 		}
-
-		request.setUrl(url);
-		processRequest();
 	}