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/18 00:46:24 UTC
svn commit: r415077 [1/2] - in /tapestry/tapestry4/trunk/framework: ./
src/java/org/apache/tapestry/components/ src/scripts/
src/test/org/apache/tapestry/ src/test/org/apache/tapestry/binding/
src/test/org/apache/tapestry/components/ src/test/org/apach...
Author: jkuhnert
Date: Sat Jun 17 15:46:22 2006
New Revision: 415077
URL: http://svn.apache.org/viewvc?rev=415077&view=rev
Log:
Oops! Now I know what Kent was talking about in regard to easymock...We're upgraded now!
Those localization tests have to be the funniest unit tests I've ever read :)
Modified:
tapestry/tapestry4/trunk/framework/build.xml
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Any.java
tapestry/tapestry4/trunk/framework/src/scripts/TestDefaultParameterValues.xml
tapestry/tapestry4/trunk/framework/src/scripts/TestLocalization.xml
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/StateBindingTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestImageSubmit.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestSubmit.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMax.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMin.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestPattern.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestRequired.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java
Modified: tapestry/tapestry4/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/build.xml?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/build.xml (original)
+++ tapestry/tapestry4/trunk/framework/build.xml Sat Jun 17 15:46:22 2006
@@ -50,8 +50,8 @@
<ibiblio-dependency artifact="commons-beanutils" version="${beanutils.version}" group="commons-beanutils"/>
<ibiblio-dependency artifact="log4j" version="${log4j.version}" group="log4j" use="test"/>
- <ibiblio-dependency artifact="easymock" version="1.1" group="easymock" use="test"/>
- <ibiblio-dependency artifact="easymockclassextension" version="1.1" group="easymock" use="test"/>
+ <ibiblio-dependency artifact="easymock" version="2.2" group="easymock" use="test"/>
+ <ibiblio-dependency artifact="easymockclassextension" version="2.2" group="easymock" use="test"/>
<ibiblio-dependency artifact="cglib-full" version="2.0.2" group="cglib" use="test"/>
<ibiblio-dependency artifact="jdom" version="1.0" group="jdom" use="test"/>
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Any.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Any.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Any.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/components/Any.java Sat Jun 17 15:46:22 2006
@@ -43,7 +43,7 @@
writer.begin(element);
renderInformalParameters(writer, cycle);
- if (!isParameterBound("id"))
+ if (getId() != null && !isParameterBound("id"))
renderIdAttribute(writer, cycle);
}
Modified: tapestry/tapestry4/trunk/framework/src/scripts/TestDefaultParameterValues.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/scripts/TestDefaultParameterValues.xml?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/scripts/TestDefaultParameterValues.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/scripts/TestDefaultParameterValues.xml Sat Jun 17 15:46:22 2006
@@ -82,25 +82,25 @@
<assert-output name="span tag">
<![CDATA[
-<span>span tag</span>
+<span id="Any">span tag</span>
]]>
</assert-output>
<assert-output name="div tag">
<![CDATA[
-<div>div tag</div>
+<div id="Any_0">div tag</div>
]]>
</assert-output>
<assert-output name="b tag">
<![CDATA[
-<b>b tag</b>
+<b id="Any_1">b tag</b>
]]>
</assert-output>
<assert-output name="i tag">
<![CDATA[
-<i>i tag</i>
+<i id="any">i tag</i>
]]>
</assert-output>
Modified: tapestry/tapestry4/trunk/framework/src/scripts/TestLocalization.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/scripts/TestLocalization.xml?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/scripts/TestLocalization.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/scripts/TestLocalization.xml Sat Jun 17 15:46:22 2006
@@ -36,7 +36,7 @@
<assert-output name="English Foo-Bar">
<![CDATA[
-<foo bar="Totally Screwed!">
+<foo bar="Totally Screwed!" id="Any">
]]>
</assert-output>
</request>
@@ -53,7 +53,7 @@
<assert-output name="French Foo-Bar">
<![CDATA[
-<foo bar="Merde!">
+<foo bar="Merde!" id="Any">
]]>
</assert-output>
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry;
+import static org.easymock.EasyMock.*;
+
import java.io.CharArrayWriter;
import java.io.PrintWriter;
@@ -22,13 +24,12 @@
import org.apache.hivemind.Locatable;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.components.ILinkComponent;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
import org.apache.tapestry.engine.NullWriter;
+import org.apache.tapestry.event.BrowserEvent;
import org.apache.tapestry.json.IJSONWriter;
import org.apache.tapestry.markup.AsciiMarkupFilter;
import org.apache.tapestry.markup.JSONWriterImpl;
@@ -154,14 +155,12 @@
ResponseBuilder builder =
new DefaultResponseBuilder(writer == null ? NullWriter.getSharedInstance() : writer);
- cycle.getResponseBuilder();
- setReturnValue(cycle, builder);
+ expect(cycle.getResponseBuilder()).andReturn(builder);
}
protected void trainIsRewinding(IRequestCycle cycle, boolean rewinding)
{
- cycle.isRewinding();
- setReturnValue(cycle, rewinding);
+ expect(cycle.isRewinding()).andReturn(rewinding);
}
protected IRequestCycle newCycleGetPage(String pageName, IPage page)
@@ -169,8 +168,7 @@
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
- cycle.getPage(pageName);
- control.setReturnValue(page);
+ expect(cycle.getPage(pageName)).andReturn(page);
return cycle;
}
@@ -180,9 +178,7 @@
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
- cycle.getUniqueId(id);
- control.setReturnValue(uniqueId);
-
+ expect(cycle.getUniqueId(id)).andReturn(uniqueId);
return cycle;
}
@@ -191,9 +187,7 @@
MockControl control = newControl(IRequestCycle.class);
IRequestCycle cycle = (IRequestCycle) control.getMock();
- cycle.getParameter(name);
- control.setReturnValue(value);
-
+ expect(cycle.getParameter(name)).andReturn(value);
return cycle;
}
@@ -207,9 +201,7 @@
MockControl control = newControl(IBinding.class);
IBinding binding = (IBinding) control.getMock();
- binding.getObject();
- control.setReturnValue(value);
-
+ expect(binding.getObject()).andReturn(value);
return binding;
}
@@ -227,12 +219,8 @@
MockControl control = newControl(IComponent.class);
IComponent component = (IComponent) control.getMock();
- component.getExtendedId();
- control.setReturnValue(extendedId);
-
- component.getLocation();
- control.setReturnValue(location);
-
+ expect(component.getExtendedId()).andReturn(extendedId);
+ expect(component.getLocation()).andReturn(location);
return component;
}
@@ -241,9 +229,7 @@
MockControl control = newControl(IComponentSpecification.class);
IComponentSpecification spec = (IComponentSpecification) control.getMock();
- spec.getParameter(parameterName);
- control.setReturnValue(pspec);
-
+ expect(spec.getParameter(parameterName)).andReturn(pspec);
return spec;
}
@@ -264,12 +250,10 @@
protected IPage newPage(String name, int count)
{
- MockControl control = newControl(IPage.class);
- IPage page = (IPage) control.getMock();
-
- page.getPageName();
- control.setReturnValue(name, count);
-
+ IPage page = (IPage)newMock(IPage.class);
+
+ expect(page.getPageName()).andReturn(name).times(count);
+
return page;
}
@@ -301,49 +285,32 @@
protected void trainGetAttribute(IRequestCycle cycle, String attributeName, Object attribute)
{
- MockControl control = getControl(cycle);
-
- cycle.getAttribute(attributeName);
-
- control.setReturnValue(attribute);
+ expect(cycle.getAttribute(attributeName)).andReturn(attribute);
}
protected void trainGetUniqueId(IRequestCycle cycle, String id, String uniqueId)
{
- MockControl control = getControl(cycle);
-
- cycle.getUniqueId(id);
- control.setReturnValue(uniqueId);
+ expect(cycle.getUniqueId(id)).andReturn(uniqueId);
}
protected void trainGetIdPath(IComponent component, String idPath)
{
- MockControl control = getControl(component);
-
- component.getIdPath();
- control.setReturnValue(idPath);
+ expect(component.getIdPath()).andReturn(idPath);
}
protected void trainGetParameter(IRequestCycle cycle, String name, String value)
{
- MockControl control = getControl(cycle);
-
- cycle.getParameter(name);
- control.setReturnValue(value);
+ expect(cycle.getParameter(name)).andReturn(value);
}
protected void trainGetPageName(IPage page, String pageName)
{
- page.getPageName();
-
- setReturnValue(page, pageName);
+ expect(page.getPageName()).andReturn(pageName);
}
protected void trainBuildURL(IAsset asset, IRequestCycle cycle, String URL)
{
- asset.buildURL();
-
- setReturnValue(asset, URL);
+ expect(asset.buildURL()).andReturn(URL);
}
protected IAsset newAsset()
@@ -360,9 +327,7 @@
protected void trainGetEngine(IPage page, IEngine engine)
{
- page.getEngine();
-
- setReturnValue(page, engine);
+ expect(page.getEngine()).andReturn(engine);
}
protected IComponent newComponent()
@@ -372,20 +337,17 @@
protected void trainGetPage(IComponent component, IPage page)
{
- component.getPage();
- setReturnValue(component, page);
+ expect(component.getPage()).andReturn(page);
}
protected void trainGetExtendedId(IComponent component, String extendedId)
{
- component.getExtendedId();
- setReturnValue(component, extendedId);
+ expect(component.getExtendedId()).andReturn(extendedId);
}
protected void trainGetLocation(Locatable locatable, Location location)
{
- locatable.getLocation();
- setReturnValue(locatable, location);
+ expect(locatable.getLocation()).andReturn(location);
}
protected IBinding newBinding()
@@ -395,8 +357,7 @@
protected void trainGetComponent(IComponent container, String componentId, IComponent containee)
{
- container.getComponent(componentId);
- setReturnValue(container, containee);
+ expect(container.getComponent(componentId)).andReturn(containee);
}
protected IEngineService newEngineService()
@@ -407,27 +368,18 @@
protected void trainGetLink(IEngineService service, IRequestCycle cycle, boolean post,
Object parameter, ILink link)
{
- service.getLink(post, parameter);
- setReturnValue(service, link);
+ expect(service.getLink(post, parameter)).andReturn(link);
}
protected void trainGetLinkCheckIgnoreParameter(IEngineService service, IRequestCycle cycle,
boolean post, Object parameter, ILink link)
{
- service.getLink(post, parameter);
-
- ArgumentMatcher ignore = new IgnoreMatcher();
-
- getControl(service).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, ignore, null }));
-
- setReturnValue(service, link);
+ expect(service.getLink(eq(post), anyObject())).andReturn(link);
}
protected void trainGetURL(ILink link, String URL)
{
- link.getURL();
- setReturnValue(link, URL);
+ expect(link.getURL()).andReturn(URL);
}
protected void trainGetPageRenderSupport(IRequestCycle cycle, PageRenderSupport support)
@@ -452,26 +404,22 @@
protected void trainEncodeURL(IRequestCycle rc, String URL, String encodedURL)
{
- rc.encodeURL(URL);
- setReturnValue(rc, encodedURL);
+ expect(rc.encodeURL(URL)).andReturn(encodedURL);
}
protected void trainGetServerPort(WebRequest request, int port)
{
- request.getServerPort();
- setReturnValue(request, port);
+ expect(request.getServerPort()).andReturn(port);
}
protected void trainGetServerName(WebRequest request, String serverName)
{
- request.getServerName();
- setReturnValue(request, serverName);
+ expect(request.getServerName()).andReturn(serverName);
}
protected void trainGetScheme(WebRequest request, String scheme)
{
- request.getScheme();
- setReturnValue(request, scheme);
+ expect(request.getScheme()).andReturn(scheme);
}
protected NestedMarkupWriter newNestedWriter()
@@ -481,9 +429,7 @@
protected void trainGetNestedWriter(IMarkupWriter writer, NestedMarkupWriter nested)
{
-
- writer.getNestedWriter();
- setReturnValue(writer, nested);
+ expect(writer.getNestedWriter()).andReturn(nested);
}
protected void trainGetURL(ILink link, String scheme, String anchor, String URL)
@@ -493,9 +439,7 @@
protected void trainGetURL(ILink link, String scheme, String anchor, String URL, int port)
{
- link.getURL(scheme, null, port, anchor, true);
-
- setReturnValue(link, URL);
+ expect(link.getURL(scheme, null, port, anchor, true)).andReturn(URL);
}
protected ILink newLink()
@@ -505,39 +449,32 @@
protected void trainGetLink(ILinkComponent component, IRequestCycle cycle, ILink link)
{
- component.getLink(cycle);
- setReturnValue(component, link);
+ expect(component.getLink(cycle)).andReturn(link);
}
protected void trainGetEngine(IRequestCycle cycle, IEngine engine)
{
- cycle.getEngine();
- setReturnValue(cycle, engine);
+ expect(cycle.getEngine()).andReturn(engine);
}
protected void trainGetParameterValues(ILink link, String parameterName, String[] values)
{
- link.getParameterValues(parameterName);
- setReturnValue(link, values);
+ expect(link.getParameterValues(parameterName)).andReturn(values);
}
protected void trainGetParameterNames(ILink link, String[] names)
{
- link.getParameterNames();
-
- setReturnValue(link, names);
+ expect(link.getParameterNames()).andReturn(names);
}
protected void trainGetSpecification(IComponent component, IComponentSpecification spec)
{
- component.getSpecification();
- setReturnValue(component, spec);
+ expect(component.getSpecification()).andReturn(spec);
}
protected void trainGetBinding(IComponent component, String name, IBinding binding)
{
- component.getBinding(name);
- setReturnValue(component, binding);
+ expect(component.getBinding(name)).andReturn(binding);
}
protected Log newLog()
@@ -547,7 +484,29 @@
protected void trainGetId(IComponent component, String id)
{
- component.getId();
- setReturnValue(component, id);
+ expect(component.getId()).andReturn(id);
+ }
+
+ protected void trainExtractBrowserEvent(IRequestCycle cycle)
+ {
+ expect(cycle.getParameter(BrowserEvent.NAME)).andReturn("onClick");
+
+ cycle.getParameter(BrowserEvent.TYPE);
+ setReturnValue(cycle, "click");
+ cycle.getParameters(BrowserEvent.KEYS);
+ setReturnValue(cycle, null);
+ cycle.getParameter(BrowserEvent.CHAR_CODE);
+ setReturnValue(cycle, null);
+ cycle.getParameter(BrowserEvent.PAGE_X);
+ setReturnValue(cycle, "123");
+ cycle.getParameter(BrowserEvent.PAGE_Y);
+ setReturnValue(cycle, "1243");
+ cycle.getParameter(BrowserEvent.LAYER_X);
+ setReturnValue(cycle, null);
+ cycle.getParameter(BrowserEvent.LAYER_Y);
+ setReturnValue(cycle, null);
+
+ cycle.getParameter(BrowserEvent.TARGET + "." + BrowserEvent.TARGET_ATTR_ID);
+ setReturnValue(cycle, "element1");
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/TestAbstractComponent.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry;
+import static org.easymock.EasyMock.*;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.spec.IContainedComponent;
import org.apache.tapestry.test.Creator;
@@ -91,8 +92,9 @@
IPage page = newPage("Fred");
trainGetIdPath(page, null);
-
+
replayControls();
+ replay();
IComponent component = (IComponent) creator.newInstance(BaseComponent.class, new Object[]
{ "page", page, "container", page, "id", "barney" });
@@ -112,6 +114,7 @@
}
verifyControls();
+ verify();
}
private IContainedComponent newContainedComponent()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/StateBindingTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/StateBindingTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/StateBindingTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/StateBindingTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.*;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.test.HiveMindTestCase;
@@ -72,13 +74,10 @@
Location l = fabricateLocation(22);
Throwable t = new RuntimeException("Nested exception.");
+ ApplicationStateManager asm = (ApplicationStateManager) newMock(ApplicationStateManager.class);
- MockControl asmc = newControl(ApplicationStateManager.class);
- ApplicationStateManager asm = (ApplicationStateManager) asmc.getMock();
-
- asm.exists("fred");
- asmc.setThrowable(t);
-
+ expect(asm.exists("fred")).andThrow(t);
+
ValueConverter vc = newValueConverter();
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestExpressionBinding.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.*;
import org.apache.tapestry.BindingException;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
@@ -31,41 +32,32 @@
{
public void testInvariant()
- {
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
-
- MockControl cc = newControl(IComponent.class);
- IComponent component = (IComponent) cc.getMock();
+ {
+ ExpressionEvaluator ev = createMock(ExpressionEvaluator.class);
+ ExpressionCache ec = createMock(ExpressionCache.class);
+ IComponent component = createMock(IComponent.class);
Object compiled = new Object();
-
+
Object expressionValue = "EXPRESSION-VALUE";
-
+
ValueConverter vc = newValueConverter();
-
- ec.getCompiledExpression("exp");
- ecc.setReturnValue(compiled);
-
- ev.isConstant("exp");
- evc.setReturnValue(true);
-
- ev.readCompiled(component, compiled);
- evc.setReturnValue(expressionValue);
-
- component.getExtendedId();
- cc.setReturnValue("Foo/bar.baz");
-
- replayControls();
-
+
+ expect(ec.getCompiledExpression("exp")).andReturn(compiled);
+
+ expect(ev.isConstant("exp")).andReturn(true);
+
+ expect(ev.readCompiled(component, compiled)).andReturn(expressionValue);
+
+ expect(component.getExtendedId()).andReturn("Foo/bar.baz");
+
+ replay(ev,ec,component);
+
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
-
+
assertEquals(true, b.isInvariant());
-
+
// A second time, to test the 'already initialized'
// code path.
@@ -79,7 +71,7 @@
assertEquals("ExpressionBinding[Foo/bar.baz exp]", b.toString());
- verifyControls();
+ verify(ev,ec,component);
}
public void testVariant()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.components;
+import static org.easymock.EasyMock.expect;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IForm;
@@ -47,23 +48,19 @@
public void testRenderPlainTrue()
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle) newMock(IRequestCycle.class);
IMarkupWriter writer = newWriter();
- cycle.isRewinding();
- cyclec.setReturnValue(false);
+ expect(cycle.isRewinding()).andReturn(false);
- cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- cyclec.setReturnValue(null);
+ expect(cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE)).andReturn(null);
trainResponseBuilder(cycle, writer);
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
- cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
- cyclec.setReturnValue(Boolean.TRUE);
+ expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.TRUE);
IRender body = newRender(writer, cycle);
IRender body2 = newRender();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java Sat Jun 17 15:46:22 2006
@@ -14,15 +14,16 @@
package org.apache.tapestry.dojo.form;
-import java.util.HashMap;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+
+import java.util.Map;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.IScript;
-import org.apache.tapestry.IgnoreMatcher;
import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.engine.DirectServiceParameter;
import org.apache.tapestry.engine.IEngineService;
@@ -34,7 +35,6 @@
import org.apache.tapestry.json.IJSONWriter;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.TextField}.
@@ -48,18 +48,13 @@
{
String[] values = { "red", "green", "blue" };
StringPropertySelectionModel model = new StringPropertySelectionModel(values);
-
- MockControl vfsc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport vfs = (ValidatableFieldSupport) vfsc.getMock();
+ ValidatableFieldSupport vfs = (ValidatableFieldSupport)newMock(ValidatableFieldSupport.class);
Autocompleter component = (Autocompleter) newInstance(Autocompleter.class, new Object[]
{ "model", model, "validatableFieldSupport", vfs });
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IForm form = (IForm) newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -77,7 +72,7 @@
String key = "0";
String value = values[0];
- trainGetParameter(cycle, "barney_selected", key);
+ trainGetParameter(cycle, "barney", key);
try
{
@@ -101,11 +96,8 @@
{
Autocompleter component = (Autocompleter) newInstance(Autocompleter.class);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
+ IForm form = (IForm) newMock(IForm.class);
IMarkupWriter writer = newWriter();
@@ -135,11 +127,8 @@
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 = (IRequestCycle)newMock(IRequestCycle.class);
+ IForm form = (IForm) newMock(IForm.class);
IMarkupWriter writer = newBufferWriter();
@@ -186,11 +175,7 @@
PageRenderSupport prs = newPageRenderSupport();
trainGetPageRenderSupport(cycle, prs);
- script.execute(cycle, prs, new HashMap());
-
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(script).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, null, ignore }));
+ script.execute(eq(cycle), eq(prs), isA(Map.class));
replayControls();
@@ -206,8 +191,7 @@
String[] values = { "red", "green", "blue", "yellow" };
StringPropertySelectionModel model = new StringPropertySelectionModel(values);
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
IJSONWriter json = newBufferJSONWriter();
@@ -228,14 +212,12 @@
public void testIsRequired()
{
- MockControl supportc = newControl(ValidatableFieldSupport.class);
- ValidatableFieldSupport support = (ValidatableFieldSupport) supportc.getMock();
+ ValidatableFieldSupport support = (ValidatableFieldSupport)newMock(ValidatableFieldSupport.class);
Autocompleter field = (Autocompleter) newInstance(Autocompleter.class, new Object[]
{ "validatableFieldSupport", support, });
- support.isRequired(field);
- supportc.setReturnValue(true);
+ expect(support.isRequired(field)).andReturn(true);
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.engine;
+import static org.easymock.EasyMock.*;
import java.util.HashMap;
import java.util.Map;
@@ -362,7 +363,6 @@
protected void trainGetRequiresSession(IAction action, boolean requiresSession)
{
- action.getRequiresSession();
- setReturnValue(action, requiresSession);
+ expect(action.getRequiresSession()).andReturn(requiresSession);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.engine;
+import static org.easymock.EasyMock.*;
import java.util.HashMap;
import java.util.Map;
@@ -484,34 +485,6 @@
protected void trainIsStateful(IDirectEvent direct, boolean isStateful)
{
- direct.isStateful();
- setReturnValue(direct, isStateful);
- }
-
- protected void trainExtractBrowserEvent(IRequestCycle cycle)
- {
- cycle.getParameter(BrowserEvent.NAME);
- setReturnValue(cycle, "onClick");
-
- cycle.getParameter(BrowserEvent.NAME);
- setReturnValue(cycle, "onClick");
-
- cycle.getParameter(BrowserEvent.TYPE);
- setReturnValue(cycle, "click");
- cycle.getParameters(BrowserEvent.KEYS);
- setReturnValue(cycle, null);
- cycle.getParameter(BrowserEvent.CHAR_CODE);
- setReturnValue(cycle, null);
- cycle.getParameter(BrowserEvent.PAGE_X);
- setReturnValue(cycle, "123");
- cycle.getParameter(BrowserEvent.PAGE_Y);
- setReturnValue(cycle, "1243");
- cycle.getParameter(BrowserEvent.LAYER_X);
- setReturnValue(cycle, null);
- cycle.getParameter(BrowserEvent.LAYER_Y);
- setReturnValue(cycle, null);
-
- cycle.getParameter(BrowserEvent.TARGET + "." + BrowserEvent.TARGET_ATTR_ID);
- setReturnValue(cycle, "element1");
+ expect(direct.isStateful()).andReturn(isStateful);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.engine;
+import static org.easymock.EasyMock.*;
import java.util.HashMap;
import java.util.Map;
@@ -365,8 +366,7 @@
protected void trainIsStateful(IDirect direct, boolean isStateful)
{
- direct.isStateful();
- setReturnValue(direct, isStateful);
+ expect(direct.isStateful()).andReturn(isStateful);
}
public void testStaleSession() throws Exception
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.engine;
+import static org.easymock.EasyMock.*;
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.IEngine;
@@ -69,9 +70,8 @@
{
Infrastructure infrastructure = (Infrastructure) newMock(Infrastructure.class);
- infrastructure.getPageSource();
- setReturnValue(infrastructure, source);
-
+ expect(infrastructure.getPageSource()).andReturn(source);
+
return infrastructure;
}
@@ -87,9 +87,8 @@
Infrastructure infrastructure = newInfrastructure(newPageSource());
- infrastructure.getServiceMap();
- setReturnValue(infrastructure, map);
-
+ expect(infrastructure.getServiceMap()).andReturn(map);
+
RequestCycleEnvironment env = new RequestCycleEnvironment(newErrorHandler(),
infrastructure, newStrategySource(), newBuilder());
IEngine engine = newEngine();
@@ -109,8 +108,7 @@
{
ServiceMap map = (ServiceMap) newMock(ServiceMap.class);
- map.getService(serviceName);
- setReturnValue(map, service);
+ expect(map.getService(serviceName)).andReturn(service);
return map;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.engine;
+import static org.easymock.EasyMock.*;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -24,6 +25,7 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.event.BrowserEvent;
import org.apache.tapestry.services.LinkFactory;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.web.WebRequest;
@@ -42,9 +44,7 @@
{
IPage result = (IPage) newMock(IPage.class);
- result.getPageName();
- setReturnValue(result, name);
-
+ expect(result.getPageName()).andReturn(name);
return result;
}
@@ -52,8 +52,7 @@
{
HttpServletRequest result = (HttpServletRequest) newMock(HttpServletRequest.class);
- result.getSession();
- setReturnValue(result, session);
+ expect(result.getSession()).andReturn(session);
return result;
}
@@ -62,8 +61,7 @@
{
WebRequest result = (WebRequest) newMock(WebRequest.class);
- result.getSession(false);
- setReturnValue(result, session);
+ expect(result.getSession(false)).andReturn(session);
return result;
}
@@ -72,8 +70,7 @@
{
HttpServletRequest result = (HttpServletRequest) newMock(HttpServletRequest.class);
- result.getSession(create);
- setReturnValue(result, session);
+ expect(result.getSession(create)).andReturn(session);
return result;
}
@@ -82,8 +79,7 @@
{
WebRequest result = (WebRequest) newMock(WebRequest.class);
- result.getSession(create);
- setReturnValue(result, session);
+ expect(result.getSession(create)).andReturn(session);
return result;
}
@@ -92,8 +88,7 @@
{
HttpSession session = newSession();
- session.isNew();
- setReturnValue(session, isNew);
+ expect(session.isNew()).andReturn(isNew);
return session;
}
@@ -102,8 +97,7 @@
{
WebSession session = newWebSession();
- session.isNew();
- setReturnValue(session, isNew);
+ expect(session.isNew()).andReturn(isNew);
return session;
}
@@ -127,9 +121,7 @@
{
LinkFactory lf = (LinkFactory) newMock(LinkFactory.class);
- lf.constructLink(null, false, parameters, stateful);
-
- setReturnValue(lf, link);
+ expect(lf.constructLink(null, false, parameters, stateful)).andReturn(link);
return lf;
}
@@ -142,8 +134,7 @@
protected void trainConstructLink(LinkFactory linkFactory, IEngineService service,
boolean post, Map parameters, boolean stateful, ILink link)
{
- linkFactory.constructLink(service, post, parameters, stateful);
- setReturnValue(linkFactory, link);
+ expect(linkFactory.constructLink(service, post, parameters, stateful)).andReturn(link);
}
protected LinkFactory newLinkFactory()
@@ -153,34 +144,56 @@
protected void trainGetPage(IRequestCycle cycle, IPage page)
{
- cycle.getPage();
- setReturnValue(cycle, page);
+ expect(cycle.getPage()).andReturn(page);
}
protected void trainGetNestedComponent(IPage page, String idPath, IComponent component)
{
- page.getNestedComponent(idPath);
- setReturnValue(page, component);
+ expect(page.getNestedComponent(idPath)).andReturn(component);
}
protected void trainGetPage(IRequestCycle cycle, String pageName, IPage page)
{
- cycle.getPage(pageName);
- setReturnValue(cycle, page);
+ expect(cycle.getPage(pageName)).andReturn(page);
}
protected void trainExtractListenerParameters(LinkFactory factory, IRequestCycle cycle, Object[] parameters)
{
- factory.extractListenerParameters(cycle);
- setReturnValue(factory, parameters);
+ expect(factory.extractListenerParameters(cycle)).andReturn(parameters);
}
protected void trainGetAbsoluteURL(IRequestCycle cycle, String shortURL, String fullURL)
{
- cycle.getAbsoluteURL(shortURL);
- setReturnValue(cycle, fullURL);
+ expect(cycle.getAbsoluteURL(shortURL)).andReturn(fullURL);
}
+ protected void trainExtractBrowserEvent(IRequestCycle cycle)
+ {
+ cycle.getParameter(BrowserEvent.NAME);
+ setReturnValue(cycle, "onClick");
+
+ cycle.getParameter(BrowserEvent.NAME);
+ setReturnValue(cycle, "onClick");
+
+ cycle.getParameter(BrowserEvent.TYPE);
+ setReturnValue(cycle, "click");
+ cycle.getParameters(BrowserEvent.KEYS);
+ setReturnValue(cycle, null);
+ cycle.getParameter(BrowserEvent.CHAR_CODE);
+ setReturnValue(cycle, null);
+ cycle.getParameter(BrowserEvent.PAGE_X);
+ setReturnValue(cycle, "123");
+ cycle.getParameter(BrowserEvent.PAGE_Y);
+ setReturnValue(cycle, "1243");
+ cycle.getParameter(BrowserEvent.LAYER_X);
+ setReturnValue(cycle, null);
+ cycle.getParameter(BrowserEvent.LAYER_Y);
+ setReturnValue(cycle, null);
+
+ cycle.getParameter(BrowserEvent.TARGET + "." + BrowserEvent.TARGET_ATTR_ID);
+ setReturnValue(cycle, "element1");
+ }
+
protected Log newLog()
{
return (Log) newMock(Log.class);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSessionScopeManager.java Sat Jun 17 15:46:22 2006
@@ -14,11 +14,12 @@
package org.apache.tapestry.engine.state;
+import static org.easymock.EasyMock.expect;
+
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.SessionStoreOptimized;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.engine.state.SessionScopeManager}.
@@ -30,22 +31,18 @@
{
private WebRequest newRequest(boolean create, WebSession session)
{
- MockControl control = newControl(WebRequest.class);
- WebRequest request = (WebRequest) control.getMock();
-
- request.getSession(create);
- control.setReturnValue(session);
+ WebRequest request = (WebRequest)newMock(WebRequest.class);
+
+ expect(request.getSession(create)).andReturn(session);
return request;
}
private WebRequest newRequest(WebSession session)
{
- MockControl control = newControl(WebRequest.class);
- WebRequest request = (WebRequest) control.getMock();
+ WebRequest request = (WebRequest)newMock(WebRequest.class);
- request.getSession(true);
- control.setReturnValue(session);
+ expect(request.getSession(true)).andReturn(session);
return request;
}
@@ -61,11 +58,9 @@
private StateObjectFactory newFactory(Object stateObject)
{
- MockControl control = newControl(StateObjectFactory.class);
- StateObjectFactory factory = (StateObjectFactory) control.getMock();
+ StateObjectFactory factory = (StateObjectFactory)newMock(StateObjectFactory.class);
- factory.createStateObject();
- control.setReturnValue(stateObject);
+ expect(factory.createStateObject()).andReturn(stateObject);
return factory;
}
@@ -194,8 +189,7 @@
{
SessionStoreOptimized optimized = (SessionStoreOptimized) newMock(SessionStoreOptimized.class);
- optimized.isStoreToSessionNeeded();
- setReturnValue(optimized,dirty);
+ expect(optimized.isStoreToSessionNeeded()).andReturn(dirty);
return optimized;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTestCase.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.*;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
import org.apache.tapestry.IBinding;
@@ -40,9 +42,7 @@
protected void trainIsInError(IValidationDelegate delegate, boolean isInError)
{
- delegate.isInError();
-
- setReturnValue(delegate,isInError);
+ expect(delegate.isInError()).andReturn(isInError);
}
protected IForm newForm()
@@ -52,43 +52,36 @@
protected void trainGetForm(IRequestCycle cycle, IForm form)
{
- cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
-
- setReturnValue(cycle,form);
+ expect(cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE)).andReturn(form);
}
protected void trainGetDelegate(IForm form, IValidationDelegate delegate)
{
- form.getDelegate();
-
- setReturnValue(form,delegate);
+ expect(form.getDelegate()).andReturn(delegate);
}
protected void trainGetParameter(IRequestCycle cycle, String parameterName,
String parameterValue)
{
- cycle.getParameter(parameterName);
- setReturnValue(cycle,parameterValue);
+ expect(cycle.getParameter(parameterName)).andReturn(parameterValue);
}
protected void trainWasPrerendered(IForm form, IMarkupWriter writer, IComponent component,
boolean wasPrerendered)
{
- form.wasPrerendered(writer, component);
- setReturnValue(form,wasPrerendered);
+ expect(form.wasPrerendered(writer, component)).andReturn(wasPrerendered);
}
protected void trainIsRewinding(IForm form, boolean isRewinding)
{
- form.isRewinding();
- setReturnValue(form,isRewinding);
+ expect(form.isRewinding()).andReturn(isRewinding);
}
-
+
protected void trainGetElementId(IForm form, IFormComponent component, String name)
{
form.getElementId(component);
component.setName(name);
- setReturnValue(form,name);
+ expectLastCall().andReturn(name);
}
protected IBinding newBinding()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormSupportTest.java Sat Jun 17 15:46:22 2006
@@ -14,9 +14,12 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.util.ClasspathResource;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IEngine;
import org.apache.tapestry.IForm;
@@ -27,6 +30,8 @@
import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.StaleLinkException;
import org.apache.tapestry.engine.ILink;
+import org.apache.tapestry.event.BrowserEvent;
+import org.apache.tapestry.services.impl.ComponentEventInvoker;
import org.apache.tapestry.valid.IValidationDelegate;
/**
@@ -163,7 +168,7 @@
form.setBody(body);
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -194,7 +199,7 @@
trainGetFocusField(delegate, "wilma");
trainGetFieldFocus(cycle, null);
- trainFocus(support);
+ trainFocus(support, form);
trainSetFieldFocus(cycle);
@@ -211,14 +216,15 @@
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
-
+ ComponentEventInvoker invoker = (ComponentEventInvoker)newMock(ComponentEventInvoker.class);
+
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
replayControls();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
-
+
verifyControls();
delegate.clear();
@@ -233,7 +239,12 @@
{ barney1, wilma, barney2 }, writer);
form.setBody(body);
-
+ form.setEventInvoker(invoker);
+
+ trainExtractBrowserEvent(cycle);
+
+ invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
+
replayControls();
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
@@ -272,7 +283,7 @@
}
});
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -345,7 +356,7 @@
}
});
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -463,7 +474,7 @@
}
});
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -541,7 +552,7 @@
}
});
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -575,7 +586,8 @@
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
-
+ ComponentEventInvoker invoker = org.easymock.classextension.EasyMock.createMock(ComponentEventInvoker.class);
+
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
@@ -595,7 +607,12 @@
IRender body = newComponentRenderBody(fs, component, writer);
form.setBody(body);
-
+ form.setEventInvoker(invoker);
+
+ trainExtractBrowserEvent(cycle);
+
+ invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
+
replayControls();
assertEquals(FormConstants.SUBMIT_REFRESH, fs.rewind());
@@ -631,7 +648,7 @@
form.setBody(body);
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "action" });
@@ -708,7 +725,7 @@
}
});
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -754,7 +771,9 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
-
+ ComponentEventInvoker invoker =
+ org.easymock.classextension.EasyMock.createMock(ComponentEventInvoker.class);
+
MockForm form = new MockForm(delegate);
trainIsRewound(cycle, form, true);
@@ -776,7 +795,12 @@
IRender body = newComponentRenderBody(fs, component, writer);
form.setBody(body);
-
+ form.setEventInvoker(invoker);
+
+ trainExtractBrowserEvent(cycle);
+
+ invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
+
replayControls();
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
@@ -900,7 +924,9 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
-
+ ComponentEventInvoker invoker =
+ org.easymock.classextension.EasyMock.createMock(ComponentEventInvoker.class);
+
MockForm form = new MockForm(delegate, l);
trainIsRewound(cycle, form, true);
@@ -927,7 +953,12 @@
{ barney1, wilma }, writer);
form.setBody(body);
-
+ form.setEventInvoker(invoker);
+
+ trainExtractBrowserEvent(cycle);
+
+ invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
+
replayControls();
try
@@ -976,7 +1007,7 @@
form.setBody(body);
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -1060,7 +1091,7 @@
form.setBody(body);
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -1132,7 +1163,7 @@
form.setBody(body);
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -1179,7 +1210,9 @@
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
-
+ ComponentEventInvoker invoker =
+ org.easymock.classextension.EasyMock.createMock(ComponentEventInvoker.class);
+
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
@@ -1199,7 +1232,12 @@
IRender body = newComponentRenderBody(fs, component, writer);
form.setBody(body);
-
+ form.setEventInvoker(invoker);
+
+ trainExtractBrowserEvent(cycle);
+
+ invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
+
replayControls();
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
@@ -1213,7 +1251,9 @@
IRequestCycle cycle = newCycle();
IValidationDelegate delegate = newDelegate();
MockForm form = new MockForm(delegate);
-
+ ComponentEventInvoker invoker =
+ org.easymock.classextension.EasyMock.createMock(ComponentEventInvoker.class);
+
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
@@ -1230,6 +1270,10 @@
writer.print("DEFERRED");
+ trainExtractBrowserEvent(cycle);
+
+ invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
+
replayControls();
IRender body = new IRender()
@@ -1250,7 +1294,8 @@
};
form.setBody(body);
-
+ form.setEventInvoker(invoker);
+
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
verifyControls();
@@ -1287,7 +1332,7 @@
}
});
- trainRegister(support);
+ trainRegister(support, form, "myform");
trainGetParameterNames(link, new String[]
{ "service" });
@@ -1346,9 +1391,9 @@
writer.attribute("style", "display:none;");
}
- private void trainFocus(PageRenderSupport support)
+ private void trainFocus(PageRenderSupport support, IForm form)
{
- support.addInitializationScript("Tapestry.set_focus('wilma');");
+ support.addInitializationScript(form, "tapestry.form.focusField('wilma');");
}
private void trainGetFieldFocus(IRequestCycle cycle, Object value)
@@ -1409,16 +1454,18 @@
protected void trainIsRewound(IRequestCycle cycle, IForm form, boolean isRewound)
{
- cycle.isRewound(form);
- setReturnValue(cycle, isRewound);
+ expect(cycle.isRewound(form)).andReturn(isRewound);
}
- private void trainRegister(PageRenderSupport support)
+ private void trainRegister(PageRenderSupport support, IForm form, String formId)
{
- support.addExternalScript(new ClasspathResource(getClassResolver(),
+ /* support.addExternalScript(new ClasspathResource(getClassResolver(),
"/org/apache/tapestry/form/Form.js"));
support.addInitializationScript("Tapestry.register_form('myform');");
+ */
+ support.addInitializationScript(form, "dojo.require(\"tapestry.form\");"
+ + "tapestry.form.registerForm('" + formId + "');");
}
private void trainSetFieldFocus(IRequestCycle cycle)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormTest.java Sat Jun 17 15:46:22 2006
@@ -14,15 +14,16 @@
package org.apache.tapestry.form;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.IgnoreMatcher;
import org.apache.tapestry.RenderRewoundException;
import org.apache.tapestry.TapestryUtils;
import org.apache.tapestry.engine.DirectServiceParameter;
@@ -31,7 +32,6 @@
import org.apache.tapestry.listener.ListenerInvoker;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.web.WebResponse;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.Form}. Most of the testing is, still alas, done with
@@ -54,15 +54,12 @@
protected void trainGetNextActionId(IRequestCycle cycle, String actionId)
{
- cycle.getNextActionId();
- setReturnValue(cycle, actionId);
+ expect(cycle.getNextActionId()).andReturn(actionId);
}
protected void trainGetUniqueId(IRequestCycle cycle, String baseId, String uniqueId)
{
- cycle.getUniqueId(baseId);
-
- setReturnValue(cycle, uniqueId);
+ expect(cycle.getUniqueId(baseId)).andReturn(uniqueId);
}
protected WebResponse newResponse()
@@ -72,8 +69,7 @@
protected void trainGetNamespace(WebResponse response, String namespace)
{
- response.getNamespace();
- setReturnValue(response, namespace);
+ expect(response.getNamespace()).andReturn(namespace);
}
protected IValidationDelegate newDelegate()
@@ -101,11 +97,9 @@
trainGetNextActionId(cycle, "7");
- support.rewind();
- setReturnValue(support, FormConstants.SUBMIT_NORMAL);
-
- delegate.getHasErrors();
- setReturnValue(delegate, false);
+ expect(support.rewind()).andReturn(FormConstants.SUBMIT_NORMAL);
+
+ expect(delegate.getHasErrors()).andReturn(false);
invoker.invokeListener(listener, form, cycle);
@@ -233,16 +227,12 @@
private void trainRender(FormSupport support, ILink link, IRender render, String scheme, Integer port)
{
- support.render("post", render, link, scheme, port);
- getControl(support).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, new IgnoreMatcher(), null, null }));
+ support.render(eq("post"), isA(IRender.class), eq(link), eq(scheme), eq(port));
}
protected void trainIsRewinding(FormSupport support, boolean isRewinding)
{
-
- support.isRewinding();
- setReturnValue(support, isRewinding);
+ expect(support.isRewinding()).andReturn(isRewinding);
}
public void testFindCancelListener()
@@ -332,7 +322,7 @@
IValidationDelegate delegate = newDelegate(true);
replayControls();
-
+
Form form = (Form) newInstance(Form.class, new Object[]
{ "delegate", delegate, "success", success, "cancel", cancel, "refresh", refresh,
"listener", listener });
@@ -344,12 +334,10 @@
private IValidationDelegate newDelegate(boolean hasErrors)
{
- MockControl control = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) control.getMock();
-
- delegate.getHasErrors();
- control.setReturnValue(hasErrors);
-
+ IValidationDelegate delegate = (IValidationDelegate) newMock(IValidationDelegate.class);
+
+ expect(delegate.getHasErrors()).andReturn(hasErrors);
+
return delegate;
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.*;
import java.util.Map;
import org.apache.hivemind.ApplicationRuntimeException;
@@ -248,27 +249,23 @@
private void trainIsRewinding(IForm form, boolean isRewindind)
{
- form.isRewinding();
- setReturnValue(form, isRewindind);
+ expect(form.isRewinding()).andReturn(isRewindind);
}
protected void trainGetElementId(IForm form, IFormComponent field, String name)
{
- form.getElementId(field);
- setReturnValue(form, name);
+ expect(form.getElementId(field)).andReturn(name);
}
protected void trainGetDelegate(IForm form, IValidationDelegate delegate)
{
- form.getDelegate();
- setReturnValue(form, delegate);
+ expect(form.getDelegate()).andReturn(delegate);
}
protected void trainWasPrerendered(IForm form, IMarkupWriter writer, IFormComponent field,
boolean wasPrendered)
{
- form.wasPrerendered(writer, field);
- setReturnValue(form, wasPrendered);
+ expect(form.wasPrerendered(writer, field)).andReturn(wasPrendered);
}
protected void trainGetForm(IRequestCycle cycle, IForm form)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java Sat Jun 17 15:46:22 2006
@@ -60,6 +60,8 @@
private JSONObject _profile = new JSONObject();
+ private ComponentEventInvoker _invoker;
+
public MockForm()
{
this(null, null);
@@ -363,7 +365,7 @@
*/
public ComponentEventInvoker getEventInvoker()
{
- return null;
+ return _invoker;
}
/**
@@ -371,6 +373,7 @@
*/
public void setEventInvoker(ComponentEventInvoker invoker)
{
+ _invoker = invoker;
}
/**
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=415077&r1=415076&r2=415077&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 Sat Jun 17 15:46:22 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+
import java.awt.Point;
import org.apache.hivemind.util.PropertyUtils;
@@ -25,7 +27,6 @@
import org.apache.tapestry.test.Creator;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidationConstants;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.ImageSubmit}.
@@ -37,11 +38,9 @@
{
protected IAsset newAsset(IRequestCycle cycle, String imageURL)
{
- MockControl control = newControl(IAsset.class);
- IAsset asset = (IAsset) control.getMock();
+ IAsset asset = (IAsset)newMock(IAsset.class);
- asset.buildURL();
- control.setReturnValue(imageURL);
+ expect(asset.buildURL()).andReturn(imageURL);
return asset;
}
@@ -51,10 +50,8 @@
Creator creator = new Creator();
ImageSubmit submit = (ImageSubmit) creator.newInstance(ImageSubmit.class);
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = (IForm)newMock(IForm.class);
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
@@ -70,12 +67,9 @@
public void testRender()
{
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
IAsset image = newAsset(cycle, "image-url");
@@ -88,10 +82,9 @@
trainWasPrerendered(form, writer, submit, false);
trainGetDelegate(form, delegate);
-
+
delegate.setFormComponent(submit);
- delegatec.setVoidCallable();
-
+
trainGetElementId(form, submit, "fred");
trainIsRewinding(form, false);
@@ -104,7 +97,7 @@
writer.attribute("border", 0);
writer.attribute("src", "image-url");
writer.closeTag();
-
+
trainIsInError(delegate, false);
delegate.registerForFocus(submit, ValidationConstants.NORMAL_FIELD);
@@ -118,13 +111,11 @@
public void testRenderDisabled()
{
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
+
IAsset image = newAsset(cycle, "disabled-image-url");
Creator creator = new Creator();
@@ -135,9 +126,8 @@
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
-
+ expect(form.getDelegate()).andReturn(delegate);
+
delegate.setFormComponent(submit);
trainGetElementId(form, submit, "fred");
@@ -163,13 +153,11 @@
public void testRenderDisabledNoDisabledImage()
{
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
+
IAsset image = newAsset(cycle, "image-url");
Creator creator = new Creator();
@@ -180,8 +168,7 @@
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
@@ -208,13 +195,11 @@
public void testRenderWithNameOverride()
{
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
+
IAsset image = newAsset(cycle, "image-url");
Creator creator = new Creator();
@@ -225,14 +210,12 @@
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
- form.getElementId(submit, "barney");
- formc.setReturnValue("barney$0");
-
+ expect(form.getElementId(submit, "barney")).andReturn("barney$0");
+
trainIsRewinding(form, false);
trainIsRewinding(cycle, false);
@@ -262,18 +245,15 @@
{ "disabled", Boolean.TRUE });
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
-
- form.getDelegate();
- formc.setReturnValue(delegate);
+
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
@@ -294,18 +274,15 @@
ImageSubmit submit = (ImageSubmit) creator.newInstance(ImageSubmit.class);
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
@@ -332,18 +309,15 @@
submit.setBinding("selected", binding);
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
@@ -380,18 +354,15 @@
submit.setBinding("point", binding);
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
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=415077&r1=415076&r2=415077&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 Sat Jun 17 15:46:22 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.expect;
+
import java.util.Collection;
import java.util.LinkedList;
@@ -27,7 +30,6 @@
import org.apache.tapestry.test.Creator;
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidationConstants;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.Submit}.
@@ -42,10 +44,8 @@
Creator creator = new Creator();
Submit submit = (Submit) creator.newInstance(Submit.class);
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = (IForm)newMock(IForm.class);
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
@@ -64,12 +64,9 @@
Creator creator = new Creator();
Submit submit = (Submit) creator.newInstance(Submit.class);
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
@@ -77,9 +74,8 @@
trainWasPrerendered(form, writer, submit, false);
trainGetDelegate(form, delegate);
-
+
delegate.setFormComponent(submit);
- delegatec.setVoidCallable();
trainGetElementId(form, submit, "fred");
@@ -109,12 +105,9 @@
Submit submit = (Submit) creator.newInstance(Submit.class, new Object[]
{ "disabled", Boolean.TRUE });
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
@@ -124,7 +117,6 @@
trainGetDelegate(form, delegate);
delegate.setFormComponent(submit);
- delegatec.setVoidCallable();
trainGetElementId(form, submit, "fred");
@@ -151,12 +143,9 @@
Submit submit = (Submit) creator.newInstance(Submit.class, new Object[]
{ "label", "flintstone" });
- MockControl delegatec = newControl(IValidationDelegate.class);
- IValidationDelegate delegate = (IValidationDelegate) delegatec.getMock();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IValidationDelegate delegate = newDelegate();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
@@ -166,7 +155,6 @@
trainGetDelegate(form, delegate);
delegate.setFormComponent(submit);
- delegatec.setVoidCallable();
trainGetElementId(form, submit, "fred");
@@ -198,19 +186,16 @@
{ "disabled", Boolean.TRUE });
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
-
+ expect(form.getDelegate()).andReturn(delegate);
+
delegate.setFormComponent(submit);
trainGetElementId(form, submit, "fred");
@@ -230,19 +215,16 @@
Submit submit = (Submit) creator.newInstance(Submit.class);
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
-
+ expect(form.getDelegate()).andReturn(delegate);
+
delegate.setFormComponent(submit);
trainGetElementId(form, submit, "fred");
@@ -263,19 +245,16 @@
Submit submit = (Submit) creator.newInstance(Submit.class);
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
-
+ expect(form.getDelegate()).andReturn(delegate);
+
delegate.setFormComponent(submit);
trainGetElementId(form, submit, "fred");
@@ -301,18 +280,15 @@
submit.setBinding("selected", binding);
IValidationDelegate delegate = newDelegate();
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newForm();
+ IRequestCycle cycle = newCycle();
IMarkupWriter writer = newWriter();
trainGetForm(cycle, form);
trainWasPrerendered(form, writer, submit, false);
- form.getDelegate();
- formc.setReturnValue(delegate);
+ expect(form.getDelegate()).andReturn(delegate);
delegate.setFormComponent(submit);
@@ -380,18 +356,15 @@
{
IActionListener action = newListener();
MockForm form = new MockForm();
- MockControl cycleControl = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cycleControl.getMock();
-
+ IRequestCycle cycle = newCycle();
+
Object parameter = new Object();
Creator creator = new Creator();
Submit submit = (Submit) creator.newInstance(Submit.class, new Object[]
{ "action", action, "parameters", parameter, "listenerInvoker",
new ListenerInvokerTerminator() });
-
- cycle.setListenerParameters(new Object[]
- { parameter });
- cycleControl.setMatcher(MockControl.ARRAY_MATCHER);
+
+ cycle.setListenerParameters(aryEq(new Object[] { parameter }));
replayControls();
@@ -412,8 +385,7 @@
{
IActionListener action = newListener();
MockForm form = new MockForm();
- MockControl cycleControl = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cycleControl.getMock();
+ IRequestCycle cycle = newCycle();
Collection parameters = new LinkedList();
parameters.add("p1");
@@ -424,9 +396,7 @@
{ "action", action, "parameters", parameters, "listenerInvoker",
new ListenerInvokerTerminator() });
- cycle.setListenerParameters(new Object[]
- { "p1", "p2" });
- cycleControl.setMatcher(MockControl.ARRAY_MATCHER);
+ cycle.setListenerParameters(aryEq(new Object[]{ "p1", "p2" }));
replayControls();
Re: easymock
Posted by Jesse Kuhnert <jk...@gmail.com>.
Yeah there is no problem with our jar definitions.
The only incompatible change is elimination of setReturnValue. This is
mostly a "good thing" though, as you get to pretty much eliminate having to
know about MockControl objects altogether. Everything is overall much much
better.
On 6/18/06, James Carman <ja...@carmanconsulting.com> wrote:
>
> Did you have to do anything to upgrade? Is there an incompatible API
> change?
>
>
> -----Original Message-----
> From: Jesse Kuhnert [mailto:jkuhnert@gmail.com]
> Sent: Sunday, June 18, 2006 1:57 AM
> To: Tapestry development
> Subject: Re: easymock
>
> Ah sorry about that Kent. I felt badly enough about my goof and any
> trouble
> that you might have run into that I went through the pain of upgrading
> everything already. :(
>
> I should probably have been more vocal about what I was doing, didn't know
> other cooks were coming into the kitchen. Not sure how everyone else
> feels,
> but can't imagine hivemind has ~more~ unit tests than tapestry - so maybe
> they would like to upgrade as well ? ;) (theoretically we should be
> independent in that regard besides the HivemindTestCase cross-over ? )
>
> As long as we're on the subject, I should warn everyone that I also
> plan/would like to change our unit tests to use TestNG as well. It's the
> only reason I went through all those months of interaction to make sure it
> was in maven2 to begin with. This of course doesn't need to happen ~right~
> now, but it should hopefully be something done relatively soon as we
> finish
> our migration to maven2. (just thought I would throw that out in case
> people
> thought it was a more casual choice )
>
> Of course I am not the only developer here, so people should feel free to
> speak up if there are any concerns. I'm not as good at being delicate with
> words so hopefully any bluntness on my part won't be perceived too badly..
>
> On 6/17/06, Kent Tong <ke...@cpttm.org.mo> wrote:
> >
> > Kent Tong <kent <at> cpttm.org.mo> writes:
> >
> > >
> > > > Oops! Now I know what Kent was talking about in regard to
> > easymock...We're
> > > > upgraded now!
> > >
> > > Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I
> > think
> > > we should stick to 1.1. What do you think?
> >
> > BTW, last night I just finished making maven2 build all the modules in
> > tapestry 4.1 properly and all tests pass (still with easymock 1.1). Now
> > all the code uses easymock 2.2. It's OK, but I'd like to know which
> > version to use.
> >
> > --
> > Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT
> )
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> > For additional commands, e-mail: dev-help@tapestry.apache.org
> >
> >
>
>
> --
> Jesse Kuhnert
> Tacos/Tapestry, team member/developer
>
> Open source based consulting work centered around
> dojo/tapestry/tacos/hivemind.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Jesse Kuhnert
Tacos/Tapestry, team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.
Re: easymock
Posted by Howard Lewis Ship <hl...@gmail.com>.
I'm all in favor of moving towards TestNG and EasyMock 2.0. That's what I
use for all my non-Tapestry-4 work.
On 6/18/06, James Carman <ja...@carmanconsulting.com> wrote:
>
> If HiveMindTestCase doesn't need to change to compile, then everything
> should be okay. We're marking the easymock jar as optional in our
> pom. So,
> if you provide another one that's newer and HiveMindTestCase still works,
> it
> should be good to go.
>
> -----Original Message-----
> From: James Carman [mailto:james@carmanconsulting.com]
> Sent: Sunday, June 18, 2006 9:33 AM
> To: 'Tapestry development'
> Subject: RE: easymock
>
> Did you have to do anything to upgrade? Is there an incompatible API
> change?
>
>
> -----Original Message-----
> From: Jesse Kuhnert [mailto:jkuhnert@gmail.com]
> Sent: Sunday, June 18, 2006 1:57 AM
> To: Tapestry development
> Subject: Re: easymock
>
> Ah sorry about that Kent. I felt badly enough about my goof and any
> trouble
> that you might have run into that I went through the pain of upgrading
> everything already. :(
>
> I should probably have been more vocal about what I was doing, didn't know
> other cooks were coming into the kitchen. Not sure how everyone else
> feels,
> but can't imagine hivemind has ~more~ unit tests than tapestry - so maybe
> they would like to upgrade as well ? ;) (theoretically we should be
> independent in that regard besides the HivemindTestCase cross-over ? )
>
> As long as we're on the subject, I should warn everyone that I also
> plan/would like to change our unit tests to use TestNG as well. It's the
> only reason I went through all those months of interaction to make sure it
> was in maven2 to begin with. This of course doesn't need to happen ~right~
> now, but it should hopefully be something done relatively soon as we
> finish
> our migration to maven2. (just thought I would throw that out in case
> people
> thought it was a more casual choice )
>
> Of course I am not the only developer here, so people should feel free to
> speak up if there are any concerns. I'm not as good at being delicate with
> words so hopefully any bluntness on my part won't be perceived too badly..
>
> On 6/17/06, Kent Tong <ke...@cpttm.org.mo> wrote:
> >
> > Kent Tong <kent <at> cpttm.org.mo> writes:
> >
> > >
> > > > Oops! Now I know what Kent was talking about in regard to
> > easymock...We're
> > > > upgraded now!
> > >
> > > Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I
> > think
> > > we should stick to 1.1. What do you think?
> >
> > BTW, last night I just finished making maven2 build all the modules in
> > tapestry 4.1 properly and all tests pass (still with easymock 1.1). Now
> > all the code uses easymock 2.2. It's OK, but I'd like to know which
> > version to use.
> >
> > --
> > Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT
> )
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> > For additional commands, e-mail: dev-help@tapestry.apache.org
> >
> >
>
>
> --
> Jesse Kuhnert
> Tacos/Tapestry, team member/developer
>
> Open source based consulting work centered around
> dojo/tapestry/tacos/hivemind.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Howard M. Lewis Ship
Independent J2EE / Open-Source Java Consultant
Creator and PMC Chair, Apache Tapestry
Creator, Jakarta HiveMind
Professional Tapestry training, mentoring, support
and project work. http://howardlewisship.com
RE: easymock
Posted by James Carman <ja...@carmanconsulting.com>.
If HiveMindTestCase doesn't need to change to compile, then everything
should be okay. We're marking the easymock jar as optional in our pom. So,
if you provide another one that's newer and HiveMindTestCase still works, it
should be good to go.
-----Original Message-----
From: James Carman [mailto:james@carmanconsulting.com]
Sent: Sunday, June 18, 2006 9:33 AM
To: 'Tapestry development'
Subject: RE: easymock
Did you have to do anything to upgrade? Is there an incompatible API
change?
-----Original Message-----
From: Jesse Kuhnert [mailto:jkuhnert@gmail.com]
Sent: Sunday, June 18, 2006 1:57 AM
To: Tapestry development
Subject: Re: easymock
Ah sorry about that Kent. I felt badly enough about my goof and any trouble
that you might have run into that I went through the pain of upgrading
everything already. :(
I should probably have been more vocal about what I was doing, didn't know
other cooks were coming into the kitchen. Not sure how everyone else feels,
but can't imagine hivemind has ~more~ unit tests than tapestry - so maybe
they would like to upgrade as well ? ;) (theoretically we should be
independent in that regard besides the HivemindTestCase cross-over ? )
As long as we're on the subject, I should warn everyone that I also
plan/would like to change our unit tests to use TestNG as well. It's the
only reason I went through all those months of interaction to make sure it
was in maven2 to begin with. This of course doesn't need to happen ~right~
now, but it should hopefully be something done relatively soon as we finish
our migration to maven2. (just thought I would throw that out in case people
thought it was a more casual choice )
Of course I am not the only developer here, so people should feel free to
speak up if there are any concerns. I'm not as good at being delicate with
words so hopefully any bluntness on my part won't be perceived too badly..
On 6/17/06, Kent Tong <ke...@cpttm.org.mo> wrote:
>
> Kent Tong <kent <at> cpttm.org.mo> writes:
>
> >
> > > Oops! Now I know what Kent was talking about in regard to
> easymock...We're
> > > upgraded now!
> >
> > Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I
> think
> > we should stick to 1.1. What do you think?
>
> BTW, last night I just finished making maven2 build all the modules in
> tapestry 4.1 properly and all tests pass (still with easymock 1.1). Now
> all the code uses easymock 2.2. It's OK, but I'd like to know which
> version to use.
>
> --
> Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Jesse Kuhnert
Tacos/Tapestry, team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
RE: easymock
Posted by James Carman <ja...@carmanconsulting.com>.
Did you have to do anything to upgrade? Is there an incompatible API
change?
-----Original Message-----
From: Jesse Kuhnert [mailto:jkuhnert@gmail.com]
Sent: Sunday, June 18, 2006 1:57 AM
To: Tapestry development
Subject: Re: easymock
Ah sorry about that Kent. I felt badly enough about my goof and any trouble
that you might have run into that I went through the pain of upgrading
everything already. :(
I should probably have been more vocal about what I was doing, didn't know
other cooks were coming into the kitchen. Not sure how everyone else feels,
but can't imagine hivemind has ~more~ unit tests than tapestry - so maybe
they would like to upgrade as well ? ;) (theoretically we should be
independent in that regard besides the HivemindTestCase cross-over ? )
As long as we're on the subject, I should warn everyone that I also
plan/would like to change our unit tests to use TestNG as well. It's the
only reason I went through all those months of interaction to make sure it
was in maven2 to begin with. This of course doesn't need to happen ~right~
now, but it should hopefully be something done relatively soon as we finish
our migration to maven2. (just thought I would throw that out in case people
thought it was a more casual choice )
Of course I am not the only developer here, so people should feel free to
speak up if there are any concerns. I'm not as good at being delicate with
words so hopefully any bluntness on my part won't be perceived too badly..
On 6/17/06, Kent Tong <ke...@cpttm.org.mo> wrote:
>
> Kent Tong <kent <at> cpttm.org.mo> writes:
>
> >
> > > Oops! Now I know what Kent was talking about in regard to
> easymock...We're
> > > upgraded now!
> >
> > Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I
> think
> > we should stick to 1.1. What do you think?
>
> BTW, last night I just finished making maven2 build all the modules in
> tapestry 4.1 properly and all tests pass (still with easymock 1.1). Now
> all the code uses easymock 2.2. It's OK, but I'd like to know which
> version to use.
>
> --
> Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Jesse Kuhnert
Tacos/Tapestry, team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: easymock
Posted by Howard Lewis Ship <hl...@gmail.com>.
To support Jesse here, I'm also a TestNG believer. It contains a huge number
of features, well beyong Junit, and it's well though out and has reasonable
IDE plugins. It also supports JDK 1.4 if you like, via an xdoclet kind of
approach.
On 6/23/06, Jesse Kuhnert <jk...@gmail.com> wrote:
>
> I think to me the question is more what is the benefit of Junit over
> TestNG?
> I've been creating annotation/configuration driven tests for a very long
> time now with TestNG. Junit4 is going to have to do a lot better than
> copying one (and not even a full copy!) feature to win me over.
>
> They also aren't supported in maven2 as far as I know...Plus I kind of
> like
> the testng engineers now :) Who knows, maybe the agility(snicker) of the
> junit engineers will surprise us all in the next few months but I doubt
> it..
>
> On 6/23/06, Kalle Korhonen <ka...@gmail.com> wrote:
> >
> > On 6/17/06, Jesse Kuhnert <jk...@gmail.com> wrote:
> > > As long as we're on the subject, I should warn everyone that I also
> > > plan/would like to change our unit tests to use TestNG as well. It's
> the
> >
> > Just asking - regarding Tap, what's the benefit of TestNG over Junit 4.x
> ?
> >
> > Kalle
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> > For additional commands, e-mail: dev-help@tapestry.apache.org
> >
> >
>
>
> --
> Jesse Kuhnert
> Tacos/Tapestry, team member/developer
>
> Open source based consulting work centered around
> dojo/tapestry/tacos/hivemind.
>
>
--
Howard M. Lewis Ship
Independent J2EE / Open-Source Java Consultant
Creator and PMC Chair, Apache Tapestry
Creator, Jakarta HiveMind
Professional Tapestry training, mentoring, support
and project work. http://howardlewisship.com
Re: easymock
Posted by Jesse Kuhnert <jk...@gmail.com>.
I think to me the question is more what is the benefit of Junit over TestNG?
I've been creating annotation/configuration driven tests for a very long
time now with TestNG. Junit4 is going to have to do a lot better than
copying one (and not even a full copy!) feature to win me over.
They also aren't supported in maven2 as far as I know...Plus I kind of like
the testng engineers now :) Who knows, maybe the agility(snicker) of the
junit engineers will surprise us all in the next few months but I doubt it..
On 6/23/06, Kalle Korhonen <ka...@gmail.com> wrote:
>
> On 6/17/06, Jesse Kuhnert <jk...@gmail.com> wrote:
> > As long as we're on the subject, I should warn everyone that I also
> > plan/would like to change our unit tests to use TestNG as well. It's the
>
> Just asking - regarding Tap, what's the benefit of TestNG over Junit 4.x?
>
> Kalle
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Jesse Kuhnert
Tacos/Tapestry, team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.
Re: easymock
Posted by Kalle Korhonen <ka...@gmail.com>.
On 6/17/06, Jesse Kuhnert <jk...@gmail.com> wrote:
> As long as we're on the subject, I should warn everyone that I also
> plan/would like to change our unit tests to use TestNG as well. It's the
Just asking - regarding Tap, what's the benefit of TestNG over Junit 4.x?
Kalle
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: easymock
Posted by Kent Tong <ke...@cpttm.org.mo>.
Jesse Kuhnert <jkuhnert <at> gmail.com> writes:
> I should probably have been more vocal about what I was doing, didn't know
> other cooks were coming into the kitchen. Not sure how everyone else feels,
> but can't imagine hivemind has ~more~ unit tests than tapestry - so maybe
> they would like to upgrade as well ? ;) (theoretically we should be
> independent in that regard besides the HivemindTestCase cross-over ? )
Well, I think in a classloader we can't have two versions of the same
lib. Either Tapestry or Hivemind will be confused.
> As long as we're on the subject, I should warn everyone that I also
> plan/would like to change our unit tests to use TestNG as well.
Thanks for the prior warning :-)
--
Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: easymock
Posted by Jesse Kuhnert <jk...@gmail.com>.
Ah sorry about that Kent. I felt badly enough about my goof and any trouble
that you might have run into that I went through the pain of upgrading
everything already. :(
I should probably have been more vocal about what I was doing, didn't know
other cooks were coming into the kitchen. Not sure how everyone else feels,
but can't imagine hivemind has ~more~ unit tests than tapestry - so maybe
they would like to upgrade as well ? ;) (theoretically we should be
independent in that regard besides the HivemindTestCase cross-over ? )
As long as we're on the subject, I should warn everyone that I also
plan/would like to change our unit tests to use TestNG as well. It's the
only reason I went through all those months of interaction to make sure it
was in maven2 to begin with. This of course doesn't need to happen ~right~
now, but it should hopefully be something done relatively soon as we finish
our migration to maven2. (just thought I would throw that out in case people
thought it was a more casual choice )
Of course I am not the only developer here, so people should feel free to
speak up if there are any concerns. I'm not as good at being delicate with
words so hopefully any bluntness on my part won't be perceived too badly..
On 6/17/06, Kent Tong <ke...@cpttm.org.mo> wrote:
>
> Kent Tong <kent <at> cpttm.org.mo> writes:
>
> >
> > > Oops! Now I know what Kent was talking about in regard to
> easymock...We're
> > > upgraded now!
> >
> > Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I
> think
> > we should stick to 1.1. What do you think?
>
> BTW, last night I just finished making maven2 build all the modules in
> tapestry 4.1 properly and all tests pass (still with easymock 1.1). Now
> all the code uses easymock 2.2. It's OK, but I'd like to know which
> version to use.
>
> --
> Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Jesse Kuhnert
Tacos/Tapestry, team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.
Re: easymock
Posted by Kent Tong <ke...@cpttm.org.mo>.
Kent Tong <kent <at> cpttm.org.mo> writes:
>
> > Oops! Now I know what Kent was talking about in regard to easymock...We're
> > upgraded now!
>
> Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I think
> we should stick to 1.1. What do you think?
BTW, last night I just finished making maven2 build all the modules in
tapestry 4.1 properly and all tests pass (still with easymock 1.1). Now
all the code uses easymock 2.2. It's OK, but I'd like to know which
version to use.
--
Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
easymock
Posted by Kent Tong <ke...@cpttm.org.mo>.
> Oops! Now I know what Kent was talking about in regard to easymock...We're
> upgraded now!
Do we really want to upgrade? As Hivemind 1.1 is using easymock 1.1, I think
we should stick to 1.1. What do you think?
--
Author of a book for learning Tapestry (http://www.agileskills2.org/EWDT)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org