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 2010/10/20 15:24:35 UTC

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

Author: mgrigorov
Date: Wed Oct 20 13:24:35 2010
New Revision: 1025549

URL: http://svn.apache.org/viewvc?rev=1025549&view=rev
Log:
Remove duplicated code.

org.apache.wicket.util.tester.BaseWicketTester.submitAjaxFormSubmitBehavior(Component, AjaxFormSubmitBehavior) now delegates to #executeBehavior(ajaxSubmitFormBehavior).

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=1025549&r1=1025548&r2=1025549&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 Wed Oct 20 13:24:35 2010
@@ -48,6 +48,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.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
@@ -1600,7 +1601,9 @@ public class BaseWicketTester
 				" Component: " + component + "; Event: " + event);
 		}
 
-		executeBehavior(WicketTesterHelper.findAjaxEventBehavior(component, event));
+		AjaxEventBehavior ajaxEventBehavior = WicketTesterHelper.findAjaxEventBehavior(component,
+			event);
+		executeBehavior(ajaxEventBehavior);
 	}
 
 	/**
@@ -1662,13 +1665,7 @@ public class BaseWicketTester
 
 		serializeFormToRequest(form);
 
-		Url url = Url.parse(behavior.getCallbackUrl().toString(),
-			Charset.forName(request.getCharacterEncoding()));
-		transform(url);
-		request.addHeader("Wicket-Ajax-BaseURL", url.toString());
-		request.addHeader("Wicket-Ajax", "true");
-		request.setUrl(url);
-		processRequest(request, null);
+		executeBehavior(behavior);
 	}
 
 	/**