You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/09/07 03:55:29 UTC
svn commit: r279207 [1/2] - in /jakarta/tapestry/trunk: ./
framework/src/java/org/apache/tapestry/components/
framework/src/java/org/apache/tapestry/form/
framework/src/test/org/apache/tapestry/
framework/src/test/org/apache/tapestry/form/ framework/sr...
Author: hlship
Date: Tue Sep 6 18:55:19 2005
New Revision: 279207
URL: http://svn.apache.org/viewcvs?rev=279207&view=rev
Log:
TAPESTRY-606: ListEdit components should not attempt to take focus
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/ForBean.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ListEdit.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioGroup.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestFieldLabel.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java
jakarta/tapestry/trunk/status.xml
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/ForBean.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/ForBean.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/ForBean.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/ForBean.java Tue Sep 6 18:55:19 2005
@@ -556,4 +556,24 @@
return DESC_PRIMARY_KEY + getDataSqueezer().squeeze(pk);
}
}
+
+ /**
+ * For component can not take focus.
+ */
+ protected boolean getCanTakeFocus() {
+ return false;
+ }
+
+ public String getClientId()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public String getDisplayName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/components/IfBean.java Tue Sep 6 18:55:19 2005
@@ -199,4 +199,11 @@
{
}
+ /**
+ * For component can not take focus.
+ */
+ protected boolean getCanTakeFocus()
+ {
+ return false;
+ }
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java Tue Sep 6 18:55:19 2005
@@ -117,18 +117,16 @@
}
else if (!cycle.isRewinding())
{
- boolean canFocus = getCanTakeFocus();
-
- if (canFocus && !isDisabled())
- delegate.registerForFocus(this, ValidationConstants.NORMAL_FIELD);
-
renderFormComponent(writer, cycle);
- // Can't think of a component that can be in error and not take focus,
- // but whatever ...
-
- if (canFocus && delegate.isInError())
- delegate.registerForFocus(this, ValidationConstants.ERROR_FIELD);
+ if (getCanTakeFocus() && !isDisabled())
+ {
+ delegate.registerForFocus(
+ this,
+ delegate.isInError() ? ValidationConstants.ERROR_FIELD
+ : ValidationConstants.NORMAL_FIELD);
+ }
+
}
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ListEdit.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ListEdit.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ListEdit.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ListEdit.java Tue Sep 6 18:55:19 2005
@@ -179,4 +179,27 @@
*/
public abstract ListenerInvoker getListenerInvoker();
+
+ /**
+ * Returns false; ListEdit components can't take focus.
+ *
+ * @since 4.0
+ */
+ protected boolean getCanTakeFocus()
+ {
+ return false;
+ }
+
+ public String getClientId()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getDisplayName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioGroup.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioGroup.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioGroup.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioGroup.java Tue Sep 6 18:55:19 2005
@@ -101,7 +101,7 @@
public void updateSelection(Object value)
{
getBinding("selected").setObject(value);
-
+
_selection = value;
}
@@ -122,7 +122,7 @@
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
throw new ApplicationRuntimeException(Tapestry.getMessage("RadioGroup.may-not-nest"),
this, null, null);
-
+
cycle.setAttribute(ATTRIBUTE_NAME, this);
_rendering = true;
@@ -136,42 +136,44 @@
{
_rendering = false;
_selection = null;
-
+
cycle.removeAttribute(ATTRIBUTE_NAME);
}
/**
- * @see org.apache.tapestry.form.AbstractRequirableField#renderFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.form.AbstractRequirableField#renderFormComponent(org.apache.tapestry.IMarkupWriter,
+ * org.apache.tapestry.IRequestCycle)
*/
protected void renderFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
_rewinding = false;
-
+
// For rendering, the Radio components need to know what the current
// selection is, so that the correct one can mark itself 'checked'.
_selection = getBinding("selected").getObject();
-
+
renderBody(writer, cycle);
-
+
getValidatableFieldSupport().renderContributions(this, writer, cycle);
}
/**
- * @see org.apache.tapestry.form.AbstractFormComponent#rewindFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.form.AbstractFormComponent#rewindFormComponent(org.apache.tapestry.IMarkupWriter,
+ * org.apache.tapestry.IRequestCycle)
*/
protected void rewindFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = cycle.getParameter(getName());
-
+
if (value == null)
_selectedOption = -1;
else
_selectedOption = Integer.parseInt(value);
-
+
_rewinding = true;
-
+
renderBody(writer, cycle);
-
+
try
{
getValidatableFieldSupport().validate(this, writer, cycle, _selection);
@@ -193,5 +195,13 @@
public boolean isRequired()
{
return getValidatableFieldSupport().isRequired(this);
+ }
+
+ /**
+ * This component can not take focus.
+ */
+ protected boolean getCanTakeFocus()
+ {
+ return false;
}
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Tue Sep 6 18:55:19 2005
@@ -96,15 +96,15 @@
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
- trainIsRewinding(control, cycle, rewinding);
+ trainIsRewinding(cycle, rewinding);
return cycle;
}
- protected void trainIsRewinding(MockControl control, IRequestCycle cycle, boolean rewinding)
+ protected void trainIsRewinding(IRequestCycle cycle, boolean rewinding)
{
cycle.isRewinding();
- control.setReturnValue(rewinding);
+ getControl(cycle).setReturnValue(rewinding);
}
protected IRequestCycle newCycleGetPage(String pageName, IPage page)
@@ -218,13 +218,6 @@
return page;
}
- protected void trainGetAttribute(MockControl cyclec, IRequestCycle cycle, String key,
- Object value)
- {
- cycle.getAttribute(key);
- cyclec.setReturnValue(value);
- }
-
protected IForm newForm()
{
return (IForm) newMock(IForm.class);
@@ -254,16 +247,16 @@
protected void trainGetAttribute(IRequestCycle cycle, String attributeName, Object attribute)
{
MockControl control = getControl(cycle);
-
+
cycle.getAttribute(attributeName);
-
+
control.setReturnValue(attribute);
}
protected void trainGetUniqueId(IRequestCycle cycle, String id, String uniqueId)
{
MockControl control = getControl(cycle);
-
+
cycle.getUniqueId(id);
control.setReturnValue(uniqueId);
}
@@ -271,7 +264,7 @@
protected void trainGetIdPath(IComponent component, String idPath)
{
MockControl control = getControl(component);
-
+
component.getIdPath();
control.setReturnValue(idPath);
}
@@ -279,7 +272,7 @@
protected void trainGetParameter(IRequestCycle cycle, String name, String value)
{
MockControl control = getControl(cycle);
-
+
cycle.getParameter(name);
control.setReturnValue(value);
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java Tue Sep 6 18:55:19 2005
@@ -23,7 +23,6 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.TapestryUtils;
import org.apache.tapestry.valid.IValidationDelegate;
-import org.easymock.MockControl;
/**
* Base class for tests of implementations of {@link org.apache.tapestry.form.IFormComponent}.
@@ -39,11 +38,11 @@
return (IValidationDelegate) newMock(IValidationDelegate.class);
}
- protected void trainIsInError(MockControl control, IValidationDelegate delegate,
- boolean isInError)
+ protected void trainIsInError(IValidationDelegate delegate, boolean isInError)
{
delegate.isInError();
- control.setReturnValue(isInError);
+
+ getControl(delegate).setReturnValue(isInError);
}
protected IForm newForm()
@@ -51,44 +50,45 @@
return (IForm) newMock(IForm.class);
}
- protected void trainGetForm(MockControl control, IRequestCycle cycle, IForm form)
+ protected void trainGetForm(IRequestCycle cycle, IForm form)
{
cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- control.setReturnValue(form);
+
+ getControl(cycle).setReturnValue(form);
}
- protected void trainGetDelegate(MockControl control, IForm form, IValidationDelegate delegate)
+ protected void trainGetDelegate(IForm form, IValidationDelegate delegate)
{
form.getDelegate();
- control.setReturnValue(delegate);
+
+ getControl(form).setReturnValue(delegate);
}
- protected void trainGetParameter(MockControl control, IRequestCycle cycle,
- String parameterName, String parameterValue)
+ protected void trainGetParameter(IRequestCycle cycle, String parameterName,
+ String parameterValue)
{
cycle.getParameter(parameterName);
- control.setReturnValue(parameterValue);
+ getControl(cycle).setReturnValue(parameterValue);
}
- protected void trainWasPrerendered(MockControl control, IForm form, IMarkupWriter writer,
- IComponent component, boolean wasPrerendered)
+ protected void trainWasPrerendered(IForm form, IMarkupWriter writer, IComponent component,
+ boolean wasPrerendered)
{
form.wasPrerendered(writer, component);
- control.setReturnValue(wasPrerendered);
+ getControl(form).setReturnValue(wasPrerendered);
}
- protected void trainIsRewinding(MockControl control, IForm form, boolean isRewinding)
+ protected void trainIsRewinding(IForm form, boolean isRewinding)
{
form.isRewinding();
- control.setReturnValue(isRewinding);
+ getControl(form).setReturnValue(isRewinding);
}
- protected void trainGetElementId(MockControl control, IForm form, IFormComponent component,
- String name)
+ protected void trainGetElementId(IForm form, IFormComponent component, String name)
{
form.getElementId(component);
component.setName(name);
- control.setReturnValue(name);
+ getControl(form).setReturnValue(name);
}
protected IBinding newBinding()
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java Tue Sep 6 18:55:19 2005
@@ -93,7 +93,7 @@
prs.addExternalScript(expected);
- trainGetAttribute(cyclec, cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
+ trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
replayControls();
@@ -124,7 +124,7 @@
prs.addInitializationScript("Tapestry.onsubmit('myform', foo);");
- trainGetAttribute(cyclec, cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
+ trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
replayControls();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java Tue Sep 6 18:55:19 2005
@@ -57,9 +57,9 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, true);
+ trainWasPrerendered(form, writer, submit, true);
replayControls();
@@ -83,20 +83,20 @@
ImageSubmit submit = (ImageSubmit) creator.newInstance(ImageSubmit.class, new Object[]
{ "image", image });
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(submit);
delegatec.setVoidCallable();
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "image");
@@ -105,9 +105,9 @@
writer.attribute("src", "image-url");
writer.closeTag();
- delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
+ trainIsInError(delegate, false);
- trainIsInError(delegatec, delegate, false);
+ delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
replayControls();
@@ -131,20 +131,20 @@
ImageSubmit submit = (ImageSubmit) creator.newInstance(ImageSubmit.class, new Object[]
{ "disabledImage", image, "disabled", Boolean.TRUE });
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "image");
@@ -154,8 +154,6 @@
writer.attribute("src", "disabled-image-url");
writer.closeTag();
- trainIsInError(delegatec, delegate, false);
-
replayControls();
submit.renderComponent(writer, cycle);
@@ -178,20 +176,20 @@
ImageSubmit submit = (ImageSubmit) creator.newInstance(ImageSubmit.class, new Object[]
{ "image", image, "disabled", Boolean.TRUE });
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "image");
@@ -201,8 +199,6 @@
writer.attribute("src", "image-url");
writer.closeTag();
- trainIsInError(delegatec, delegate, false);
-
replayControls();
submit.renderComponent(writer, cycle);
@@ -225,9 +221,9 @@
ImageSubmit submit = (ImageSubmit) creator.newInstance(ImageSubmit.class, new Object[]
{ "image", image, "nameOverride", "barney" });
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
@@ -237,9 +233,9 @@
form.getElementId(submit, "barney");
formc.setReturnValue("barney$0");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "image");
@@ -248,9 +244,9 @@
writer.attribute("src", "image-url");
writer.closeTag();
- delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
+ trainIsInError(delegate, false);
- trainIsInError(delegatec, delegate, false);
+ delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
replayControls();
@@ -272,18 +268,18 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
replayControls();
@@ -304,20 +300,20 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred.x", null);
+ trainGetParameter(cycle, "fred.x", null);
replayControls();
@@ -342,20 +338,20 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred.x", "33");
+ trainGetParameter(cycle, "fred.x", "33");
replayControls();
@@ -390,22 +386,22 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred.x", "33");
- trainGetParameter(cyclec, cycle, "fred.x", "33");
- trainGetParameter(cyclec, cycle, "fred.y", "19");
+ trainGetParameter(cycle, "fred.x", "33");
+ trainGetParameter(cycle, "fred.x", "33");
+ trainGetParameter(cycle, "fred.y", "19");
replayControls();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java Tue Sep 6 18:55:19 2005
@@ -48,9 +48,9 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, true);
+ trainWasPrerendered(form, writer, submit, true);
replayControls();
@@ -72,29 +72,29 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(submit);
delegatec.setVoidCallable();
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "submit");
writer.attribute("name", "fred");
writer.closeTag();
- delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
+ trainIsInError(delegate, false);
- trainIsInError(delegatec, delegate, false);
+ delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
replayControls();
@@ -117,20 +117,20 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(submit);
delegatec.setVoidCallable();
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "submit");
@@ -138,8 +138,6 @@
writer.attribute("disabled", "disabled");
writer.closeTag();
- trainIsInError(delegatec, delegate, false);
-
replayControls();
submit.renderComponent(writer, cycle);
@@ -161,20 +159,20 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(submit);
delegatec.setVoidCallable();
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
+ trainIsRewinding(form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainIsRewinding(cycle, false);
writer.beginEmpty("input");
writer.attribute("type", "submit");
@@ -182,9 +180,9 @@
writer.attribute("value", "flintstone");
writer.closeTag();
- delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
+ trainIsInError(delegate, false);
- trainIsInError(delegatec, delegate, false);
+ delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
replayControls();
@@ -206,18 +204,18 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
replayControls();
@@ -238,19 +236,19 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, true);
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, true);
replayControls();
@@ -271,20 +269,20 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred", null);
+ trainGetParameter(cycle, "fred", null);
replayControls();
@@ -309,20 +307,20 @@
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
- trainWasPrerendered(formc, form, writer, submit, false);
+ trainWasPrerendered(form, writer, submit, false);
form.getDelegate();
formc.setReturnValue(delegate);
delegate.setFormComponent(submit);
- trainGetElementId(formc, form, submit, "fred");
+ trainGetElementId(form, submit, "fred");
- trainIsRewinding(formc, form, true);
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred", "flintstone");
+ trainGetParameter(cycle, "fred", "flintstone");
replayControls();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java Tue Sep 6 18:55:19 2005
@@ -52,16 +52,16 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "barney", " text area value ");
+ trainGetParameter(cycle, "barney", " text area value ");
try
{
@@ -105,16 +105,16 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "barney", " text area value ");
+ trainGetParameter(cycle, "barney", " text area value ");
ValidatorException exception = new ValidatorException("test");
@@ -128,7 +128,7 @@
unreachable();
}
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.record(exception);
replayControls();
@@ -161,16 +161,16 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "barney", " text area value ");
+ trainGetParameter(cycle, "barney", " text area value ");
ValidatorException exception = new ValidatorException("test");
@@ -187,7 +187,7 @@
unreachable();
}
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.record(exception);
replayControls();
@@ -211,8 +211,8 @@
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, true);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, true);
replayControls();
@@ -235,15 +235,15 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, true);
replayControls();
@@ -266,14 +266,14 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
replayControls();
@@ -304,21 +304,21 @@
TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", " text area value " });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, " text area value ");
tfsc.setReturnValue("text area value");
@@ -355,21 +355,21 @@
TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", " text area value ", "disabled", Boolean.TRUE });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, " text area value ");
tfsc.setReturnValue("text area value");
@@ -410,21 +410,21 @@
component.setBinding("informal", binding);
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, " text area value ");
tfsc.setReturnValue("text area value");
@@ -461,21 +461,21 @@
TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, null);
tfsc.setReturnValue("");
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java Tue Sep 6 18:55:19 2005
@@ -52,16 +52,16 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "barney", "10");
+ trainGetParameter(cycle, "barney", "10");
Integer value = new Integer(10);
@@ -107,16 +107,16 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "barney", "10");
+ trainGetParameter(cycle, "barney", "10");
ValidatorException exception = new ValidatorException("test");
@@ -130,7 +130,7 @@
unreachable();
}
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.record(exception);
replayControls();
@@ -163,16 +163,16 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "barney", "10");
+ trainGetParameter(cycle, "barney", "10");
ValidatorException exception = new ValidatorException("test");
@@ -191,7 +191,7 @@
unreachable();
}
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.record(exception);
replayControls();
@@ -215,8 +215,8 @@
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, true);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, true);
replayControls();
@@ -239,15 +239,15 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, true);
replayControls();
@@ -270,14 +270,14 @@
IValidationDelegate delegate = newDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "barney");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "barney");
+ trainIsRewinding(form, true);
replayControls();
@@ -308,21 +308,21 @@
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", new Integer(10) });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, new Integer(10));
tfsc.setReturnValue("10");
@@ -359,21 +359,21 @@
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", new Integer(10), "hidden", Boolean.TRUE });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, new Integer(10));
tfsc.setReturnValue("10");
@@ -410,21 +410,21 @@
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", new Integer(10), "disabled", Boolean.TRUE });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, new Integer(10));
tfsc.setReturnValue("10");
@@ -465,21 +465,21 @@
component.setBinding("informal", binding);
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, new Integer(10));
tfsc.setReturnValue("10");
@@ -516,21 +516,21 @@
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
delegate.setFormComponent(component);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
tfs.format(component, null);
tfsc.setReturnValue("");
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java Tue Sep 6 18:55:19 2005
@@ -73,7 +73,7 @@
infra.getClassResolver();
infrac.setReturnValue(cr);
- trainGetAttribute(cyclec, cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
+ trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
return cycle;
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java Tue Sep 6 18:55:19 2005
@@ -79,7 +79,7 @@
infra.getClassResolver();
infrac.setReturnValue(cr);
- trainGetAttribute(cyclec, cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
+ trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
return cycle;
}
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestFieldLabel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestFieldLabel.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestFieldLabel.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestFieldLabel.java Tue Sep 6 18:55:19 2005
@@ -97,8 +97,8 @@
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
- trainIsRewinding(cyclec, cycle, false);
- trainGetForm(cyclec, cycle, form);
+ trainIsRewinding(cycle, false);
+ trainGetForm(cycle, form);
replayControls();
@@ -120,8 +120,8 @@
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
- trainIsRewinding(cyclec, cycle, false);
- trainGetForm(cyclec, cycle, form);
+ trainIsRewinding(cycle, false);
+ trainGetForm(cycle, form);
replayControls();
@@ -146,8 +146,8 @@
IBinding binding = newBinding(l);
IPage page = newFred();
- trainIsRewinding(cyclec, cycle, false);
- trainGetForm(cyclec, cycle, form);
+ trainIsRewinding(cycle, false);
+ trainGetForm(cycle, form);
replayControls();
@@ -187,8 +187,8 @@
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
- trainIsRewinding(cyclec, cycle, false);
- trainGetForm(cyclec, cycle, form);
+ trainIsRewinding(cycle, false);
+ trainGetForm(cycle, form);
FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
{ "location", l, "field", field });
@@ -221,8 +221,8 @@
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
- trainIsRewinding(cyclec, cycle, false);
- trainGetForm(cyclec, cycle, form);
+ trainIsRewinding(cycle, false);
+ trainGetForm(cycle, form);
FieldLabel fl = (FieldLabel) newInstance(FieldLabel.class, new Object[]
{ "location", l, "field", field });
@@ -254,8 +254,8 @@
MockControl cyclec = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
- trainIsRewinding(cyclec, cycle, false);
- trainGetForm(cyclec, cycle, form);
+ trainIsRewinding(cycle, false);
+ trainGetForm(cycle, form);
Location l = newLocation();
IPage page = newFred();
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java?rev=279207&r1=279206&r2=279207&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java (original)
+++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/valid/TestValidField.java Tue Sep 6 18:55:19 2005
@@ -46,11 +46,11 @@
IMarkupWriter writer = newWriter();
- trainGetForm(cyclec, cycle, form);
+ trainGetForm(cycle, form);
ValidField component = (ValidField) newInstance(ValidField.class);
- trainWasPrerendered(formc, form, writer, component, true);
+ trainWasPrerendered(form, writer, component, true);
replayControls();
@@ -79,15 +79,15 @@
MockControl delegatec = newControl(IValidationDelegate.class);
IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, true);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, true);
replayControls();
@@ -124,18 +124,18 @@
MockControl delegatec = newControl(IValidationDelegate.class);
IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred", "fred-value");
+ trainGetParameter(cycle, "fred", "fred-value");
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
delegate.recordFieldInputValue("fred-value");
@@ -175,16 +175,16 @@
MockControl delegatec = newControl(IValidationDelegate.class);
IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
delegate.setFormComponent(component);
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, true);
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, true);
- trainGetParameter(cyclec, cycle, "fred", "fred-value");
+ trainGetParameter(cycle, "fred", "fred-value");
replayControls();
@@ -224,16 +224,16 @@
MockDelegate delegate = new MockDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
-
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
+
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
trainToString(validatorc, validator, component, value, "fred value");
@@ -283,16 +283,16 @@
MockDelegate delegate = new MockDelegate();
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
-
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
+
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
trainToString(validatorc, validator, component, null, null);
@@ -316,13 +316,6 @@
assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" class=\"validation-delegate\"/></span>");
}
- protected void trainGetAttribute(MockControl control, IRequestCycle cycle, String name,
- Object object)
- {
- cycle.getAttribute(name);
- control.setReturnValue(object);
- }
-
public void testRenderWithError()
{
Object value = new Object();
@@ -343,16 +336,16 @@
MockDelegate delegate = new MockDelegate(true);
delegate.recordFieldInputValue("recorded field value");
- trainGetForm(cyclec, cycle, form);
- trainWasPrerendered(formc, form, writer, component, false);
- trainGetDelegate(formc, form, delegate);
-
- trainGetElementId(formc, form, component, "fred");
- trainIsRewinding(formc, form, false);
- trainIsRewinding(cyclec, cycle, false);
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
+
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
- trainGetDelegate(formc, form, delegate);
- trainGetDelegate(formc, form, delegate);
+ trainGetDelegate(form, delegate);
+ trainGetDelegate(form, delegate);
validator.isRequired();
validatorc.setReturnValue(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org