svn commit: r1097092 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

[mgrigorov]

Author: mgrigorov
Date: Wed Apr 27 12:19:15 2011
New Revision: 1097092

URL: http://svn.apache.org/viewvc?rev=1097092&view=rev
Log:
WICKET-3616 Wicket Tester behavior changed - Form Tester Ajax Submit clears 
already filled in TextField

First create the Request and then set the parameters directly in its map.


Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1097092&r1=1097091&r2=1097092&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
 Wed Apr 27 12:19:15 2011
@@ -825,10 +825,10 @@ public class BaseWicketTester extends Mo
                        String failMessage = "No form submit behavior found on 
the submit link. Strange!!";
                        notNull(failMessage, ajaxFormSubmitBehavior);
 
-                       setupAjaxSubmitRequestParameters(linkComponent, 
ajaxFormSubmitBehavior);
-
                        WebRequestCycle requestCycle = 
setupRequestAndResponse(true);
 
+                       setupAjaxSubmitRequestParameters(linkComponent, 
ajaxFormSubmitBehavior);
+
                        // Ok, finally we "click" the link
                        ajaxFormSubmitBehavior.onRequest();
 
@@ -1409,7 +1409,8 @@ public class BaseWicketTester extends Mo
 
                checkUsability(form);
 
-               final Map<String, String[]> requestParams = 
getParametersForNextRequest();
+               final Map<String, Object> requestParameters = 
getServletRequest().getParameterMap();
+
                /*
                 * Means that an button or an ajax link was clicked and needs 
to be added to the request
                 * parameters to their form component correctly resolves the 
submit origin
@@ -1422,7 +1423,7 @@ public class BaseWicketTester extends Mo
                else if (component instanceof AjaxSubmitLink)
                {
                        String inputName = 
((IFormSubmittingComponent)component).getInputName();
-                       requestParams.put(inputName, new String[] { "x" });
+                       requestParameters.put(inputName, new String[] { "x" });
                }
 
                form.visitFormComponents(new FormComponent.AbstractVisitor()
@@ -1446,9 +1447,9 @@ public class BaseWicketTester extends Mo
 
                                                // Set request parameter with 
the field value, but do not modify an existing
                                                // request parameter explicitly 
set using FormTester.setValue()
-                                               if (requestParams.get(name) == 
null)
+                                               if 
(requestParameters.containsKey(name) == false)
                                                {
-                                                       requestParams.put(name, 
new String[] { value });
+                                                       
requestParameters.put(name, new String[] { value });
                                                }
                                        }
                                }