You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/27 20:21:40 UTC
svn commit: r417545 [5/12] - in /tapestry/tapestry4/trunk: ./
examples/TimeTracker/src/context/ framework/
framework/src/java/org/apache/tapestry/form/validator/
framework/src/java/org/apache/tapestry/json/
framework/src/java/org/apache/tapestry/valid/...
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java Tue Jun 27 11:21:31 2006
@@ -14,17 +14,18 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+
import java.lang.reflect.Modifier;
import org.apache.hivemind.Location;
import org.apache.hivemind.service.BodyBuilder;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.services.ComponentPropertySource;
import org.apache.tapestry.spec.InjectSpecification;
import org.apache.tapestry.spec.InjectSpecificationImpl;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.InjectMetaWorker}.
@@ -32,7 +33,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestInjectMetaWorker extends HiveMindTestCase
+public class TestInjectMetaWorker extends BaseComponentTestCase
{
private InjectSpecification newSpec(String propertyName, String object, Location location)
{
@@ -56,22 +57,19 @@
InjectSpecification spec = newSpec("fooBar", "foo.bar", l);
ComponentPropertySource source = newSource();
+
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl control = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) control.getMock();
-
- op.getPropertyType("fooBar");
- control.setReturnValue(int.class);
+ expect(op.getPropertyType("fooBar")).andReturn(int.class);
op.claimReadonlyProperty("fooBar");
MethodSignature sig = new MethodSignature(int.class, "getFooBar", null, null);
- op.addInjectedField(InjectMetaWorker.SOURCE_NAME, ComponentPropertySource.class, source);
- control.setReturnValue("_source");
+ expect(op.addInjectedField(InjectMetaWorker.SOURCE_NAME, ComponentPropertySource.class, source))
+ .andReturn("_source");
- op.getAccessorMethodName("fooBar");
- control.setReturnValue("getFooBar");
+ expect(op.getAccessorMethodName("fooBar")).andReturn("getFooBar");
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -81,7 +79,7 @@
op.addMethod(Modifier.PUBLIC, sig, builder.toString(), l);
- replayControls();
+ replay();
InjectMetaWorker worker = new InjectMetaWorker();
@@ -89,7 +87,7 @@
worker.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testCharacter()
@@ -99,21 +97,18 @@
ComponentPropertySource source = newSource();
- MockControl control = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) control.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.getPropertyType("fooBar");
- control.setReturnValue(char.class);
+ expect(op.getPropertyType("fooBar")).andReturn(char.class);
op.claimReadonlyProperty("fooBar");
MethodSignature sig = new MethodSignature(char.class, "getFooBar", null, null);
- op.addInjectedField(InjectMetaWorker.SOURCE_NAME, ComponentPropertySource.class, source);
- control.setReturnValue("_source");
+ expect(op.addInjectedField(InjectMetaWorker.SOURCE_NAME, ComponentPropertySource.class, source))
+ .andReturn("_source");
- op.getAccessorMethodName("fooBar");
- control.setReturnValue("getFooBar");
+ expect(op.getAccessorMethodName("fooBar")).andReturn("getFooBar");
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -123,7 +118,7 @@
op.addMethod(Modifier.PUBLIC, sig, builder.toString(), l);
- replayControls();
+ replay();
InjectMetaWorker worker = new InjectMetaWorker();
@@ -131,7 +126,7 @@
worker.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testObject()
@@ -142,27 +137,23 @@
ComponentPropertySource source = newSource();
ValueConverter converter = (ValueConverter) newMock(ValueConverter.class);
- MockControl control = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) control.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.getPropertyType("fooBar");
- control.setReturnValue(Object.class);
+ expect(op.getPropertyType("fooBar")).andReturn(Object.class);
op.claimReadonlyProperty("fooBar");
MethodSignature sig = new MethodSignature(Object.class, "getFooBar", null, null);
- op.addInjectedField(InjectMetaWorker.SOURCE_NAME, ComponentPropertySource.class, source);
- control.setReturnValue("_source");
+ expect(op.addInjectedField(InjectMetaWorker.SOURCE_NAME, ComponentPropertySource.class, source))
+ .andReturn("_source");
- op.getAccessorMethodName("fooBar");
- control.setReturnValue("getFooBar");
+ expect(op.getAccessorMethodName("fooBar")).andReturn("getFooBar");
- op.addInjectedField("_$valueConverter", ValueConverter.class, converter);
- control.setReturnValue("vc");
+ expect(op.addInjectedField("_$valueConverter", ValueConverter.class, converter))
+ .andReturn("vc");
- op.getClassReference(Object.class);
- control.setReturnValue("_$Object");
+ expect(op.getClassReference(Object.class)).andReturn("_$Object");
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -172,7 +163,7 @@
op.addMethod(Modifier.PUBLIC, sig, builder.toString(), l);
- replayControls();
+ replay();
InjectMetaWorker worker = new InjectMetaWorker();
@@ -181,7 +172,7 @@
worker.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java Tue Jun 27 11:21:31 2006
@@ -14,18 +14,21 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.lang.reflect.Modifier;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.HomeService;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.services.InjectedValueProvider;
import org.apache.tapestry.spec.InjectSpecification;
import org.apache.tapestry.spec.InjectSpecificationImpl;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.InjectObjectWorker}.
@@ -33,7 +36,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestInjectObjectWorker extends HiveMindTestCase
+public class TestInjectObjectWorker extends BaseComponentTestCase
{
private InjectSpecification newSpec(String name, String locator, Location location)
{
@@ -53,27 +56,21 @@
InjectSpecification spec = newSpec("fred", "service:barney", l);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl pc = newControl(InjectedValueProvider.class);
- InjectedValueProvider p = (InjectedValueProvider) pc.getMock();
+ InjectedValueProvider p = newMock(InjectedValueProvider.class);
- op.getPropertyType("fred");
- opc.setReturnValue(null);
+ expect(op.getPropertyType("fred")).andReturn(null);
op.claimReadonlyProperty("fred");
- p.obtainValue("service:barney", l);
-
- pc.setReturnValue(injectedValue);
+ expect(p.obtainValue("service:barney", l)).andReturn(injectedValue);
// When the same bean is injected multiple times, the field name
// returned won't match the field name suggested; make sure the code
// generation used the correct field name.
- op.addInjectedField("_$fred", Object.class, injectedValue);
- opc.setReturnValue("_$gnarly");
+ expect(op.addInjectedField("_$fred", Object.class, injectedValue)).andReturn("_$gnarly");
op.addMethod(
Modifier.PUBLIC,
@@ -81,14 +78,14 @@
"return _$gnarly;",
l);
- replayControls();
+ replay();
InjectObjectWorker w = new InjectObjectWorker();
w.setProvider(p);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testWithExistingProperty()
@@ -98,34 +95,29 @@
InjectSpecification spec = newSpec("wilma", "service:betty", l);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl pc = newControl(InjectedValueProvider.class);
- InjectedValueProvider p = (InjectedValueProvider) pc.getMock();
+ InjectedValueProvider p = newMock(InjectedValueProvider.class);
- op.getPropertyType("wilma");
- opc.setReturnValue(IEngineService.class);
+ expect(op.getPropertyType("wilma")).andReturn(IEngineService.class);
op.claimReadonlyProperty("wilma");
- p.obtainValue("service:betty", l);
- pc.setReturnValue(injectedValue);
+ expect(p.obtainValue("service:betty", l)).andReturn(injectedValue);
- op.addInjectedField("_$wilma", IEngineService.class, injectedValue);
- opc.setReturnValue("_$wilma");
+ expect(op.addInjectedField("_$wilma", IEngineService.class, injectedValue)).andReturn("_$wilma");
op.addMethod(Modifier.PUBLIC, new MethodSignature(IEngineService.class, "getWilma", null,
null), "return _$wilma;", l);
- replayControls();
+ replay();
InjectObjectWorker w = new InjectObjectWorker();
w.setProvider(p);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
/**
@@ -139,21 +131,17 @@
InjectSpecification spec = newSpec("fred", "service:barney", l);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl pc = newControl(InjectedValueProvider.class);
- InjectedValueProvider p = (InjectedValueProvider) pc.getMock();
+ InjectedValueProvider p = newMock(InjectedValueProvider.class);
- op.getPropertyType("fred");
- opc.setReturnValue(null);
+ expect(op.getPropertyType("fred")).andReturn(null);
op.claimReadonlyProperty("fred");
- p.obtainValue("service:barney", l);
- pc.setReturnValue(null);
+ expect(p.obtainValue("service:barney", l)).andReturn(null);
- replayControls();
+ replay();
InjectObjectWorker w = new InjectObjectWorker();
w.setProvider(p);
@@ -169,7 +157,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testInjectedValueWrongType()
@@ -178,21 +166,17 @@
InjectSpecification spec = newSpec("fred", "service:barney", l);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl pc = newControl(InjectedValueProvider.class);
- InjectedValueProvider p = (InjectedValueProvider) pc.getMock();
+ InjectedValueProvider p = newMock(InjectedValueProvider.class);
- op.getPropertyType("fred");
- opc.setReturnValue(IEngineService.class);
+ expect(op.getPropertyType("fred")).andReturn(IEngineService.class);
op.claimReadonlyProperty("fred");
- p.obtainValue("service:barney", l);
- pc.setReturnValue("INJECTED-VALUE");
+ expect(p.obtainValue("service:barney", l)).andReturn("INJECTED-VALUE");
- replayControls();
+ replay();
InjectObjectWorker w = new InjectObjectWorker();
w.setProvider(p);
@@ -211,6 +195,6 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectPageWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectPageWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectPageWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectPageWorker.java Tue Jun 27 11:21:31 2006
@@ -14,16 +14,19 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.lang.reflect.Modifier;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.html.BasePage;
import org.apache.tapestry.spec.InjectSpecification;
import org.apache.tapestry.spec.InjectSpecificationImpl;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.InjectPageWorker}.
@@ -31,19 +34,17 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public class TestInjectPageWorker extends HiveMindTestCase
+public class TestInjectPageWorker extends BaseComponentTestCase
{
public void testPrimitivePropertyType()
{
Location l = newLocation();
+
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
-
- op.getPropertyType("somePage");
- opc.setReturnValue(int.class);
+ expect(op.getPropertyType("somePage")).andReturn(int.class);
- replayControls();
+ replay();
InjectSpecification is = newSpec(l);
@@ -60,7 +61,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
private InjectSpecification newSpec(Location l)
@@ -81,16 +82,13 @@
{
Location l = newLocation();
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.getPropertyType("somePage");
- opc.setReturnValue(null);
+ expect(op.getPropertyType("somePage")).andReturn(null);
op.claimReadonlyProperty("somePage");
- op.getAccessorMethodName("somePage");
- opc.setReturnValue("getSomePage");
+ expect(op.getAccessorMethodName("somePage")).andReturn("getSomePage");
MethodSignature sig = new MethodSignature(Object.class, "getSomePage", null, null);
@@ -100,29 +98,26 @@
"return getPage().getRequestCycle().getPage(\"SomePage\");",
l);
- replayControls();
+ replay();
InjectSpecification is = newSpec(l);
new InjectPageWorker().performEnhancement(op, is);
- verifyControls();
+ verify();
}
public void testExistingPropertyType()
{
Location l = newLocation();
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.getPropertyType("somePage");
- opc.setReturnValue(BasePage.class);
+ expect(op.getPropertyType("somePage")).andReturn(BasePage.class);
op.claimReadonlyProperty("somePage");
- op.getAccessorMethodName("somePage");
- opc.setReturnValue("getSomePage");
+ expect(op.getAccessorMethodName("somePage")).andReturn("getSomePage");
MethodSignature sig = new MethodSignature(BasePage.class, "getSomePage", null, null);
@@ -136,12 +131,12 @@
"return (org.apache.tapestry.html.BasePage)getPage().getRequestCycle().getPage(\"SomePage\");",
l);
- replayControls();
+ replay();
InjectSpecification is = newSpec(l);
new InjectPageWorker().performEnhancement(op, is);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectScriptWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectScriptWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectScriptWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectScriptWorker.java Tue Jun 27 11:21:31 2006
@@ -14,18 +14,17 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+
import java.lang.reflect.Modifier;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IScript;
import org.apache.tapestry.engine.IScriptSource;
import org.apache.tapestry.spec.InjectSpecificationImpl;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.InjectScriptWorker}.
@@ -33,12 +32,11 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestInjectScriptWorker extends HiveMindTestCase
+public class TestInjectScriptWorker extends BaseComponentTestCase
{
public void testSuccess()
{
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
Location componentSpecLocation = newLocation();
final Resource scriptResource = componentSpecLocation.getResource().getRelativeResource(
@@ -50,15 +48,14 @@
op.claimReadonlyProperty("foo");
- op.getPropertyType("foo");
- opc.setReturnValue(IScript.class);
+ expect(op.getPropertyType("foo")).andReturn(IScript.class);
- op.getAccessorMethodName("foo");
- opc.setReturnValue("getFoo");
+ expect(op.getAccessorMethodName("foo")).andReturn("getFoo");
- op.addInjectedField("_$script", DeferredScript.class, new DeferredScriptImpl(scriptResource,
- source, injectSpecLocation));
- opc.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
+ expect(op.addInjectedField("_$script", DeferredScript.class, new DeferredScriptImpl(scriptResource,
+ source, injectSpecLocation)))
+ .andReturn("_script");
+ /* opc.setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
{ null, null, new ArgumentMatcher()
{
@@ -72,14 +69,13 @@
}
- }));
- opc.setReturnValue("_script");
+ }));*/
MethodSignature sig = new MethodSignature(IScript.class, "getFoo", null, null);
op.addMethod(Modifier.PUBLIC, sig, "return _script.getScript();", injectSpecLocation);
- replayControls();
+ replay();
InjectSpecificationImpl is = new InjectSpecificationImpl();
is.setProperty("foo");
@@ -91,6 +87,6 @@
worker.performEnhancement(op, is);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectSpecificationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectSpecificationWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectSpecificationWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectSpecificationWorker.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+
import java.lang.reflect.Modifier;
import org.apache.hivemind.ApplicationRuntimeException;
@@ -22,7 +25,6 @@
import org.apache.hivemind.service.MethodSignature;
import org.apache.tapestry.BaseComponent;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.InjectSpecificationWorker}.
@@ -36,66 +38,59 @@
public void testSuccess() throws Exception
{
Location l = newLocation();
-
- MockControl control = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) control.getMock();
+
+ EnhancementOperation op = newOp();
IComponentSpecification spec = newSpec(l);
op.claimReadonlyProperty("specification");
- op.addInjectedField("_$specification", IComponentSpecification.class, spec);
- control.setReturnValue("_$specification");
+ expect(op.addInjectedField("_$specification", IComponentSpecification.class, spec))
+ .andReturn("_$specification");
- op.getAccessorMethodName("specification");
- control.setReturnValue("getSpecification");
+ expect(op.getAccessorMethodName("specification")).andReturn("getSpecification");
op.addMethod(Modifier.PUBLIC, new MethodSignature(IComponentSpecification.class,
"getSpecification", null, null), "return _$specification;", l);
- replayControls();
+ replay();
new InjectSpecificationWorker().performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testFailure()
{
Location l = newLocation();
-
- MockControl control = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) control.getMock();
+ EnhancementOperation op = newOp();
ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
Throwable ex = new ApplicationRuntimeException(EnhanceMessages
.claimedProperty("specification"));
-
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
+
+ IComponentSpecification spec = newSpec();
op.claimReadonlyProperty("specification");
- control.setThrowable(ex);
+ expectLastCall().andThrow(ex);
- op.getBaseClass();
- control.setReturnValue(BaseComponent.class);
+ expect(op.getBaseClass()).andReturn(BaseComponent.class);
- spec.getLocation();
- specc.setReturnValue(l);
+ expect(spec.getLocation()).andReturn(l);
log.error(
EnhanceMessages.errorAddingProperty("specification", BaseComponent.class, ex),
l,
ex);
- replayControls();
+ replay();
InjectSpecificationWorker w = new InjectSpecificationWorker();
w.setErrorLog(log);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectStateWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectStateWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectStateWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectStateWorker.java Tue Jun 27 11:21:31 2006
@@ -14,18 +14,19 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+
import java.lang.reflect.Modifier;
import java.util.Map;
import org.apache.hivemind.Location;
import org.apache.hivemind.service.BodyBuilder;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.state.ApplicationStateManager;
import org.apache.tapestry.event.PageDetachListener;
import org.apache.tapestry.spec.InjectSpecification;
import org.apache.tapestry.spec.InjectSpecificationImpl;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.InjectStateWorker}.
@@ -33,7 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestInjectStateWorker extends HiveMindTestCase
+public class TestInjectStateWorker extends BaseComponentTestCase
{
private ApplicationStateManager newASM()
{
@@ -55,22 +56,20 @@
{
Location l = newLocation();
InjectSpecification spec = newSpec("fred", "barney", l);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+
+ EnhancementOperation op = newMock(EnhancementOperation.class);
ApplicationStateManager asm = newASM();
- op.getPropertyType("fred");
- opc.setReturnValue(Map.class);
+ expect(op.getPropertyType("fred")).andReturn(Map.class);
op.claimProperty("fred");
op.addField("_$fred", Map.class);
- op.addInjectedField("_$applicationStateManager", ApplicationStateManager.class, asm);
- opc.setReturnValue("_$applicationStateManager");
+ expect(op.addInjectedField("_$applicationStateManager", ApplicationStateManager.class, asm))
+ .andReturn("_$applicationStateManager");
- op.getAccessorMethodName("fred");
- opc.setReturnValue("getFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("getFred");
BodyBuilder builder = new BodyBuilder();
@@ -101,13 +100,13 @@
EnhanceUtils.PAGE_DETACHED_SIGNATURE,
"_$fred = null;");
- replayControls();
+ replay();
InjectStateWorker w = new InjectStateWorker();
w.setApplicationStateManager(asm);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestParameterPropertyWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestParameterPropertyWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestParameterPropertyWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestParameterPropertyWorker.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+
import java.lang.reflect.Modifier;
import java.util.Collections;
@@ -22,20 +24,19 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.service.BodyBuilder;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.BaseComponent;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IParameterSpecification;
import org.apache.tapestry.spec.ParameterSpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.ParameterPropertyWorker}.
*
* @author Howard M. Lewis Ship
*/
-public class TestParameterPropertyWorker extends HiveMindTestCase
+public class TestParameterPropertyWorker extends BaseComponentTestCase
{
private ParameterSpecification buildParameterSpec(String parameterName, String type,
@@ -60,16 +61,12 @@
private IComponentSpecification buildComponentSpecification(String parameterName,
IParameterSpecification ps)
{
- MockControl c = newControl(IComponentSpecification.class);
- IComponentSpecification result = (IComponentSpecification) c.getMock();
-
- result.getParameterNames();
-
- c.setReturnValue(Collections.singletonList(parameterName));
+ IComponentSpecification result = newSpec();
- result.getParameter(parameterName);
- c.setReturnValue(ps);
+ expect(result.getParameterNames()).andReturn(Collections.singletonList(parameterName));
+ expect(result.getParameter(parameterName)).andReturn(ps);
+
return result;
}
@@ -81,18 +78,15 @@
"wilma",
"String",
l));
-
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
-
- op.convertTypeName("String");
+
+ EnhancementOperation op = newMock(EnhancementOperation.class);
+
Throwable ex = new ApplicationRuntimeException("Simulated error.");
- opc.setThrowable(ex);
+ expect(op.convertTypeName("String")).andThrow(ex);
- op.getBaseClass();
- opc.setReturnValue(BaseComponent.class);
+ expect(op.getBaseClass()).andReturn(BaseComponent.class);
- ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
+ ErrorLog log = newMock(ErrorLog.class);
log
.error(
@@ -100,14 +94,14 @@
l,
ex);
- replayControls();
+ replay();
ParameterPropertyWorker w = new ParameterPropertyWorker();
w.setErrorLog(log);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testSkipParameterAlias()
@@ -119,13 +113,13 @@
EnhancementOperation op = (EnhancementOperation) newMock(EnhancementOperation.class);
- replayControls();
+ replay();
ParameterPropertyWorker w = new ParameterPropertyWorker();
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
/**
@@ -140,20 +134,17 @@
null,
null));
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
-
- op.getPropertyType("fred");
- opc.setReturnValue(String.class);
+ EnhancementOperation op = newMock(EnhancementOperation.class);
+ expect(op.getPropertyType("fred")).andReturn(String.class);
+
op.claimProperty("fred");
op.addField("_$fred", String.class);
op.addField("_$fred$Default", String.class);
op.addField("_$fred$Cached", boolean.class);
- op.getClassReference(String.class);
- opc.setReturnValue("_class$String");
+ expect(op.getClassReference(String.class)).andReturn("_class$String");
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -170,8 +161,7 @@
builder.addln("return result;");
builder.end();
- op.getAccessorMethodName("fred");
- opc.setReturnValue("getFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("getFred");
op.addMethod(
Modifier.PUBLIC,
@@ -220,13 +210,13 @@
EnhanceUtils.CLEANUP_AFTER_RENDER_SIGNATURE,
expectedCleanup.toString());
- replayControls();
+ replay();
ParameterPropertyWorker w = new ParameterPropertyWorker();
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
/**
@@ -243,11 +233,9 @@
null,
l));
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.getPropertyType("fred");
- opc.setReturnValue(String.class);
+ expect(op.getPropertyType("fred")).andReturn(String.class);
op.claimProperty("fred");
@@ -255,8 +243,7 @@
op.addField("_$fred$Default", String.class);
op.addField("_$fred$Cached", boolean.class);
- op.getClassReference(String.class);
- opc.setReturnValue("_class$String");
+ expect(op.getClassReference(String.class)).andReturn("_class$String");
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -273,8 +260,7 @@
builder.addln("return result;");
builder.end();
- op.getAccessorMethodName("fred");
- opc.setReturnValue("getFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("getFred");
op.addMethod(
Modifier.PUBLIC,
@@ -324,21 +310,20 @@
EnhanceUtils.CLEANUP_AFTER_RENDER_SIGNATURE,
expectedCleanup.toString());
- replayControls();
+ replay();
ParameterPropertyWorker w = new ParameterPropertyWorker();
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testPrimitiveType()
{
Location l = newLocation();
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -355,8 +340,7 @@
builder.addln("return result;");
builder.end();
- op.getAccessorMethodName("fred");
- opc.setReturnValue("isFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("isFred");
op.addMethod(
Modifier.PUBLIC,
@@ -364,7 +348,7 @@
builder.toString(),
l);
- replayControls();
+ replay();
new ParameterPropertyWorker().buildAccessor(
op,
@@ -377,15 +361,14 @@
true,
l);
- verifyControls();
+ verify();
}
public void testParameterCacheDisabled()
{
Location l = newLocation();
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
BodyBuilder builder = new BodyBuilder();
builder.begin();
@@ -402,8 +385,7 @@
builder.addln("return result;");
builder.end();
- op.getAccessorMethodName("fred");
- opc.setReturnValue("isFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("isFred");
op.addMethod(
Modifier.PUBLIC,
@@ -411,7 +393,7 @@
builder.toString(),
l);
- replayControls();
+ replay();
new ParameterPropertyWorker().buildAccessor(
op,
@@ -424,6 +406,6 @@
false,
l);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestSpecifiedPropertyWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestSpecifiedPropertyWorker.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestSpecifiedPropertyWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestSpecifiedPropertyWorker.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.enhance;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,8 +28,8 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.service.BodyBuilder;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.BaseComponent;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.BindingSource;
@@ -34,7 +37,6 @@
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IPropertySpecification;
import org.apache.tapestry.spec.PropertySpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.enhance.SpecifiedPropertyWorker}.
@@ -42,7 +44,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestSpecifiedPropertyWorker extends HiveMindTestCase
+public class TestSpecifiedPropertyWorker extends BaseComponentTestCase
{
private List buildPropertySpecs(String name, String type, boolean persistent)
{
@@ -72,20 +74,17 @@
names.add(ps.getName());
}
+
+ IComponentSpecification result = newSpec();
- MockControl c = newControl(IComponentSpecification.class);
- IComponentSpecification result = (IComponentSpecification) c.getMock();
-
- result.getPropertySpecificationNames();
- c.setReturnValue(names);
+ expect(result.getPropertySpecificationNames()).andReturn(names);
i = propertySpecs.iterator();
while (i.hasNext())
{
IPropertySpecification ps = (IPropertySpecification) i.next();
- result.getPropertySpecification(ps.getName());
- c.setReturnValue(ps);
+ expect(result.getPropertySpecification(ps.getName())).andReturn(ps);
}
return result;
@@ -109,19 +108,15 @@
null));
// Training
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
-
- op.convertTypeName("boolean");
- opc.setReturnValue(boolean.class);
+ expect(op.convertTypeName("boolean")).andReturn(boolean.class);
op.validateProperty("fred", boolean.class);
op.claimProperty("fred");
op.addField("_$fred", boolean.class);
- op.getAccessorMethodName("fred");
- opc.setReturnValue("isFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("isFred");
op.addMethod(
Modifier.PUBLIC,
@@ -144,13 +139,13 @@
EnhanceUtils.PAGE_DETACHED_SIGNATURE,
"_$fred = _$fred$default;");
- replayControls();
+ replay();
SpecifiedPropertyWorker w = new SpecifiedPropertyWorker();
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testAddWithInitialValue() throws Exception
@@ -170,18 +165,15 @@
// Training
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.convertTypeName("java.util.List");
- opc.setReturnValue(List.class);
+ expect(op.convertTypeName("java.util.List")).andReturn(List.class);
op.validateProperty("fred", List.class);
op.claimProperty("fred");
op.addField("_$fred", List.class);
- op.getAccessorMethodName("fred");
- opc.setReturnValue("getFred");
+ expect(op.getAccessorMethodName("fred")).andReturn("getFred");
op.addMethod(
Modifier.PUBLIC,
@@ -192,11 +184,11 @@
op.addMethod(Modifier.PUBLIC, new MethodSignature(void.class, "setFred", new Class[]
{ List.class }, null), "{\n _$fred = $1;\n}\n", l);
- op.addInjectedField(
+ expect(op.addInjectedField(
"_$fred$initialValueBindingCreator",
InitialValueBindingCreator.class,
- expectedCreator);
- opc.setReturnValue("_$fred$initialValueBindingCreator");
+ expectedCreator)).andReturn("_$fred$initialValueBindingCreator");
+
op.addField("_$fred$initialValueBinding", IBinding.class);
op
.extendMethodImplementation(
@@ -204,8 +196,7 @@
EnhanceUtils.FINISH_LOAD_SIGNATURE,
"_$fred$initialValueBinding = _$fred$initialValueBindingCreator.createBinding(this);\n");
- op.getClassReference(List.class);
- opc.setReturnValue("_$class$java$util$List");
+ expect(op.getClassReference(List.class)).andReturn("_$class$java$util$List");
String code = "_$fred = (java.util.List) _$fred$initialValueBinding.getObject(_$class$java$util$List);\n";
@@ -215,14 +206,14 @@
EnhanceUtils.PAGE_DETACHED_SIGNATURE,
code);
- replayControls();
+ replay();
SpecifiedPropertyWorker w = new SpecifiedPropertyWorker();
w.setBindingSource(bs);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testAddPersistent() throws Exception
@@ -234,18 +225,15 @@
// Training
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
- op.convertTypeName("java.lang.String");
- opc.setReturnValue(String.class);
+ expect(op.convertTypeName("java.lang.String")).andReturn(String.class);
op.validateProperty("barney", String.class);
op.claimProperty("barney");
op.addField("_$barney", String.class);
- op.getAccessorMethodName("barney");
- opc.setReturnValue("getBarney");
+ expect(op.getAccessorMethodName("barney")).andReturn("getBarney");
op.addMethod(
Modifier.PUBLIC,
@@ -274,13 +262,13 @@
EnhanceUtils.PAGE_DETACHED_SIGNATURE,
"_$barney = _$barney$default;");
- replayControls();
+ replay();
SpecifiedPropertyWorker w = new SpecifiedPropertyWorker();
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
public void testFailure() throws Exception
@@ -290,15 +278,14 @@
List propertySpecs = buildPropertySpecs("wilma", "Long", false, l, null);
IComponentSpecification spec = buildComponentSpecification(propertySpecs);
- MockControl opc = newControl(EnhancementOperation.class);
- EnhancementOperation op = (EnhancementOperation) opc.getMock();
+ EnhancementOperation op = newMock(EnhancementOperation.class);
op.convertTypeName("Long");
Throwable ex = new ApplicationRuntimeException("Simulated error.");
- opc.setThrowable(ex);
+ expectLastCall().andThrow(ex);
+
- op.getBaseClass();
- opc.setReturnValue(BaseComponent.class);
+ expect(op.getBaseClass()).andReturn(BaseComponent.class);
ErrorLog log = (ErrorLog) newMock(ErrorLog.class);
@@ -308,14 +295,14 @@
l,
ex);
- replayControls();
+ replay();
SpecifiedPropertyWorker w = new SpecifiedPropertyWorker();
w.setErrorLog(log);
w.performEnhancement(op, spec);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/BaseErrorTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,13 +14,15 @@
package org.apache.tapestry.error;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.error.TestExceptionPresenter.ExceptionFixture;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.test.Creator;
-import org.easymock.MockControl;
/**
* Base class for tests of the various error reporting service implementations.
@@ -28,7 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public abstract class BaseErrorTestCase extends HiveMindTestCase
+public abstract class BaseErrorTestCase extends BaseComponentTestCase
{
protected IPage newPage()
@@ -40,24 +42,21 @@
protected IRequestCycle newCycle(String pageName, IPage page)
{
- MockControl control = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) control.getMock();
-
- cycle.getPage(pageName);
- control.setReturnValue(page);
+ IRequestCycle cycle = newCycle();
+
+ expect(cycle.getPage(pageName)).andReturn(page);
return cycle;
}
protected ResponseRenderer newRenderer(IRequestCycle cycle, Throwable throwable) throws Exception
{
- MockControl control = newControl(ResponseRenderer.class);
- ResponseRenderer renderer = (ResponseRenderer) control.getMock();
+ ResponseRenderer renderer = newMock(ResponseRenderer.class);
renderer.renderResponse(cycle);
if (throwable != null)
- control.setThrowable(throwable);
+ expectLastCall().andThrow(throwable);
return renderer;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/StaleSessionExceptionPresenterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/StaleSessionExceptionPresenterTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/StaleSessionExceptionPresenterTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/StaleSessionExceptionPresenterTest.java Tue Jun 27 11:21:31 2006
@@ -35,7 +35,7 @@
cycle.activate(page);
- replayControls();
+ replay();
StaleSessionExceptionPresenterImpl presenter = new StaleSessionExceptionPresenterImpl();
@@ -44,7 +44,7 @@
presenter.presentStaleSessionException(cycle, new StaleSessionException());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/error/TestExceptionPresenter.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.error;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
@@ -43,7 +45,7 @@
cycle.activate(page);
- replayControls();
+ replay();
ExceptionPresenterImpl ep = new ExceptionPresenterImpl();
ep.setExceptionPageName("Exception");
@@ -51,7 +53,7 @@
ep.presentException(cycle, cause);
- verifyControls();
+ verify();
assertSame(cause, page.getProperty("exception"));
}
@@ -74,7 +76,7 @@
ErrorMessages.unableToPresentExceptionPage(renderCause),
renderCause);
- replayControls();
+ replay();
ExceptionPresenterImpl ep = new ExceptionPresenterImpl();
ep.setExceptionPageName("Exception");
@@ -91,7 +93,7 @@
assertSame(renderCause, ex.getRootCause());
}
- verifyControls();
+ verify();
assertSame(cause, page.getProperty("exception"));
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,9 @@
package org.apache.tapestry.event;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.testng.AssertJUnit.assertSame;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.describe.DescriptionReceiver;
/**
@@ -23,7 +25,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class ReportStatusEventTest extends HiveMindTestCase
+public class ReportStatusEventTest extends BaseComponentTestCase
{
protected DescriptionReceiver newReceiver()
{
@@ -34,13 +36,13 @@
{
DescriptionReceiver receiver = newReceiver();
- replayControls();
+ replay();
ReportStatusEvent event = new ReportStatusEvent(this, receiver);
assertSame(this, event.getSource());
- verifyControls();
+ verify();
}
public void testDelegation()
@@ -66,7 +68,7 @@
receiver.section("Section");
receiver.title("Title");
- replayControls();
+ replay();
ReportStatusEvent event = new ReportStatusEvent(this, receiver);
@@ -85,7 +87,7 @@
event.section("Section");
event.title("Title");
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/AbstractFormComponentTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/AbstractFormComponentTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/AbstractFormComponentTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/AbstractFormComponentTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.hivemind.util.PropertyUtils;
/**
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,7 +14,8 @@
package org.apache.tapestry.form;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/FormComponentContributorTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+
import java.util.Locale;
import org.apache.hivemind.util.ClasspathResource;
@@ -24,8 +26,6 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.junit.TapestryTestCase;
-import org.easymock.MockControl;
-import org.easymock.internal.ArrayMatcher;
/**
* Abstract test case for {@link FormComponentContributor}.
@@ -42,132 +42,69 @@
// that
// create and initialize a Foo instance.
// -- Howard
+
+ protected IFormComponent _component = newMock(IFormComponent.class);
+
+ protected IPage _page = newPage();
+
+ protected IRequestCycle _cycle = newCycle();
+
+ protected IForm _form = newMock(IForm.class);
- protected MockControl _componentControl = MockControl.createControl(IFormComponent.class);
-
- protected IFormComponent _component = (IFormComponent) _componentControl.getMock();
-
- protected MockControl _pageControl = MockControl.createControl(IPage.class);
-
- protected IPage _page = (IPage) _pageControl.getMock();
-
- protected MockControl _cycleControl = MockControl.createControl(IRequestCycle.class);
-
- protected IRequestCycle _cycle = (IRequestCycle) _cycleControl.getMock();
-
- protected MockControl _formControl = MockControl.createControl(IForm.class);
-
- protected IForm _form = (IForm) _formControl.getMock();
-
- protected MockControl _engineControl = MockControl.createControl(IEngine.class);
-
- protected IEngine _engine = (IEngine) _engineControl.getMock();
-
- protected MockControl _pageRenderSupportControl = MockControl
- .createControl(PageRenderSupport.class);
-
- protected PageRenderSupport _pageRenderSupport = (PageRenderSupport) _pageRenderSupportControl
- .getMock();
-
- /**
- * @see org.apache.hivemind.test.HiveMindTestCase#tearDown()
- */
- protected void tearDown() throws Exception
- {
- _componentControl.reset();
- _pageControl.reset();
- _cycleControl.reset();
- _formControl.reset();
- _engineControl.reset();
- _pageRenderSupportControl.reset();
-
- super.tearDown();
- }
-
- protected void replay()
- {
- _componentControl.replay();
- _pageControl.replay();
- _cycleControl.replay();
- _formControl.replay();
- _engineControl.replay();
- _pageRenderSupportControl.replay();
- }
+ protected IEngine _engine = newMock(IEngine.class);
- protected void verify()
- {
- _componentControl.verify();
- _pageControl.verify();
- _cycleControl.verify();
- _formControl.verify();
- _engineControl.verify();
- _pageRenderSupportControl.verify();
- }
+ protected PageRenderSupport _pageRenderSupport = newPageRenderSupport();
protected void addScript(String script)
{
- _cycle.getEngine();
- _cycleControl.setReturnValue(_engine);
-
- _cycle.getAttribute("org.apache.tapestry.PageRenderSupport");
- _cycleControl.setReturnValue(_pageRenderSupport);
+ expect(_cycle.getEngine()).andReturn(_engine);
+ expect(_cycle.getAttribute("org.apache.tapestry.PageRenderSupport"))
+ .andReturn(_pageRenderSupport);
+
_pageRenderSupport.addExternalScript(new ClasspathResource(null, script));
- _pageRenderSupportControl.setVoidCallable();
}
protected IFormComponent newField(String displayName)
{
- MockControl control = newControl(IFormComponent.class);
- IFormComponent field = (IFormComponent) control.getMock();
+ IFormComponent field = newMock(IFormComponent.class);
- field.getDisplayName();
- control.setReturnValue(displayName);
+ expect(field.getDisplayName()).andReturn(displayName);
return field;
}
protected IFormComponent newField(String displayName, String clientId, int count)
{
- MockControl control = MockControl.createNiceControl(IFormComponent.class);
-
- addControl(control);
-
- IFormComponent field = (IFormComponent) control.getMock();
+ IFormComponent field = newMock(IFormComponent.class);
- field.getDisplayName();
- control.setReturnValue(displayName);
+ expect(field.getDisplayName()).andReturn(displayName);
- field.getClientId();
- control.setReturnValue(clientId, count);
+ expect(field.getClientId()).andReturn(clientId).times(count);
return field;
}
protected IFormComponent newFieldWithClientId(String clientId)
{
- MockControl control = newControl(IFormComponent.class);
- IFormComponent field = (IFormComponent)control.getMock();
+ IFormComponent field = newMock(IFormComponent.class);
- field.getClientId();
- control.setReturnValue(clientId);
+ expect(field.getClientId()).andReturn(clientId);
return field;
}
- protected void trainBuildMessage(MockControl control, ValidationMessages messages,
+ protected void trainBuildMessage(ValidationMessages messages,
String overrideMessage, String key, Object[] parameters, String result)
{
- messages.formatValidationMessage(overrideMessage, key, parameters);
- control.setMatcher(new ArrayMatcher());
- control.setReturnValue(result);
+ expect(messages.formatValidationMessage(overrideMessage, key, parameters))
+ .andReturn(result);
}
- protected void trainGetLocale(MockControl control, ValidationMessages messages, Locale locale)
+ protected void trainGetLocale(ValidationMessages messages, Locale locale)
{
- messages.getLocale();
- control.setReturnValue(locale);
+ expect(messages.getLocale()).andReturn(locale);
}
protected IFormComponent newField()
@@ -187,11 +124,9 @@
protected ValidationMessages newValidationMessages(Locale locale)
{
- MockControl control = newControl(ValidationMessages.class);
- ValidationMessages messages = (ValidationMessages) control.getMock();
+ ValidationMessages messages = newMock(ValidationMessages.class);
- messages.getLocale();
- control.setReturnValue(locale);
+ expect(messages.getLocale()).andReturn(locale);
return messages;
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -17,6 +17,8 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
@@ -113,11 +115,11 @@
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -129,11 +131,11 @@
form.setBody(body);
- replayControls();
+ replay();
assertEquals(FormConstants.SUBMIT_CANCEL, fs.rewind());
- verifyControls();
+ verify();
}
public void testComplexRender()
@@ -153,11 +155,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
final IFormComponent barney1 = newFormComponent("barney", "barney");
final IFormComponent wilma = newFormComponent("wilma", "wilma");
@@ -203,11 +205,11 @@
trainSetFieldFocus(cycle);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testComplexRewind()
@@ -221,11 +223,11 @@
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -245,11 +247,11 @@
invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
- replayControls();
+ replay();
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
- verifyControls();
+ verify();
}
public void testComplexSubmitEventHandler()
@@ -267,11 +269,11 @@
trainIsRewound(cycle, form, false);
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
form.setBody(new IRender()
{
@@ -319,11 +321,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testEncodingType()
@@ -342,11 +344,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
form.setBody(new IRender()
{
@@ -387,11 +389,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testFieldPrerenderTwice()
@@ -408,20 +410,19 @@
field.render(nested, cycle);
- nested.getBuffer();
- setReturnValue(nested, "NESTED CONTENT");
+ expect(nested.getBuffer()).andReturn("NESTED CONTENT");
- replayControls();
+ replay();
FormSupport fs = new FormSupportImpl(cycle);
fs.prerenderField(writer, field, l);
- verifyControls();
+ verify();
trainGetExtendedId(field, "foo.bar");
- replayControls();
+ replay();
try
{
@@ -439,7 +440,7 @@
assertSame(field, ex.getComponent());
}
- verifyControls();
+ verify();
}
@@ -459,11 +460,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
form.setBody(new IRender()
{
@@ -514,11 +515,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testInvalidEncodingType()
@@ -537,11 +538,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
form.setBody(new IRender()
{
@@ -562,7 +563,7 @@
trainGetNestedWriter(writer, nested);
- replayControls();
+ replay();
try
{
@@ -577,7 +578,7 @@
assertSame(form, ex.getComponent());
}
- verifyControls();
+ verify();
}
public void testRefreshRewind()
@@ -592,11 +593,11 @@
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -613,11 +614,11 @@
invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
- replayControls();
+ replay();
assertEquals(FormConstants.SUBMIT_REFRESH, fs.rewind());
- verifyControls();
+ verify();
}
public void testRenderExtraReservedIds()
@@ -636,11 +637,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
final IFormComponent component = newFormComponent("action", "action_0");
@@ -687,11 +688,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testResetEventHandler()
@@ -710,11 +711,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
form.setBody(new IRender()
{
@@ -759,11 +760,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testRewindExtraReservedIds()
@@ -780,11 +781,11 @@
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -801,11 +802,11 @@
invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
- replayControls();
+ replay();
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
- verifyControls();
+ verify();
}
public void testRewindMismatch()
@@ -819,11 +820,11 @@
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
Location l = newLocation();
@@ -844,7 +845,7 @@
form.setBody(body);
- replayControls();
+ replay();
try
{
@@ -860,7 +861,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testRewindTooLong()
@@ -874,11 +875,11 @@
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
Location l = newLocation();
@@ -899,7 +900,7 @@
form.setBody(body);
- replayControls();
+ replay();
try
{
@@ -915,7 +916,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testRewindTooShort()
@@ -932,11 +933,11 @@
trainIsRewound(cycle, form, true);
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -959,7 +960,7 @@
invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
- replayControls();
+ replay();
try
{
@@ -975,7 +976,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testSimpleRender()
@@ -995,11 +996,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
final IFormComponent component = newFormComponent("barney", "barney");
@@ -1041,11 +1042,11 @@
trainGetFieldFocus(cycle, Boolean.TRUE);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testSimpleRenderWithDeferredRunnable()
@@ -1065,11 +1066,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
IRender body = new IRender()
{
@@ -1127,11 +1128,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
public void testSimpleRenderWithScheme()
@@ -1151,11 +1152,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
final IFormComponent component = newFormComponent("barney", "barney");
@@ -1197,11 +1198,11 @@
trainGetFieldFocus(cycle, Boolean.TRUE);
- replayControls();
+ replay();
fs.render("post", render, link, "https", new Integer(443));
- verifyControls();
+ verify();
}
public void testSimpleRewind()
@@ -1217,11 +1218,11 @@
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -1238,11 +1239,11 @@
invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
- replayControls();
+ replay();
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
- verifyControls();
+ verify();
}
public void testSimpleRewindWithDeferredRunnable()
@@ -1258,11 +1259,11 @@
trainGetPageRenderSupport(cycle, null);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
delegate.clear();
@@ -1274,7 +1275,7 @@
invoker.invokeFormListeners(eq(fs), eq(cycle), isA(BrowserEvent.class));
- replayControls();
+ replay();
IRender body = new IRender()
{
@@ -1298,7 +1299,7 @@
assertEquals(FormConstants.SUBMIT_NORMAL, fs.rewind());
- verifyControls();
+ verify();
}
public void testSimpleSubmitEventHandler()
@@ -1318,11 +1319,11 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
final FormSupport fs = new FormSupportImpl(writer, cycle, form);
- verifyControls();
+ verify();
form.setBody(new IRender()
{
@@ -1365,11 +1366,11 @@
trainGetFocusField(delegate, null);
- replayControls();
+ replay();
fs.render("post", render, link, null, null);
- verifyControls();
+ verify();
}
private void trainCycleForRewind(IRequestCycle cycle, String allocatedIds, String reservedIds)
@@ -1398,22 +1399,19 @@
private void trainGetFieldFocus(IRequestCycle cycle, Object value)
{
- cycle.getAttribute(FormSupportImpl.FIELD_FOCUS_ATTRIBUTE);
- setReturnValue(cycle, value);
+ expect(cycle.getAttribute(FormSupportImpl.FIELD_FOCUS_ATTRIBUTE)).andReturn(value);
}
private void trainGetFocusField(IValidationDelegate delegate, String fieldName)
{
- delegate.getFocusField();
- setReturnValue(delegate, fieldName);
+ expect(delegate.getFocusField()).andReturn(fieldName);
}
private void trainGetURL(ILink link, String scheme, String URL, int port)
{
// This will change shortly, with the new scheme parameter passed into FormSupport.render()
- link.getURL(scheme, null, port, null, false);
- setReturnValue(link, URL);
+ expect(link.getURL(scheme, null, port, null, false)).andReturn(URL);
}
private void trainGetURL(ILink link, String scheme, String URL)
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -17,6 +17,7 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import static org.testng.AssertJUnit.assertSame;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
@@ -107,7 +108,7 @@
TapestryUtils.removeForm(cycle);
- replayControls();
+ replay();
try
{
@@ -118,7 +119,7 @@
assertSame(form, ex.getComponent());
}
- verifyControls();
+ verify();
}
private ListenerInvoker newListenerInvoker()
@@ -165,11 +166,11 @@
TapestryUtils.removeForm(cycle);
- replayControls();
+ replay();
form.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderWithScheme()
@@ -211,11 +212,11 @@
TapestryUtils.removeForm(cycle);
- replayControls();
+ replay();
form.render(writer, cycle);
- verifyControls();
+ verify();
}
protected void trainStoreForm(IRequestCycle cycle, IForm form)
@@ -240,27 +241,27 @@
IActionListener cancel = newListener();
IActionListener listener = newListener();
- replayControls();
+ replay();
Form form = (Form) newInstance(Form.class, new Object[]
{ "listener", listener, "cancel", cancel });
assertSame(cancel, form.findListener(FormConstants.SUBMIT_CANCEL));
- verifyControls();
+ verify();
}
public void testFindCancelDefaultListener()
{
IActionListener listener = newListener();
- replayControls();
+ replay();
Form form = (Form) newInstance(Form.class, "listener", listener);
assertSame(listener, form.findListener(FormConstants.SUBMIT_CANCEL));
- verifyControls();
+ verify();
}
public void testFindRefreshListener()
@@ -268,28 +269,28 @@
IActionListener refresh = newListener();
IActionListener listener = newListener();
- replayControls();
+ replay();
Form form = (Form) newInstance(Form.class, new Object[]
{ "listener", listener, "refresh", refresh });
assertSame(refresh, form.findListener(FormConstants.SUBMIT_REFRESH));
- verifyControls();
+ verify();
}
public void testFindRefreshListenerDefault()
{
IActionListener listener = newListener();
- replayControls();
+ replay();
Form form = (Form) newInstance(Form.class, new Object[]
{ "listener", listener });
assertSame(listener, form.findListener(FormConstants.SUBMIT_REFRESH));
- verifyControls();
+ verify();
}
public void testFindListenerSuccess()
@@ -301,7 +302,7 @@
IValidationDelegate delegate = newDelegate(false);
- replayControls();
+ replay();
Form form = (Form) newInstance(Form.class, new Object[]
{ "delegate", delegate, "success", success, "cancel", cancel, "refresh", refresh,
@@ -309,7 +310,7 @@
assertSame(success, form.findListener(FormConstants.SUBMIT_NORMAL));
- verifyControls();
+ verify();
}
public void testFindListenerValidationErrors()
@@ -321,7 +322,7 @@
IValidationDelegate delegate = newDelegate(true);
- replayControls();
+ replay();
Form form = (Form) newInstance(Form.class, new Object[]
{ "delegate", delegate, "success", success, "cancel", cancel, "refresh", refresh,
@@ -329,7 +330,7 @@
assertSame(listener, form.findListener(FormConstants.SUBMIT_NORMAL));
- verifyControls();
+ verify();
}
private IValidationDelegate newDelegate(boolean hasErrors)
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,7 +14,11 @@
package org.apache.tapestry.form;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Map;
import org.apache.hivemind.ApplicationRuntimeException;
@@ -69,7 +73,7 @@
IForm form = newForm();
- LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class, new Object[]
+ LinkSubmit linkSubmit = newInstance(LinkSubmit.class, new Object[]
{ "form", form, "name", "fred_1", "script", script, "idParameter", "fred_id" });
linkSubmit.addBody(newBody());
@@ -79,11 +83,11 @@
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
linkSubmit.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<a href=\"HREF\" id=\"fred_id_unique\">BODY</a>");
}
@@ -95,17 +99,17 @@
IForm form = newForm();
- LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class, new Object[]
+ LinkSubmit linkSubmit = newInstance(LinkSubmit.class, new Object[]
{ "disabled", Boolean.TRUE, "form", form, "name", "fred_1", "idParameter", "fred_id" });
linkSubmit.addBody(newBody());
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
linkSubmit.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("BODY");
}
@@ -120,11 +124,11 @@
cycle.setAttribute(LinkSubmit.ATTRIBUTE_NAME, linkSubmit);
- replayControls();
+ replay();
linkSubmit.prepareForRender(cycle);
- verifyControls();
+ verify();
}
public void testPrepareConflict()
@@ -139,10 +143,10 @@
trainGetIdPath(page, null);
- LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class, new Object[]
+ LinkSubmit linkSubmit = newInstance(LinkSubmit.class, new Object[]
{ "id", "fred", "page", page, "container", page, "location", floc });
- replayControls();
+ replay();
try
{
@@ -158,7 +162,7 @@
assertSame(floc, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testCleanupAfterRender()
@@ -167,13 +171,13 @@
cycle.removeAttribute(LinkSubmit.ATTRIBUTE_NAME);
- replayControls();
+ replay();
LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class);
linkSubmit.cleanupAfterRender(cycle);
- verifyControls();
+ verify();
}
public void testIsClicked()
@@ -182,13 +186,13 @@
trainGetParameter(cycle, FormConstants.SUBMIT_NAME_PARAMETER, "fred");
- replayControls();
+ replay();
LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class);
assertEquals(true, linkSubmit.isClicked(cycle, "fred"));
- verifyControls();
+ verify();
}
public void testIsNotClicked()
@@ -197,13 +201,13 @@
trainGetParameter(cycle, FormConstants.SUBMIT_NAME_PARAMETER, null);
- replayControls();
+ replay();
LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class);
assertEquals(false, linkSubmit.isClicked(cycle, "fred"));
- verifyControls();
+ verify();
}
public void testRewind()
@@ -214,7 +218,7 @@
IForm form = newForm();
IValidationDelegate delegate = newDelegate();
- LinkSubmit linkSubmit = (LinkSubmit) newInstance(LinkSubmit.class, new Object[]
+ LinkSubmit linkSubmit = newInstance(LinkSubmit.class, new Object[]
{ "name", "fred", "form", form });
linkSubmit.addBody(body);
@@ -240,11 +244,11 @@
body.render(writer, cycle);
- replayControls();
+ replay();
linkSubmit.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
private void trainIsRewinding(IForm form, boolean isRewindind)
@@ -275,7 +279,7 @@
protected IValidationDelegate newDelegate()
{
- return (IValidationDelegate) newMock(IValidationDelegate.class);
+ return newMock(IValidationDelegate.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java Tue Jun 27 11:21:31 2006
@@ -30,11 +30,11 @@
IMarkupWriter writer = newBufferWriter();
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
b.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<button type=\"button\" name=\"assignedName\"></button>");
}
@@ -47,11 +47,11 @@
IMarkupWriter writer = newBufferWriter();
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
b.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<button type=\"button\" name=\"assignedName\">Label</button>");
}
@@ -68,11 +68,11 @@
b.setBinding("informal", binding);
- replayControls();
+ replay();
b.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<button type=\"button\" name=\"assignedName\" informal=\"informal-value\"></button>");
}
@@ -85,11 +85,11 @@
IMarkupWriter writer = newBufferWriter();
IRequestCycle cycle = newCycleGetUniqueId("foo", "foo$unique");
- replayControls();
+ replay();
b.renderFormComponent(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<button type=\"button\" name=\"assignedName\" id=\"foo$unique\"></button>");
}
@@ -101,10 +101,10 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
b.rewindFormComponent(writer, cycle);
- verifyControls();
+ verify();
}
}