You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/02/21 03:47:14 UTC

svn commit: r1072826 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/util/tester/BaseWicketTester.java test/java/org/apache/wicket/request/handler/PageProviderTest.java

Author: ivaynberg
Date: Mon Feb 21 02:47:14 2011
New Revision: 1072826

URL: http://svn.apache.org/viewvc?rev=1072826&view=rev
Log:

Issue: WICKET-3461

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1072826&r1=1072825&r2=1072826&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Mon Feb 21 02:47:14 2011
@@ -50,6 +50,7 @@ import org.apache.wicket.Session;
 import org.apache.wicket.ThreadContext;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -654,18 +655,22 @@ public class BaseWicketTester
 	}
 
 	/**
+	 * This method tries to parse the last response to return the encoded base URL and will throw an
+	 * exception if there none was encoded.
 	 * 
-	 * @return last Wicket-Ajax-BaseURL set on AJAX HTTP request header
+	 * @return Wicket-Ajax-BaseURL set on last response by {@link AbstractDefaultAjaxBehavior}
+	 * @throws IOException
+	 * @throws ResourceStreamNotFoundException
+	 * @throws ParseException
 	 */
-	public String getWicketAjaxBaseUrlFromLastRequest() throws IOException,
+	public String getWicketAjaxBaseUrlEncodedInLastResponse() throws IOException,
 		ResourceStreamNotFoundException, ParseException
 	{
 		XmlPullParser parser = new XmlPullParser();
 		parser.parse(getLastResponseAsString());
 		XmlTag tag;
-		do
+		while ((tag = (XmlTag)parser.nextTag()) != null)
 		{
-			tag = (XmlTag)parser.nextTag();
 			if (tag.isOpen() && tag.getName().equals("script") &&
 				"wicket-ajax-base-url".equals(tag.getString("id")))
 			{
@@ -673,8 +678,8 @@ public class BaseWicketTester
 				return parser.getString().toString().split("\\\"")[1];
 			}
 		}
-		while (tag != null);
-		return null;
+		throw new WicketRuntimeException(
+			"Last response has no AJAX base URL set by AbstractDefaultAjaxBehavior.");
 	}
 
 	/**

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java?rev=1072826&r1=1072825&r2=1072826&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java Mon Feb 21 02:47:14 2011
@@ -109,7 +109,7 @@ public class PageProviderTest extends Wi
 	{
 		tester.getRequest().setUrl(url);
 		tester.getRequest().addHeader("Wicket-Ajax-BaseURL",
-			tester.getWicketAjaxBaseUrlFromLastRequest());
+			tester.getWicketAjaxBaseUrlEncodedInLastResponse());
 		tester.getRequest().addHeader("Wicket-Ajax", "true");
 		tester.processRequest();
 	}