You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/27 20:21:40 UTC
svn commit: r417545 [6/12] - in /tapestry/tapestry4/trunk: ./
examples/TimeTracker/src/context/ framework/
framework/src/java/org/apache/tapestry/form/validator/
framework/src/java/org/apache/tapestry/json/
framework/src/java/org/apache/tapestry/valid/...
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestCheckbox.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestCheckbox.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestCheckbox.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestCheckbox.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
@@ -21,7 +25,6 @@
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for the {@link org.apache.tapestry.form.Checkbox} component.
@@ -39,11 +42,11 @@
IMarkupWriter writer = newBufferWriter();
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
cb.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\"/>");
}
@@ -56,11 +59,11 @@
IMarkupWriter writer = newBufferWriter();
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
cb.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<input type=\"checkbox\" name=\"assignedName\" disabled=\"disabled\"/>");
}
@@ -78,11 +81,11 @@
cb.setBinding("informal", binding);
- replayControls();
+ replay();
cb.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\" informal=\"informal-value\"/>");
}
@@ -95,11 +98,11 @@
IMarkupWriter writer = newBufferWriter();
IRequestCycle cycle = newCycleGetUniqueId("foo", "foo$unique");
- replayControls();
+ replay();
cb.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\" id=\"foo$unique\"/>");
}
@@ -123,22 +126,19 @@
unreachable();
}
- replayControls();
+ replay();
cb.rewindFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertEquals(false, cb.getValue());
}
public void testSubmitValidateFailed()
{
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
+ IForm form = newMock(IForm.class);
IValidationDelegate delegate = newDelegate();
@@ -153,23 +153,22 @@
try
{
vfs.validate(cb, writer, cycle, "foo");
- vfsc.setThrowable(exception);
+ expectLastCall().andThrow(exception);
}
catch (ValidatorException e)
{
unreachable();
}
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.record(exception);
- replayControls();
+ replay();
cb.rewindFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertEquals(false, cb.getValue());
}
@@ -193,11 +192,11 @@
unreachable();
}
- replayControls();
+ replay();
cb.rewindFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertEquals(true, cb.getValue());
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+
import java.util.Locale;
import org.apache.hivemind.ClassResolver;
@@ -25,7 +27,6 @@
import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.TapestryUtils;
import org.apache.tapestry.services.Infrastructure;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.FormComponentContributorContextImpl}.
@@ -37,22 +38,18 @@
{
private IForm newForm(String name)
{
- MockControl control = newControl(IForm.class);
- IForm form = (IForm) control.getMock();
+ IForm form = newMock(IForm.class);
- form.getName();
- control.setReturnValue(name);
+ expect(form.getName()).andReturn(name);
return form;
}
private IFormComponent newField(IForm form)
{
- MockControl control = newControl(IFormComponent.class);
- IFormComponent field = (IFormComponent) control.getMock();
+ IFormComponent field = newMock(IFormComponent.class);
- field.getForm();
- control.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
return field;
}
@@ -64,11 +61,9 @@
private Infrastructure newInfrastructure(ClassResolver resolver)
{
- MockControl control = newControl(Infrastructure.class);
- Infrastructure inf = (Infrastructure) control.getMock();
+ Infrastructure inf = newMock(Infrastructure.class);
- inf.getClassResolver();
- control.setReturnValue(resolver);
+ expect(inf.getClassResolver()).andReturn(resolver);
return inf;
}
@@ -79,13 +74,11 @@
IFormComponent field = newField(form);
ClassResolver resolver = newResolver();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IRequestCycle cycle = newCycle();
Infrastructure inf = newInfrastructure(resolver);
- cycle.getInfrastructure();
- cyclec.setReturnValue(inf);
+ expect(cycle.getInfrastructure()).andReturn(inf);
PageRenderSupport prs = newSupport();
@@ -95,14 +88,14 @@
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
- replayControls();
+ replay();
FormComponentContributorContext context = new FormComponentContributorContextImpl(
Locale.ENGLISH, cycle, field);
context.includeClasspathScript("/foo.js");
- verifyControls();
+ verify();
}
public void testAddSubmitHandler()
@@ -111,14 +104,11 @@
IForm form = newForm("myform");
IFormComponent field = newField(form);
ClassResolver resolver = newResolver();
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
+
+ IRequestCycle cycle = newCycle();
Infrastructure inf = newInfrastructure(resolver);
- cycle.getInfrastructure();
- cyclec.setReturnValue(inf);
+ expect(cycle.getInfrastructure()).andReturn(inf);
PageRenderSupport prs = newSupport();
@@ -126,14 +116,14 @@
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
- replayControls();
+ replay();
FormComponentContributorContext context = new FormComponentContributorContextImpl(
Locale.ENGLISH, cycle, field);
context.addSubmitHandler("foo");
- verifyControls();
+ verify();
}
private PageRenderSupport newSupport()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java Tue Jun 27 11:21:31 2006
@@ -15,6 +15,7 @@
package org.apache.tapestry.form;
import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
import java.awt.Point;
@@ -58,11 +59,11 @@
trainWasPrerendered(form, writer, submit, true);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRender()
@@ -102,11 +103,11 @@
delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderDisabled()
@@ -144,11 +145,11 @@
writer.attribute("src", "disabled-image-url");
writer.closeTag();
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderDisabledNoDisabledImage()
@@ -186,11 +187,11 @@
writer.attribute("src", "image-url");
writer.closeTag();
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderWithNameOverride()
@@ -231,11 +232,11 @@
delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindingDisabled()
@@ -261,11 +262,11 @@
trainIsRewinding(form, true);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindNotTrigger()
@@ -292,11 +293,11 @@
trainGetParameter(cycle, "fred.x", null);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindTrigger()
@@ -327,7 +328,7 @@
trainGetParameter(cycle, "fred.x", "33");
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
@@ -338,7 +339,7 @@
// notifying listeners (deferred or not).
// This test "proves" that Submit.handleClick() is invoked.
- verifyControls();
+ verify();
}
public void testRewindTriggeredWithPointBound()
@@ -374,13 +375,13 @@
trainGetParameter(cycle, "fred.x", "33");
trainGetParameter(cycle, "fred.y", "19");
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
assertEquals("clicked", PropertyUtils.read(submit, "selected"));
assertEquals(new Point(33, 19), PropertyUtils.read(submit, "point"));
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestListEditMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestListEditMap.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestListEditMap.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestListEditMap.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,11 @@
package org.apache.tapestry.form;
-import org.apache.tapestry.form.ListEditMap;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.spec.BeanLifecycle;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java Tue Jun 27 11:21:31 2006
@@ -16,6 +16,7 @@
import static org.easymock.EasyMock.aryEq;
import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
import java.util.Collection;
import java.util.LinkedList;
@@ -52,11 +53,11 @@
trainWasPrerendered(form, writer, submit, true);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRender()
@@ -92,11 +93,11 @@
delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderDisabled()
@@ -130,11 +131,11 @@
writer.attribute("disabled", "disabled");
writer.closeTag();
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderWithLabel()
@@ -172,11 +173,11 @@
delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindingDisabled()
@@ -202,11 +203,11 @@
trainIsRewinding(form, true);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindNotForm()
@@ -232,11 +233,11 @@
trainIsRewinding(form, false);
trainIsRewinding(cycle, true);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindNotTrigger()
@@ -263,11 +264,11 @@
trainGetParameter(cycle, "fred", null);
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindTriggered()
@@ -298,13 +299,13 @@
trainGetParameter(cycle, "fred", "flintstone");
- replayControls();
+ replay();
submit.renderComponent(writer, cycle);
assertEquals("clicked", PropertyUtils.read(submit, "selected"));
- verifyControls();
+ verify();
}
public void testTriggerWithListener()
@@ -319,11 +320,11 @@
listener.actionTriggered(submit, cycle);
- replayControls();
+ replay();
submit.handleClick(cycle, form);
- verifyControls();
+ verify();
}
public void testTriggerWithAction()
@@ -337,19 +338,19 @@
{ "action", action, "listenerInvoker",
new ListenerInvokerTerminator() });
- replayControls();
+ replay();
submit.handleClick(cycle, form);
- verifyControls();
+ verify();
action.actionTriggered(submit, cycle);
- replayControls();
+ replay();
form.runDeferred();
- verifyControls();
+ verify();
}
public void testTriggerWithActionAndSingleParameter()
@@ -366,19 +367,19 @@
cycle.setListenerParameters(aryEq(new Object[] { parameter }));
- replayControls();
+ replay();
submit.handleClick(cycle, form);
- verifyControls();
+ verify();
action.actionTriggered(submit, cycle);
- replayControls();
+ replay();
form.runDeferred();
- verifyControls();
+ verify();
}
public void testTriggerWithDActionAndMultipleParameters()
@@ -398,19 +399,19 @@
cycle.setListenerParameters(aryEq(new Object[]{ "p1", "p2" }));
- replayControls();
+ replay();
submit.handleClick(cycle, form);
- verifyControls();
+ verify();
action.actionTriggered(submit, cycle);
- replayControls();
+ replay();
form.runDeferred();
- verifyControls();
+ verify();
}
public void testTriggerWithListenerAndAction()
@@ -428,19 +429,19 @@
listener.actionTriggered(submit, cycle);
- replayControls();
+ replay();
submit.handleClick(cycle, form);
- verifyControls();
+ verify();
action.actionTriggered(submit, cycle);
- replayControls();
+ replay();
form.runDeferred();
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextArea.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
@@ -21,7 +26,6 @@
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.TextArea}.
@@ -33,20 +37,14 @@
{
public void testRewind()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -65,8 +63,7 @@
try
{
- tfs.parse(component, " text area value ");
- tfsc.setReturnValue("text area value");
+ expect(tfs.parse(component, " text area value ")).andReturn("text area value");
vfs.validate(component, writer, cycle, "text area value");
}
@@ -75,31 +72,25 @@
unreachable();
}
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertEquals("text area value", component.getValue());
}
public void testRewindTranslateFailed()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
-
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -120,8 +111,7 @@
try
{
- tfs.parse(component, " text area value ");
- tfsc.setThrowable(exception);
+ expect(tfs.parse(component, " text area value ")).andThrow(exception);
}
catch (ValidatorException e)
{
@@ -131,31 +121,25 @@
trainGetDelegate(form, delegate);
delegate.record(exception);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertNull(component.getValue());
}
public void testRewindValidateFailed()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
-
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -176,11 +160,10 @@
try
{
- tfs.parse(component, " text area value ");
- tfsc.setReturnValue("text area value");
+ expect(tfs.parse(component, " text area value ")).andReturn("text area value");
vfs.validate(component, writer, cycle, "text area value");
- vfsc.setThrowable(exception);
+ expectLastCall().andThrow(exception);
}
catch (ValidatorException e)
{
@@ -190,11 +173,11 @@
trainGetDelegate(form, delegate);
delegate.record(exception);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertNull(component.getValue());
}
@@ -202,34 +185,26 @@
public void testWasPrerendered()
{
TextArea component = (TextArea) newInstance(TextArea.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, component, true);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindNotForm()
{
TextArea component = (TextArea) newInstance(TextArea.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -245,22 +220,18 @@
trainIsRewinding(form, false);
trainIsRewinding(cycle, true);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindDisabled()
{
TextArea component = (TextArea) newInstance(TextArea.class, "disabled", Boolean.TRUE);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -275,33 +246,28 @@
trainGetElementId(form, component, "barney");
trainIsRewinding(form, true);
- replayControls();
+ replay();
component.render(writer, cycle);
assertNull(component.getValue());
- verifyControls();
+ verify();
}
public void testRender()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
MockDelegate delegate = new MockDelegate();
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", " text area value " });
trainGetForm(cycle, form);
@@ -320,39 +286,33 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, " text area value ");
- tfsc.setReturnValue("text area value");
+ expect(tfs.format(component, " text area value ")).andReturn("text area value");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><textarea name=\"fred\" class=\"validation-delegate\">text area value</textarea></span>");
}
public void testRenderDisabled()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
MockDelegate delegate = new MockDelegate();
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", " text area value ", "disabled", Boolean.TRUE });
trainGetForm(cycle, form);
@@ -371,33 +331,27 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, " text area value ");
- tfsc.setReturnValue("text area value");
+ expect(tfs.format(component, " text area value ")).andReturn("text area value");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><textarea name=\"fred\" disabled=\"disabled\" class=\"validation-delegate\">text area value</textarea></span>");
}
public void testRenderWithInformalParameters()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -405,7 +359,7 @@
IBinding binding = newBinding("informal-value");
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", " text area value ", "specification", new ComponentSpecification() });
component.setBinding("informal", binding);
@@ -426,39 +380,33 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, " text area value ");
- tfsc.setReturnValue("text area value");
+ expect(tfs.format(component, " text area value ")).andReturn("text area value");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><textarea name=\"fred\" class=\"validation-delegate\" informal=\"informal-value\">text area value</textarea></span>");
}
public void testRenderNullValue()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
MockDelegate delegate = new MockDelegate();
- TextArea component = (TextArea) newInstance(TextArea.class, new Object[]
+ TextArea component = newInstance(TextArea.class, new Object[]
{ "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
trainGetForm(cycle, form);
@@ -477,17 +425,16 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, null);
- tfsc.setReturnValue("");
+ expect(tfs.format(component, null)).andReturn("");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><textarea name=\"fred\" class=\"validation-delegate\"></textarea></span>");
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTextField.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
@@ -21,7 +26,6 @@
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.TextField}.
@@ -33,20 +37,15 @@
{
public void testRewind()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+
+ IRequestCycle cycle = newCycle();
+
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -67,8 +66,7 @@
try
{
- tfs.parse(component, "10");
- tfsc.setReturnValue(value);
+ expect(tfs.parse(component, "10")).andReturn(value);
vfs.validate(component, writer, cycle, value);
}
@@ -77,31 +75,26 @@
unreachable();
}
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertEquals(value, component.getValue());
}
public void testRewindTranslateFailed()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -122,8 +115,7 @@
try
{
- tfs.parse(component, "10");
- tfsc.setThrowable(exception);
+ expect(tfs.parse(component, "10")).andThrow(exception);
}
catch (ValidatorException e)
{
@@ -133,31 +125,26 @@
trainGetDelegate(form, delegate);
delegate.record(exception);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertNull(component.getValue());
}
public void testRewindValidateFailed()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
-
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
+ ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
TextField component = (TextField) newInstance(TextField.class, new Object[]
{ "translatedFieldSupport", tfs, "validatableFieldSupport", vfs });
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -180,11 +167,10 @@
try
{
- tfs.parse(component, "10");
- tfsc.setReturnValue(value);
+ expect(tfs.parse(component, "10")).andReturn(value);
vfs.validate(component, writer, cycle, value);
- vfsc.setThrowable(exception);
+ expectLastCall().andThrow(exception);
}
catch (ValidatorException e)
{
@@ -194,11 +180,11 @@
trainGetDelegate(form, delegate);
delegate.record(exception);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertNull(component.getValue());
}
@@ -207,33 +193,29 @@
{
TextField component = (TextField) newInstance(TextField.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, component, true);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindNotForm()
{
TextField component = (TextField) newInstance(TextField.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -249,22 +231,20 @@
trainIsRewinding(form, false);
trainIsRewinding(cycle, true);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewindDisabled()
{
TextField component = (TextField) newInstance(TextField.class, "disabled", Boolean.TRUE);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -279,27 +259,23 @@
trainGetElementId(form, component, "barney");
trainIsRewinding(form, true);
- replayControls();
+ replay();
component.render(writer, cycle);
assertNull(component.getProperty("value"));
- verifyControls();
+ verify();
}
public void testRender()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -324,33 +300,28 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, new Integer(10));
- tfsc.setReturnValue("10");
+ expect(tfs.format(component, new Integer(10))).andReturn("10");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"10\" class=\"validation-delegate\"/></span>");
}
public void testRenderHidden()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -375,33 +346,28 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, new Integer(10));
- tfsc.setReturnValue("10");
+ expect(tfs.format(component, new Integer(10))).andReturn("10");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><input type=\"password\" name=\"fred\" value=\"10\" class=\"validation-delegate\"/></span>");
}
public void testRenderDisabled()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -426,33 +392,28 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, new Integer(10));
- tfsc.setReturnValue("10");
+ expect(tfs.format(component, new Integer(10))).andReturn("10");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" disabled=\"disabled\" value=\"10\" class=\"validation-delegate\"/></span>");
}
public void testRenderWithInformalParameters()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -481,33 +442,28 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, new Integer(10));
- tfsc.setReturnValue("10");
+ expect(tfs.format(component, new Integer(10))).andReturn("10");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"10\" class=\"validation-delegate\" informal=\"informal-value\"/></span>");
}
public void testRenderNullValue()
{
- MockControl tfsc = newControl(TranslatedFieldSupport.class);
- TranslatedFieldSupport tfs = (TranslatedFieldSupport) tfsc.getMock();
+ TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
ValidatableFieldSupport vfs = (ValidatableFieldSupport) newMock(ValidatableFieldSupport.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -532,36 +488,33 @@
trainGetDelegate(form, delegate);
trainGetDelegate(form, delegate);
- tfs.format(component, null);
- tfsc.setReturnValue("");
+ expect(tfs.format(component, null)).andReturn("");
tfs.renderContributions(component, writer, cycle);
vfs.renderContributions(component, writer, cycle);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"\" class=\"validation-delegate\"/></span>");
}
public void testIsRequired()
{
- MockControl supportc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport support = (ValidatableFieldSupport) supportc.getMock();
+ ValidatableFieldSupport support = newMock(ValidatableFieldSupport.class);
TextField field = (TextField) newInstance(TextField.class, new Object[]
{ "validatableFieldSupport", support, });
- support.isRequired(field);
- supportc.setReturnValue(true);
+ expect(support.isRequired(field)).andReturn(true);
- replayControls();
+ replay();
assertEquals(true, field.isRequired());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java Tue Jun 27 11:21:31 2006
@@ -14,14 +14,15 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Locale;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.service.ThreadLocale;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
-import org.apache.hivemind.test.EqualsMatcher;
-import org.apache.hivemind.test.TypeMatcher;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IForm;
@@ -33,8 +34,6 @@
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
-import org.easymock.internal.AlwaysMatcher;
/**
* Test case for {@link TranslatedFieldSupportImpl}.
@@ -46,32 +45,25 @@
{
private ThreadLocale newThreadLocale()
{
- MockControl control = newControl(ThreadLocale.class);
- ThreadLocale tl = (ThreadLocale) control.getMock();
+ ThreadLocale tl = newMock(ThreadLocale.class);
- tl.getLocale();
- control.setReturnValue(Locale.ENGLISH);
+ expect(tl.getLocale()).andReturn(Locale.ENGLISH);
return tl;
}
private IRequestCycle newCycle(IComponent component)
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- ClassResolver cr = (ClassResolver) newMock(ClassResolver.class);
+ IRequestCycle cycle = newCycle();
- MockControl infrac = newControl(Infrastructure.class);
- Infrastructure infra = (Infrastructure) infrac.getMock();
+ ClassResolver cr = newMock(ClassResolver.class);
+ Infrastructure infra = newMock(Infrastructure.class);
- PageRenderSupport prs = (PageRenderSupport) newMock(PageRenderSupport.class);
+ PageRenderSupport prs = newMock(PageRenderSupport.class);
- cycle.getInfrastructure();
- cyclec.setReturnValue(infra);
+ expect(cycle.getInfrastructure()).andReturn(infra);
- infra.getClassResolver();
- infrac.setReturnValue(cr);
+ expect(infra.getClassResolver()).andReturn(cr);
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
@@ -81,27 +73,22 @@
public void testRenderContributionsClientValidationDisabled()
{
TranslatedFieldSupportImpl support = new TranslatedFieldSupportImpl();
-
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
+
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.isClientValidationEnabled();
- formControl.setReturnValue(false);
+ expect(form.isClientValidationEnabled()).andReturn(false);
- replayControls();
+ replay();
support.renderContributions(field, writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderContributionsClientValidationEnabled()
@@ -109,132 +96,102 @@
TranslatedFieldSupportImpl support = new TranslatedFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(field);
+
+ Translator translator = newMock(Translator.class);
- MockControl translatorControl = newControl(Translator.class);
- Translator translator = (Translator) translatorControl.getMock();
+ expect(field.getForm()).andReturn(form);
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(form.isClientValidationEnabled()).andReturn(true);
- form.isClientValidationEnabled();
- formControl.setReturnValue(true);
+ expect(field.getForm()).andReturn(form);
- field.getForm();
- fieldControl.setReturnValue(form);
-
- form.getName();
- formControl.setReturnValue("myform");
-
- field.getTranslator();
- fieldControl.setReturnValue(translator);
+ expect(form.getName()).andReturn("myform");
+ expect(field.getTranslator()).andReturn(translator);
+
translator.renderContribution(
- writer,
- cycle,
- new FormComponentContributorContextImpl(field),
- field);
- translatorControl.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new EqualsMatcher(), new EqualsMatcher(), new TypeMatcher(), new EqualsMatcher() }));
-
- replayControls();
+ eq(writer),
+ eq(cycle),
+ isA(FormComponentContributorContextImpl.class),
+ eq(field));
+
+ replay();
support.renderContributions(field, writer, cycle);
- verifyControls();
+ verify();
}
public void testFormat() throws Exception
{
TranslatedFieldSupportImpl support = new TranslatedFieldSupportImpl();
-
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
-
- MockControl delegateControl = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegateControl.getMock();
-
- MockControl translatorc = newControl(Translator.class);
- Translator translator = (Translator) translatorc.getMock();
+
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
+
+ IValidationDelegate delegate = newMock(IValidationDelegate.class);
+ Translator translator = newMock(Translator.class);
Object object = new Object();
String expected = "result";
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.getDelegate();
- formControl.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
- delegate.isInError();
- delegateControl.setReturnValue(false);
+ expect(delegate.isInError()).andReturn(false);
- field.getTranslator();
- fieldControl.setReturnValue(translator);
+ expect(field.getTranslator()).andReturn(translator);
- trainFormat(translatorc, translator, field, object, expected);
+ trainFormat(translator, field, object, expected);
support.setThreadLocale(newThreadLocale());
- replayControls();
+ replay();
String result = support.format(field, object);
- verifyControls();
+ verify();
assertSame(expected, result);
}
- private void trainFormat(MockControl control, Translator translator, TranslatedField field,
+ private void trainFormat(Translator translator, TranslatedField field,
Object input, String result)
{
- translator.format(field, Locale.ENGLISH, input);
- control.setReturnValue(result);
+ expect(translator.format(field, Locale.ENGLISH, input)).andReturn(result);
}
public void testFormatInError()
{
TranslatedFieldSupportImpl support = new TranslatedFieldSupportImpl();
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
-
- MockControl delegateControl = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegateControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
+
+ IValidationDelegate delegate = newMock(IValidationDelegate.class);
String expected = "result";
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.getDelegate();
- formControl.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
- delegate.isInError();
- delegateControl.setReturnValue(true);
+ expect(delegate.isInError()).andReturn(true);
- delegate.getFieldInputValue();
- delegateControl.setReturnValue(expected);
+ expect(delegate.getFieldInputValue()).andReturn(expected);
- replayControls();
+ replay();
String result = support.format(field, new Object());
- verifyControls();
+ verify();
assertSame(expected, result);
}
@@ -243,55 +200,43 @@
{
TranslatedFieldSupportImpl support = new TranslatedFieldSupportImpl();
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
-
- MockControl delegateControl = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegateControl.getMock();
-
- MockControl translatorControl = newControl(Translator.class);
- Translator translator = (Translator) translatorControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
+
+ IValidationDelegate delegate = newMock(IValidationDelegate.class);
+ Translator translator = newMock(Translator.class);
String text = "test";
Object expected = new Object();
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.getDelegate();
- formControl.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.recordFieldInputValue(text);
- field.getTranslator();
- fieldControl.setReturnValue(translator);
+ expect(field.getTranslator()).andReturn(translator);
support.setThreadLocale(newThreadLocale());
- trainParse(translatorControl, translator, field, text, expected);
+ trainParse(translator, field, text, expected);
- replayControls();
+ replay();
Object result = support.parse(field, text);
- verifyControls();
+ verify();
assertSame(expected, result);
}
- private void trainParse(MockControl control, Translator translator, TranslatedField field,
+ private void trainParse(Translator translator, TranslatedField field,
String text, Object result) throws ValidatorException
{
- ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
+ // ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
- translator.parse(field, messages, text);
- control.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, new TypeMatcher() }));
- control.setReturnValue(result);
+ expect(translator.parse(eq(field), isA(ValidationMessages.class), eq(text))).andReturn(result);
}
public void testParseFailed() throws Exception
@@ -300,40 +245,30 @@
support.setThreadLocale(newThreadLocale());
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
-
- MockControl delegateControl = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegateControl.getMock();
-
- MockControl translatorControl = newControl(Translator.class);
- Translator translator = (Translator) translatorControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
+
+ IValidationDelegate delegate = newMock(IValidationDelegate.class);
+ Translator translator = newMock(Translator.class);
String text = "test";
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.getDelegate();
- formControl.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.recordFieldInputValue(text);
- field.getTranslator();
- fieldControl.setReturnValue(translator);
-
+ expect(field.getTranslator()).andReturn(translator);
+
ValidatorException expected = new ValidatorException("Failure");
- ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
-
- translator.parse(field, messages, text);
- translatorControl.setMatcher(new AlwaysMatcher());
- translatorControl.setThrowable(expected);
-
- replayControls();
+ //ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
+
+ expect(translator.parse(isA(TranslatedField.class),
+ isA(ValidationMessages.class), isA(String.class))).andThrow(expected);
+
+ replay();
try
{
@@ -343,7 +278,7 @@
}
catch (ValidatorException e)
{
- verifyControls();
+ verify();
assertSame(expected, e);
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,14 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.isNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -21,10 +29,6 @@
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.service.ThreadLocale;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
-import org.apache.hivemind.test.EqualsMatcher;
-import org.apache.hivemind.test.TypeMatcher;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IForm;
@@ -36,7 +40,6 @@
import org.apache.tapestry.form.validator.Validator;
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Test case for {@link ValidatableFieldSupportImpl}.
@@ -48,11 +51,9 @@
{
private ThreadLocale newThreadLocale()
{
- MockControl control = newControl(ThreadLocale.class);
- ThreadLocale tl = (ThreadLocale) control.getMock();
+ ThreadLocale tl = newMock(ThreadLocale.class);
- tl.getLocale();
- control.setReturnValue(Locale.ENGLISH);
+ expect(tl.getLocale()).andReturn(Locale.ENGLISH);
return tl;
}
@@ -63,21 +64,17 @@
*/
protected IRequestCycle newCycle(IComponent component)
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IRequestCycle cycle = newCycle();
ClassResolver cr = (ClassResolver) newMock(ClassResolver.class);
-
- MockControl infrac = newControl(Infrastructure.class);
- Infrastructure infra = (Infrastructure) infrac.getMock();
+
+ Infrastructure infra = newMock(Infrastructure.class);
PageRenderSupport prs = (PageRenderSupport) newMock(PageRenderSupport.class);
- cycle.getInfrastructure();
- cyclec.setReturnValue(infra);
+ expect(cycle.getInfrastructure()).andReturn(infra);
- infra.getClassResolver();
- infrac.setReturnValue(cr);
+ expect(infra.getClassResolver()).andReturn(cr);
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
@@ -88,162 +85,128 @@
{
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
-
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.isClientValidationEnabled();
- formControl.setReturnValue(false);
+ expect(form.isClientValidationEnabled()).andReturn(false);
- replayControls();
+ replay();
support.renderContributions(field, writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderContributionsClientValidationEnabledNoValidators()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(field);
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.isClientValidationEnabled();
- formControl.setReturnValue(true);
+ expect(form.isClientValidationEnabled()).andReturn(true);
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.getName();
- formControl.setReturnValue("myform");
+ expect(form.getName()).andReturn("myform");
- field.getValidators();
- fieldControl.setReturnValue(null);
+ expect(field.getValidators()).andReturn(null);
- converter.coerceValue(null, Iterator.class);
- converterControl.setReturnValue(Collections.EMPTY_LIST.iterator());
+ expect(converter.coerceValue(null, Iterator.class)).andReturn(Collections.EMPTY_LIST.iterator());
- replayControls();
+ replay();
support.renderContributions(field, writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderContributionsClientValidationEnabled()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
- MockControl formControl = newControl(IForm.class);
- IForm form = (IForm) formControl.getMock();
+ IForm form = newMock(IForm.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(field);
- MockControl validatorControl = newControl(Validator.class);
- Validator validator = (Validator) validatorControl.getMock();
+ Validator validator = newMock(Validator.class);
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.isClientValidationEnabled();
- formControl.setReturnValue(true);
+ expect(form.isClientValidationEnabled()).andReturn(true);
- field.getForm();
- fieldControl.setReturnValue(form);
+ expect(field.getForm()).andReturn(form);
- form.getName();
- formControl.setReturnValue("myform");
+ expect(form.getName()).andReturn("myform");
- field.getValidators();
- fieldControl.setReturnValue(validator);
+ expect(field.getValidators()).andReturn(validator);
- converter.coerceValue(validator, Iterator.class);
- converterControl.setReturnValue(Collections.singleton(validator).iterator());
+ expect(converter.coerceValue(validator, Iterator.class))
+ .andReturn(Collections.singleton(validator).iterator());
- FormComponentContributorContext context = new FormComponentContributorContextImpl(field);
+ validator.renderContribution(eq(writer), eq(cycle),
+ isA(FormComponentContributorContext.class), eq(field));
- validator.renderContribution(writer, cycle, context, field);
- validatorControl.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new EqualsMatcher(), new EqualsMatcher(), new TypeMatcher(), new EqualsMatcher() }));
-
- replayControls();
+ replay();
support.renderContributions(field, writer, cycle);
- verifyControls();
+ verify();
}
public void testValidate()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- MockControl validatorControl = newControl(Validator.class);
- Validator validator = (Validator) validatorControl.getMock();
+ Validator validator = newMock(Validator.class);
Object object = new Object();
- field.getValidators();
- fieldControl.setReturnValue(validator);
+ expect(field.getValidators()).andReturn(validator);
- converter.coerceValue(validator, Iterator.class);
- converterControl.setReturnValue(Collections.singleton(validator).iterator());
-
- ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
+ expect(converter.coerceValue(validator, Iterator.class))
+ .andReturn(Collections.singleton(validator).iterator());
try
{
- validator.validate(field, messages, object);
- validatorControl.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new EqualsMatcher(), new TypeMatcher(), new EqualsMatcher() }));
+ validator.validate(eq(field), isA(ValidationMessages.class), eq(object));
- replayControls();
+ replay();
support.validate(field, writer, cycle, object);
- verifyControls();
+ verify();
}
catch (ValidatorException e)
{
@@ -253,42 +216,34 @@
public void testValidateFailed()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- MockControl validatorControl = newControl(Validator.class);
- Validator validator = (Validator) validatorControl.getMock();
+ Validator validator = newMock(Validator.class);
Object object = new Object();
- field.getValidators();
- fieldControl.setReturnValue(validator);
+ expect(field.getValidators()).andReturn(validator);
- converter.coerceValue(validator, Iterator.class);
- converterControl.setReturnValue(Collections.singleton(validator).iterator());
-
- ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
+ expect(converter.coerceValue(validator, Iterator.class))
+ .andReturn(Collections.singleton(validator).iterator());
ValidatorException expected = new ValidatorException("test");
try
{
- validator.validate(field, messages, object);
- validatorControl.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new EqualsMatcher(), new TypeMatcher(), new EqualsMatcher() }));
- validatorControl.setThrowable(expected);
+ validator.validate(eq(field), isA(ValidationMessages.class), eq(object));
+ expectLastCall().andThrow(expected);
- replayControls();
+ replay();
support.validate(field, writer, cycle, object);
@@ -296,7 +251,7 @@
}
catch (ValidatorException e)
{
- verifyControls();
+ verify();
assertSame(expected, e);
}
@@ -304,34 +259,31 @@
public void testValidateNoValidators()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
Object object = new Object();
- field.getValidators();
- fieldControl.setReturnValue(null);
+ expect(field.getValidators()).andReturn(null);
- converter.coerceValue(null, Iterator.class);
- converterControl.setReturnValue(Collections.EMPTY_LIST.iterator());
+ expect(converter.coerceValue(null, Iterator.class))
+ .andReturn(Collections.EMPTY_LIST.iterator());
try
{
- replayControls();
+ replay();
support.validate(field, writer, cycle, object);
- verifyControls();
+ verify();
}
catch (ValidatorException e)
{
@@ -341,44 +293,35 @@
public void testValidateAcceptNull()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- MockControl validatorControl = newControl(Validator.class);
- Validator validator = (Validator) validatorControl.getMock();
+ Validator validator = newMock(Validator.class);
- field.getValidators();
- fieldControl.setReturnValue(validator);
+ expect(field.getValidators()).andReturn(validator);
- converter.coerceValue(validator, Iterator.class);
- converterControl.setReturnValue(Collections.singleton(validator).iterator());
-
- validator.getAcceptsNull();
- validatorControl.setReturnValue(true);
+ expect(converter.coerceValue(validator, Iterator.class))
+ .andReturn(Collections.singleton(validator).iterator());
- ValidationMessages messages = new ValidationMessagesImpl(field, Locale.ENGLISH);
+ expect(validator.getAcceptsNull()).andReturn(true);
try
{
- validator.validate(field, messages, null);
- validatorControl.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { new EqualsMatcher(), new TypeMatcher(), new EqualsMatcher() }));
+ validator.validate(eq(field), isA(ValidationMessages.class), isNull());
- replayControls();
+ replay();
support.validate(field, writer, cycle, null);
- verifyControls();
+ verify();
}
catch (ValidatorException e)
{
@@ -388,38 +331,33 @@
public void testValidateRejectNull()
{
- MockControl converterControl = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterControl.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setThreadLocale(newThreadLocale());
support.setValueConverter(converter);
- MockControl fieldControl = newControl(TranslatedField.class);
- TranslatedField field = (TranslatedField) fieldControl.getMock();
+ TranslatedField field = newMock(TranslatedField.class);
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- MockControl validatorControl = newControl(Validator.class);
- Validator validator = (Validator) validatorControl.getMock();
+ Validator validator = newMock(Validator.class);
- field.getValidators();
- fieldControl.setReturnValue(validator);
+ expect(field.getValidators()).andReturn(validator);
- converter.coerceValue(validator, Iterator.class);
- converterControl.setReturnValue(Collections.singleton(validator).iterator());
+ expect(converter.coerceValue(validator, Iterator.class))
+ .andReturn(Collections.singleton(validator).iterator());
- validator.getAcceptsNull();
- validatorControl.setReturnValue(false);
+ expect(validator.getAcceptsNull()).andReturn(false);
try
{
- replayControls();
+ replay();
support.validate(field, writer, cycle, null);
- verifyControls();
+ verify();
}
catch (ValidatorException e)
{
@@ -429,33 +367,27 @@
private ValidatableField newFieldGetValidators(Collection validators)
{
- MockControl control = newControl(ValidatableField.class);
- ValidatableField field = (ValidatableField) control.getMock();
+ ValidatableField field = newMock(ValidatableField.class);
- field.getValidators();
- control.setReturnValue(validators);
+ expect(field.getValidators()).andReturn(validators);
return field;
}
private ValueConverter newValueConverter(Collection validators)
{
- MockControl control = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) control.getMock();
+ ValueConverter converter = newMock(ValueConverter.class);
- converter.coerceValue(validators, Iterator.class);
- control.setReturnValue(validators.iterator());
+ expect(converter.coerceValue(validators, Iterator.class)).andReturn(validators.iterator());
return converter;
}
private Validator newValidator(boolean isRequired)
{
- MockControl control = newControl(Validator.class);
- Validator validator = (Validator) control.getMock();
+ Validator validator = newMock(Validator.class);
- validator.isRequired();
- control.setReturnValue(isRequired);
+ expect(validator.isRequired()).andReturn(isRequired);
return validator;
}
@@ -466,14 +398,14 @@
ValidatableField field = newFieldGetValidators(validators);
ValueConverter converter = newValueConverter(validators);
- replayControls();
+ replay();
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setValueConverter(converter);
assertEquals(false, support.isRequired(field));
- verifyControls();
+ verify();
}
public void testIsRequiredNoRequiredValidators()
@@ -482,14 +414,14 @@
ValidatableField field = newFieldGetValidators(validators);
ValueConverter converter = newValueConverter(validators);
- replayControls();
+ replay();
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setValueConverter(converter);
assertEquals(false, support.isRequired(field));
- verifyControls();
+ verify();
}
public void testIsRequiredWithRequiredValidator()
@@ -498,13 +430,13 @@
ValidatableField field = newFieldGetValidators(validators);
ValueConverter converter = newValueConverter(validators);
- replayControls();
+ replay();
ValidatableFieldSupportImpl support = new ValidatableFieldSupportImpl();
support.setValueConverter(converter);
assertEquals(true, support.isRequired(field));
- verifyControls();
+ verify();
}
}