Author: ivaynberg
Date: Fri Aug 27 23:59:11 2010
New Revision: 990306
URL: http://svn.apache.org/viewvc?rev=990306&view=rev
Log:
Issue: WICKET-1094
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=990306&r1=990305&r2=990306&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
Fri Aug 27 23:59:11 2010
@@ -379,7 +379,8 @@ public class FormTester
@Override
public void onFormComponent(final FormComponent<?>
formComponent, IVisit<Void> visit)
{
- // do nothing for invisible or disabled
component -- the browser would not send any parameter
+ // do nothing for invisible or disabled
component -- the browser would not send any
+// parameter
// for a disabled component
if (!(formComponent.isVisibleInHierarchy() &&
formComponent.isEnabledInHierarchy()))
{
@@ -390,7 +391,7 @@ public class FormTester
// blank String if required
if (formComponent instanceof
AbstractTextComponent)
{
- if
(Strings.isEmpty(formComponent.getValue()))
+ if
(Strings.isEmpty(getFormComponentValue(formComponent)))
{
if (fillBlankString)
{
@@ -399,17 +400,17 @@ public class FormTester
}
else
{
-
setFormComponentValue(formComponent, formComponent.getValue());
+
setFormComponentValue(formComponent, getFormComponentValue(formComponent));
}
}
else if ((formComponent instanceof
DropDownChoice) ||
(formComponent instanceof RadioChoice)
|| (formComponent instanceof CheckBox))
{
- setFormComponentValue(formComponent,
formComponent.getValue());
+ setFormComponentValue(formComponent,
getFormComponentValue(formComponent));
}
else if (formComponent instanceof
ListMultipleChoice)
{
- final String[] modelValues =
formComponent.getValue().split(
+ final String[] modelValues =
getFormComponentValue(formComponent).split(
FormComponent.VALUE_SEPARATOR);
for (String modelValue : modelValues)
{
@@ -426,7 +427,7 @@ public class FormTester
if
(checkGroupValues.contains(component.getDefaultModelObject()))
{
addFormComponentValue(formComponent,
-
((Check<?>)component).getValue());
+
getFormComponentValue((Check<?>)component));
}
}
});
@@ -447,7 +448,7 @@ public class FormTester
if
(value.equals(component.getDefaultModelObject()))
{
addFormComponentValue(formComponent,
-
((Radio<?>)component).getValue());
+
getFormComponentValue((Radio<?>)component));
visit.stop();
}
else
@@ -460,6 +461,32 @@ public class FormTester
}
}
+ private String getFormComponentValue(final
FormComponent<?> formComponent)
+ {
+ boolean oldEscape =
formComponent.getEscapeModelStrings();
+ formComponent.setEscapeModelStrings(false);
+ String val = formComponent.getValue();
+ formComponent.setEscapeModelStrings(oldEscape);
+ return val;
+ }
+
+ private String getFormComponentValue(final Check<?>
formComponent)
+ {
+ boolean oldEscape =
formComponent.getEscapeModelStrings();
+ formComponent.setEscapeModelStrings(false);
+ String val = formComponent.getValue();
+ formComponent.setEscapeModelStrings(oldEscape);
+ return val;
+ }
+
+ private String getFormComponentValue(final Radio<?>
formComponent)
+ {
+ boolean oldEscape =
formComponent.getEscapeModelStrings();
+ formComponent.setEscapeModelStrings(false);
+ String val = formComponent.getValue();
+ formComponent.setEscapeModelStrings(oldEscape);
+ return val;
+ }
});
workingForm.detach();
}
@@ -746,8 +773,9 @@ public class FormTester
{
if (parameterExist(formComponent))
{
- List<StringValue> values =
tester.getRequest().getPostParameters().getParameterValues(
- formComponent.getInputName());
+ List<StringValue> values = tester.getRequest()
+ .getPostParameters()
+
.getParameterValues(formComponent.getInputName());
// remove duplicated
HashSet<String> all = new HashSet<String>();
@@ -762,8 +790,9 @@ public class FormTester
{
values.add(StringValue.valueOf(val));
}
-
tester.getRequest().getPostParameters().setParameterValues(
- formComponent.getInputName(), values);
+ tester.getRequest()
+ .getPostParameters()
+
.setParameterValues(formComponent.getInputName(), values);
}
else
{
@@ -793,8 +822,10 @@ public class FormTester
*/
private boolean parameterExist(FormComponent<?> formComponent)
{
- String parameter =
tester.getRequest().getPostParameters().getParameterValue(
- formComponent.getInputName()).toString();
+ String parameter = tester.getRequest()
+ .getPostParameters()
+ .getParameterValue(formComponent.getInputName())
+ .toString();
return parameter != null && parameter.trim().length() > 0;
}
@@ -808,8 +839,9 @@ public class FormTester
*/
private void setFormComponentValue(FormComponent<?> formComponent,
String value)
{
-
tester.getRequest().getPostParameters().setParameterValue(formComponent.getInputName(),
- value);
+ tester.getRequest()
+ .getPostParameters()
+ .setParameterValue(formComponent.getInputName(), value);
}
/**
