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 [2/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/asset/TestUnprotectedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java Tue Jun 27 11:21:31 2006
@@ -28,12 +28,14 @@
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.tapestry.services.ServiceConstants;
+import org.testng.annotations.Test;
/**
* Tests for unprotected resource contributions.
*
* @author jkuhnert
*/
+@Test
public class TestUnprotectedAsset extends HiveMindTestCase
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestBeanProvider.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.bean;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.Location;
@@ -28,6 +32,7 @@
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.spec.BeanSpecification;
import org.apache.tapestry.spec.IBeanSpecification;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.bean.BeanProvider} (mostly new features added in release
@@ -36,6 +41,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestBeanProvider extends BaseComponentTestCase
{
public static class BeanInitializerFixture extends AbstractBeanInitializer
@@ -57,13 +63,12 @@
protected IBeanSpecification newBeanSpec()
{
- return (IBeanSpecification) newMock(IBeanSpecification.class);
+ return newMock(IBeanSpecification.class);
}
protected void trainGetClassName(IBeanSpecification spec, String className)
{
- spec.getClassName();
- setReturnValue(spec, className);
+ expect(spec.getClassName()).andReturn(className);
}
public void testResolveClassFailure()
@@ -75,11 +80,11 @@
trainForConstructor(page, component, resolver, finder);
- replayControls();
+ replay();
BeanProvider bp = new BeanProvider(component);
- verifyControls();
+ verify();
IBeanSpecification bs = newBeanSpec();
@@ -93,7 +98,7 @@
trainGetLocation(bs, l);
- replayControls();
+ replay();
try
{
@@ -109,7 +114,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testInstantiateBeanFailure()
@@ -121,11 +126,11 @@
trainForConstructor(page, component, resolver, finder);
- replayControls();
+ replay();
BeanProvider bp = new BeanProvider(component);
- verifyControls();
+ verify();
IBeanSpecification bs = newBeanSpec();
@@ -139,7 +144,7 @@
trainGetLocation(bs, l);
- replayControls();
+ replay();
try
{
@@ -155,45 +160,40 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
private void trainForConstructor(IPage page, IComponent component, ClassResolver resolver,
ClassFinder classFinder)
{
- IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- Infrastructure infrastructure = (Infrastructure) newMock(Infrastructure.class);
- INamespace namespace = (INamespace) newMock(INamespace.class);
+ IRequestCycle cycle = newCycle();
+ Infrastructure infrastructure = newMock(Infrastructure.class);
+ INamespace namespace = newMock(INamespace.class);
trainGetPage(component, page);
- page.getRequestCycle();
- setReturnValue(page, cycle);
+ expect(page.getRequestCycle()).andReturn(cycle);
- cycle.getInfrastructure();
- setReturnValue(cycle, infrastructure);
+ expect(cycle.getInfrastructure()).andReturn(infrastructure);
- infrastructure.getClassResolver();
- setReturnValue(infrastructure, resolver);
+ expect(infrastructure.getClassResolver()).andReturn(resolver);
- component.getNamespace();
- setReturnValue(component, namespace);
+ expect(component.getNamespace()).andReturn(namespace);
- namespace.getPropertyValue("org.apache.tapestry.bean-class-packages");
- setReturnValue(namespace, "mypackage");
+ expect(namespace.getPropertyValue("org.apache.tapestry.bean-class-packages"))
+ .andReturn("mypackage");
- infrastructure.getClassFinder();
- setReturnValue(infrastructure, classFinder);
+ expect(infrastructure.getClassFinder()).andReturn(classFinder);
}
protected ClassFinder newClassFinder()
{
- return (ClassFinder) newMock(ClassFinder.class);
+ return newMock(ClassFinder.class);
}
private ClassResolver newResolver()
{
- return (ClassResolver) newMock(ClassResolver.class);
+ return newMock(ClassResolver.class);
}
public void testInitializeFailure()
@@ -205,11 +205,11 @@
trainForConstructor(page, component, resolver, finder);
- replayControls();
+ replay();
BeanProvider bp = new BeanProvider(component);
- verifyControls();
+ verify();
String className = TargetBean.class.getName();
@@ -229,7 +229,7 @@
trainGetExtendedId(component, "Fred/barney");
- replayControls();
+ replay();
try
{
@@ -250,7 +250,6 @@
private void trainFindClass(ClassFinder finder, String className, Class clazz)
{
- finder.findClass("mypackage", className);
- setReturnValue(finder, clazz);
+ expect(finder.findClass("mypackage", className)).andReturn(clazz);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java Tue Jun 27 11:21:31 2006
@@ -17,6 +17,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.test.HiveMindTestCase;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.bean.LightweightBeanInitializer}.
@@ -24,6 +25,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestLightweightBeanInitializer extends HiveMindTestCase
{
public void testSuccess()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/BindingTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/BindingTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/BindingTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/BindingTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,12 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* Base class for building tests for {@link org.apache.tapestry.IBinding}implementations.
@@ -25,22 +27,21 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public abstract class BindingTestCase extends BaseComponentTestCase
{
protected IComponent newComponent(String extendedId)
{
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
+ IComponent component = newMock(IComponent.class);
- component.getExtendedId();
- control.setReturnValue(extendedId);
+ expect(component.getExtendedId()).andReturn(extendedId);
return component;
}
protected ValueConverter newValueConverter()
{
- return (ValueConverter) newMock(ValueConverter.class);
+ return newMock(ValueConverter.class);
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,7 +14,9 @@
package org.apache.tapestry.binding;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
@@ -23,6 +25,7 @@
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.engine.state.ApplicationStateManager;
import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.binding.StateBinding}and
@@ -31,6 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class StateBindingTest extends HiveMindTestCase
{
@@ -59,14 +63,14 @@
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
IBinding b = newBinding("fred", vc, asm, null);
assertEquals(Boolean.TRUE, b.getObject());
assertEquals(false, b.isInvariant());
- verifyControls();
+ verify();
}
public void testFailure()
@@ -80,7 +84,7 @@
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
IBinding b = newBinding("fred", vc, asm, l);
@@ -96,7 +100,7 @@
assertSame(t, ex.getRootCause());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestAssetBinding.java Tue Jun 27 11:21:31 2006
@@ -14,36 +14,38 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestAssetBinding extends BindingTestCase
{
public void testGetObject()
{
- IAsset asset = (IAsset) newMock(IAsset.class);
-
- MockControl componentc = newControl(IComponent.class);
- IComponent component = (IComponent) componentc.getMock();
+ IAsset asset = newMock(IAsset.class);
+ IComponent component = newMock(IComponent.class);
- component.getAsset("fred");
- componentc.setReturnValue(asset);
+ expect(component.getAsset("fred")).andReturn(asset);
Location l = fabricateLocation(22);
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
AssetBinding b = new AssetBinding("parameterName", vc, l, component, "fred");
@@ -54,25 +56,22 @@
assertSame(component, b.getComponent());
- verifyControls();
+ verify();
}
public void testAssetMissing()
{
- MockControl componentc = newControl(IComponent.class);
- IComponent component = (IComponent) componentc.getMock();
+ IComponent component = newMock(IComponent.class);
- component.getAsset("fred");
- componentc.setReturnValue(null);
+ expect(component.getAsset("fred")).andReturn(null);
- component.getExtendedId();
- componentc.setReturnValue("Home/foo");
+ expect(component.getExtendedId()).andReturn("Home/foo");
Location l = fabricateLocation(22);
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
IBinding b = new AssetBinding("parameterName", vc, l, component, "fred");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestBeanBinding.java Tue Jun 27 11:21:31 2006
@@ -14,45 +14,46 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBeanProvider;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* @author Howard M. Lewis Ship
*/
-public class TestBeanBinding extends HiveMindTestCase
+@Test
+public class TestBeanBinding extends BaseComponentTestCase
{
public void testCreate()
{
- ValueConverter vc = (ValueConverter) newMock(ValueConverter.class);
-
- MockControl componentc = newControl(IComponent.class);
- IComponent component = (IComponent) componentc.getMock();
-
- MockControl beanProviderc = newControl(IBeanProvider.class);
- IBeanProvider beanProvider = (IBeanProvider) beanProviderc.getMock();
+ ValueConverter vc = newMock(ValueConverter.class);
+
+ IComponent component = newComponent();
+
+ IBeanProvider beanProvider = newMock(IBeanProvider.class);
Location l = fabricateLocation(21);
Object bean = new Object();
- component.getBeans();
- componentc.setReturnValue(beanProvider);
+ expect(component.getBeans()).andReturn(beanProvider);
- beanProvider.getBean("fred");
- beanProviderc.setReturnValue(bean);
+ expect(beanProvider.getBean("fred")).andReturn(bean);
- replayControls();
+ replay();
BeanBinding binding = new BeanBinding("param", vc, l, component, "fred");
assertSame(bean, binding.getObject());
- verifyControls();
+ verify();
assertSame(component, binding.getComponent());
assertSame(l, binding.getLocation());
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestComponentBinding.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,15 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.binding.ComponentBinding}.
@@ -26,47 +30,43 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestComponentBinding extends BindingTestCase
{
public void testGetObject()
{
IComponent nested = newComponent();
-
- MockControl cc = newControl(IComponent.class);
- IComponent component = (IComponent) cc.getMock();
-
- component.getComponent("foo");
- cc.setReturnValue(nested);
+ IComponent component = newMock(IComponent.class);
+
+ expect(component.getComponent("foo")).andReturn(nested);
ValueConverter vc = newValueConverter();
Location l = newLocation();
- replayControls();
+ replay();
ComponentBinding b = new ComponentBinding("param", vc, l, component, "foo");
assertSame(component, b.getComponent());
assertSame(nested, b.getObject());
- verifyControls();
+ verify();
}
public void testGetObjectFailure()
{
- MockControl cc = newControl(IComponent.class);
- IComponent component = (IComponent) cc.getMock();
+ IComponent component = newMock(IComponent.class);
Throwable t = new ApplicationRuntimeException("No such component.");
- component.getComponent("foo");
- cc.setThrowable(t);
+ expect(component.getComponent("foo")).andThrow(t);
ValueConverter vc = newValueConverter();
Location l = newLocation();
- replayControls();
+ replay();
ComponentBinding b = new ComponentBinding("param", vc, l, component, "foo");
@@ -82,6 +82,6 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,13 +14,17 @@
package org.apache.tapestry.binding;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.tapestry.BindingException;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.services.ExpressionCache;
import org.apache.tapestry.services.ExpressionEvaluator;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.binding.ExpressionBinding}.
@@ -28,14 +32,15 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestExpressionBinding extends BindingTestCase
{
public void testInvariant()
{
- ExpressionEvaluator ev = createMock(ExpressionEvaluator.class);
- ExpressionCache ec = createMock(ExpressionCache.class);
- IComponent component = createMock(IComponent.class);
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
+ IComponent component = newMock(IComponent.class);
Object compiled = new Object();
@@ -51,7 +56,7 @@
expect(component.getExtendedId()).andReturn("Foo/bar.baz");
- replay(ev,ec,component);
+ replay();
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
@@ -71,16 +76,13 @@
assertEquals("ExpressionBinding[Foo/bar.baz exp]", b.toString());
- verify(ev,ec,component);
+ verify();
}
public void testVariant()
{
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
IComponent component = newComponent();
Object compiled = new Object();
@@ -90,19 +92,15 @@
ValueConverter vc = newValueConverter();
- ec.getCompiledExpression("exp");
- ecc.setReturnValue(compiled);
+ expect(ec.getCompiledExpression("exp")).andReturn(compiled);
- ev.isConstant("exp");
- evc.setReturnValue(false);
+ expect(ev.isConstant("exp")).andReturn(false);
- ev.readCompiled(component, compiled);
- evc.setReturnValue(expressionValue1);
+ expect(ev.readCompiled(component, compiled)).andReturn(expressionValue1);
- ev.readCompiled(component, compiled);
- evc.setReturnValue(expressionValue2);
+ expect(ev.readCompiled(component, compiled)).andReturn(expressionValue2);
- replayControls();
+ replay();
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
@@ -116,62 +114,52 @@
assertSame(expressionValue2, b.getObject());
- verifyControls();
+ verify();
}
public void testSetObject()
{
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
IComponent component = newComponent();
Object compiled = new Object();
ValueConverter vc = newValueConverter();
- ec.getCompiledExpression("exp");
- ecc.setReturnValue(compiled);
+ expect(ec.getCompiledExpression("exp")).andReturn(compiled);
- ev.isConstant("exp");
- evc.setReturnValue(false);
+ expect(ev.isConstant("exp")).andReturn(false);
Object newValue = new Object();
ev.writeCompiled(component, compiled, newValue);
- replayControls();
+ replay();
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
b.setObject(newValue);
- verifyControls();
+ verify();
}
public void testSetObjectInvariant()
{
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
IComponent component = newComponent("Foo/bar.baz");
Object compiled = new Object();
ValueConverter vc = newValueConverter();
- ec.getCompiledExpression("exp");
- ecc.setReturnValue(compiled);
+ expect(ec.getCompiledExpression("exp")).andReturn(compiled);
- ev.isConstant("exp");
- evc.setReturnValue(true);
+ expect(ev.isConstant("exp")).andReturn(true);
- replayControls();
+ replay();
ExpressionBinding b = new ExpressionBinding("parameter foo", fabricateLocation(1), vc, component,
"exp", ev, ec);
@@ -188,36 +176,31 @@
ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testSetObjectFailure()
{
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
IComponent component = newComponent();
Object compiled = new Object();
ValueConverter vc = newValueConverter();
- ec.getCompiledExpression("exp");
- ecc.setReturnValue(compiled);
+ expect(ec.getCompiledExpression("exp")).andReturn(compiled);
- ev.isConstant("exp");
- evc.setReturnValue(false);
+ expect(ev.isConstant("exp")).andReturn(false);
Object newValue = new Object();
RuntimeException innerException = new RuntimeException("Failure");
ev.writeCompiled(component, compiled, newValue);
- evc.setThrowable(innerException);
+ expectLastCall().andThrow(innerException);
- replayControls();
+ replay();
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
@@ -233,26 +216,22 @@
assertSame(innerException, ex.getRootCause());
}
- verifyControls();
+ verify();
}
public void testCompileExpressionFailure()
{
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
IComponent component = newComponent();
ValueConverter vc = newValueConverter();
Throwable innerException = new RuntimeException("Failure");
- ec.getCompiledExpression("exp");
- ecc.setThrowable(innerException);
+ expect(ec.getCompiledExpression("exp")).andThrow(innerException);
- replayControls();
+ replay();
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
@@ -268,34 +247,29 @@
assertSame(innerException, ex.getRootCause());
}
- verifyControls();
+ verify();
}
public void testResolveExpressionFailure()
{
- MockControl evc = newControl(ExpressionEvaluator.class);
- ExpressionEvaluator ev = (ExpressionEvaluator) evc.getMock();
-
- MockControl ecc = newControl(ExpressionCache.class);
- ExpressionCache ec = (ExpressionCache) ecc.getMock();
+ ExpressionEvaluator ev = newMock(ExpressionEvaluator.class);
+ ExpressionCache ec = newMock(ExpressionCache.class);
IComponent component = newComponent();
Object compiled = new Object();
ValueConverter vc = newValueConverter();
- ec.getCompiledExpression("exp");
- ecc.setReturnValue(compiled);
+ expect(ec.getCompiledExpression("exp")).andReturn(compiled);
- ev.isConstant("exp");
- evc.setReturnValue(false);
+ expect(ev.isConstant("exp")).andReturn(false);
Throwable innerException = new RuntimeException("Failure");
ev.readCompiled(component, compiled);
- evc.setThrowable(innerException);
+ expectLastCall().andThrow(innerException);
- replayControls();
+ replay();
ExpressionBinding b = new ExpressionBinding("param", fabricateLocation(1), vc, component,
"exp", ev, ec);
@@ -311,6 +285,6 @@
assertSame(innerException, ex.getRootCause());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestHiveMindBinding.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,14 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.Location;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.services.InjectedValueProvider;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
/**
* Tests for {@link org.apache.tapestry.binding.HiveMindBinding}and
@@ -27,6 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestHiveMindBinding extends BindingTestCase
{
private IBinding newBinding(ValueConverter converter, InjectedValueProvider provider,
@@ -44,21 +48,19 @@
{
Object injectedValue = new Object();
Location l = fabricateLocation(12);
+
+ InjectedValueProvider provider = newMock(InjectedValueProvider.class);
- MockControl control = newControl(InjectedValueProvider.class);
- InjectedValueProvider provider = (InjectedValueProvider) control.getMock();
-
- provider.obtainValue("spring:bean", l);
- control.setReturnValue(injectedValue);
+ expect(provider.obtainValue("spring:bean", l)).andReturn(injectedValue);
ValueConverter converter = newValueConverter();
- replayControls();
+ replay();
IBinding binding = newBinding(converter, provider, "spring:bean", l);
assertSame(injectedValue, binding.getObject());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestListenerMethodBinding.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
import org.apache.tapestry.IActionListener;
@@ -23,6 +28,7 @@
import org.apache.tapestry.RedirectException;
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.listener.ListenerMap;
+import org.testng.annotations.Test;
/**
* Test for {@link org.apache.tapestry.binding.ListenerMethodBinding}.
@@ -30,6 +36,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class TestListenerMethodBinding extends BindingTestCase
{
public void testInvokeListener()
@@ -46,7 +53,7 @@
listener.actionTriggered(sourceComponent, cycle);
- replayControls();
+ replay();
ListenerMethodBinding b = new ListenerMethodBinding("param", vc, l, component, "foo");
@@ -55,7 +62,7 @@
b.actionTriggered(sourceComponent, cycle);
- verifyControls();
+ verify();
}
public void testToString()
@@ -66,7 +73,7 @@
trainGetExtendedId(component, "Fred/barney");
- replayControls();
+ replay();
ListenerMethodBinding b = new ListenerMethodBinding("param", vc, l, component, "foo");
@@ -77,7 +84,7 @@
"param, component=Fred/barney, methodName=foo, location=classpath:/org/apache/tapestry/binding/TestListenerMethodBinding, line 1",
description);
- verifyControls();
+ verify();
}
public void testInvokeAndPageRedirect()
@@ -93,11 +100,11 @@
trainGetListener(component, map, listener);
listener.actionTriggered(sourceComponent, cycle);
-
+
Throwable t = new PageRedirectException("TargetPage");
- setThrowable(listener, t);
-
- replayControls();
+ expectLastCall().andThrow(t);
+
+ replay();
ListenerMethodBinding b = new ListenerMethodBinding("param", vc, l, component, "foo");
@@ -111,7 +118,7 @@
assertSame(t, ex);
}
- verifyControls();
+ verify();
}
public void testInvokeAndRedirect()
@@ -127,11 +134,11 @@
trainGetListener(component, map, listener);
listener.actionTriggered(sourceComponent, cycle);
-
+
Throwable t = new RedirectException("http://foo.bar");
- setThrowable(listener, t);
+ expectLastCall().andThrow(t);
- replayControls();
+ replay();
ListenerMethodBinding b = new ListenerMethodBinding("param", vc, l, component, "foo");
@@ -145,7 +152,7 @@
assertSame(t, ex);
}
- verifyControls();
+ verify();
}
public void testInvokeListenerFailure()
@@ -163,11 +170,11 @@
listener.actionTriggered(sourceComponent, cycle);
Throwable t = new RuntimeException("Failure.");
- setThrowable(listener, t);
+ expectLastCall().andThrow(t);
trainGetExtendedId(component, "Fred/barney");
- replayControls();
+ replay();
ListenerMethodBinding b = new ListenerMethodBinding("param", vc, l, component, "foo");
@@ -186,7 +193,7 @@
assertSame(b, ex.getBinding());
}
- verifyControls();
+ verify();
}
private void trainGetListener(IComponent component, ListenerMap lm, IActionListener listener)
@@ -197,28 +204,26 @@
protected IRequestCycle newCycle()
{
- return (IRequestCycle) newMock(IRequestCycle.class);
+ return newMock(IRequestCycle.class);
}
private void trainGetListener(ListenerMap map, String methodName, IActionListener listener)
{
- map.getListener(methodName);
- setReturnValue(map, listener);
+ expect(map.getListener(methodName)).andReturn(listener);
}
private void trainGetListeners(IComponent component, ListenerMap lm)
{
- component.getListeners();
- setReturnValue(component,lm);
+ expect(component.getListeners()).andReturn(lm);
}
private ListenerMap newListenerMap()
{
- return (ListenerMap) newMock(ListenerMap.class);
+ return newMock(ListenerMap.class);
}
private IActionListener newListener()
{
- return (IActionListener) newMock(IActionListener.class);
+ return newMock(IActionListener.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestLiteralBinding.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,16 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Date;
import org.apache.hivemind.Location;
import org.apache.tapestry.BindingException;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.binding.LiteralBinding}. It also tests some common
@@ -35,7 +39,7 @@
Location l = fabricateLocation(22);
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
LiteralBinding b = new LiteralBinding("parameter foo", vc, l, "literal-value");
@@ -46,7 +50,7 @@
assertEquals(true, b.isInvariant());
assertNull(b.getComponent());
- verifyControls();
+ verify();
}
public void testToString()
@@ -54,46 +58,42 @@
Location l = fabricateLocation(22);
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
LiteralBinding b = new LiteralBinding("parameter foo", vc, l, "literal-value");
assertEquals("StaticBinding[literal-value]", b.toString());
- verifyControls();
+ verify();
}
public void testGetObjectWithClass()
{
- MockControl control = newControl(ValueConverter.class);
- ValueConverter vc = (ValueConverter) control.getMock();
+ ValueConverter vc = newMock(ValueConverter.class);
Date date = new Date();
- vc.coerceValue("my-literal", Date.class);
- control.setReturnValue(date);
+ expect(vc.coerceValue("my-literal", Date.class)).andReturn(date);
- replayControls();
+ replay();
LiteralBinding b = new LiteralBinding("parameter foo", vc, fabricateLocation(99),
"my-literal");
assertSame(date, b.getObject(Date.class));
- verifyControls();
+ verify();
}
public void testGetObjectException()
{
- MockControl control = newControl(ValueConverter.class);
- ValueConverter vc = (ValueConverter) control.getMock();
+ ValueConverter vc = newMock(ValueConverter.class);
Exception innerException = new RuntimeException("Failure");
- vc.coerceValue("my-literal", Date.class);
- control.setThrowable(innerException);
+ expect(vc.coerceValue("my-literal", Date.class)).andThrow(innerException);
- replayControls();
+ replay();
Location location = fabricateLocation(99);
LiteralBinding b = new LiteralBinding("parameter foo", vc, location, "my-literal");
@@ -111,7 +111,7 @@
assertSame(b, ex.getBinding());
}
- verifyControls();
+ verify();
}
public void testSetObject()
@@ -119,7 +119,7 @@
Location l = fabricateLocation(22);
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
LiteralBinding b = new LiteralBinding("parameter foo", vc, l, "literal-value");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/binding/TestMessageBinding.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,13 @@
package org.apache.tapestry.binding;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.Messages;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.binding.MessageBinding}.
@@ -30,58 +33,51 @@
public void testCreate()
{
- IComponent component = (IComponent) newMock(IComponent.class);
+ IComponent component = newMock(IComponent.class);
ValueConverter vc = newValueConverter();
- replayControls();
+ replay();
MessageBinding b = new MessageBinding("param", vc, fabricateLocation(12), component, "key");
assertSame(component, b.getComponent());
assertEquals("key", b.getKey());
- verifyControls();
+ verify();
}
public void testToString()
{
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
+ IComponent component = newComponent();
ValueConverter vc = newValueConverter();
- component.getExtendedId();
- control.setReturnValue("Foo/bar.baz");
+ expect(component.getExtendedId()).andReturn("Foo/bar.baz");
- replayControls();
+ replay();
MessageBinding b = new MessageBinding("param", vc, fabricateLocation(12), component, "key");
assertEquals("StringBinding[Foo/bar.baz key]", b.toString());
- verifyControls();
+ verify();
}
public void testGetObject()
{
- MockControl mc = newControl(Messages.class);
- Messages m = (Messages) mc.getMock();
-
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
+ Messages m = newMock(Messages.class);
+ IComponent component = newComponent();
ValueConverter vc = newValueConverter();
- component.getMessages();
- control.setReturnValue(m);
-
- m.getMessage("key");
- mc.setReturnValue("value");
+ expect(component.getMessages()).andReturn(m);
+
+ expect(m.getMessage("key")).andReturn("value");
- replayControls();
+ replay();
MessageBinding b = new MessageBinding("param", vc, fabricateLocation(12), component, "key");
assertEquals("value", b.getObject());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestDirectCallback.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.callback;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
@@ -21,7 +25,6 @@
import org.apache.tapestry.IDirect;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
-import org.easymock.MockControl;
/**
* @author Howard M. Lewis Ship
@@ -30,43 +33,36 @@
{
public void testNoParams()
{
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
-
- MockControl componentc = newControl(IDirect.class);
- IDirect component = (IDirect) componentc.getMock();
+ IPage page = newMock(IPage.class);
+ IDirect component = newMock(IDirect.class);
- component.getPage();
- componentc.setReturnValue(page);
+ expect(component.getPage()).andReturn(page);
- page.getPageName();
- pagec.setReturnValue("Fred");
+ expect(page.getPageName()).andReturn("Fred");
- component.getIdPath();
- componentc.setReturnValue("foo.bar");
+ expect(component.getIdPath()).andReturn("foo.bar");
- replayControls();
+ replay();
DirectCallback callback = new DirectCallback(component, null);
assertEquals("DirectCallback[Fred/foo.bar]", callback.toString());
- verifyControls();
+ verify();
IRequestCycle cycle = newCycleGetPage("Fred", page);
- page.getNestedComponent("foo.bar");
- pagec.setReturnValue(component);
+ expect(page.getNestedComponent("foo.bar")).andReturn(component);
cycle.setListenerParameters(null);
component.trigger(cycle);
- replayControls();
+ replay();
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
public void testWithParams()
@@ -74,79 +70,65 @@
Object[] params = new Object[]
{ "p1", "p2" };
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
+ IPage page = newMock(IPage.class);
+ IDirect component = newMock(IDirect.class);
- MockControl componentc = newControl(IDirect.class);
- IDirect component = (IDirect) componentc.getMock();
+ expect(component.getPage()).andReturn(page);
- component.getPage();
- componentc.setReturnValue(page);
+ expect(page.getPageName()).andReturn("Barney");
- page.getPageName();
- pagec.setReturnValue("Barney");
+ expect(component.getIdPath()).andReturn("foo.bar");
- component.getIdPath();
- componentc.setReturnValue("foo.bar");
-
- replayControls();
+ replay();
DirectCallback callback = new DirectCallback(component, params);
assertEquals("DirectCallback[Barney/foo.bar p1, p2]", callback.toString());
- verifyControls();
+ verify();
IRequestCycle cycle = newCycleGetPage("Barney", page);
- page.getNestedComponent("foo.bar");
- pagec.setReturnValue(component);
+ expect(page.getNestedComponent("foo.bar")).andReturn(component);
cycle.setListenerParameters(params);
component.trigger(cycle);
- replayControls();
+ replay();
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
public void testNotDirect()
{
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
-
- MockControl componentc = newControl(IDirect.class);
- IDirect component = (IDirect) componentc.getMock();
+ IPage page = newMock(IPage.class);
+ IDirect component = newMock(IDirect.class);
- component.getPage();
- componentc.setReturnValue(page);
+ expect(component.getPage()).andReturn(page);
- page.getPageName();
- pagec.setReturnValue("Fred");
+ expect(page.getPageName()).andReturn("Fred");
- component.getIdPath();
- componentc.setReturnValue("foo.bar");
+ expect(component.getIdPath()).andReturn("foo.bar");
- replayControls();
+ replay();
DirectCallback callback = new DirectCallback(component, null);
assertEquals("DirectCallback[Fred/foo.bar]", callback.toString());
- verifyControls();
+ verify();
IRequestCycle cycle = newCycleGetPage("Fred", page);
Location l = newLocation();
IComponent component2 = newComponent("Fred/foo.bar", l);
- page.getNestedComponent("foo.bar");
- pagec.setReturnValue(component2);
+ expect(page.getNestedComponent("foo.bar")).andReturn(component2);
- replayControls();
+ replay();
try
{
@@ -160,6 +142,6 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestExternalCallback.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,14 @@
package org.apache.tapestry.callback;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IExternalPage;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.callback.ExternalCallback}.
@@ -36,11 +38,9 @@
private IExternalPage newExternalPage(String pageName)
{
- MockControl control = newControl(IExternalPage.class);
- IExternalPage page = (IExternalPage) control.getMock();
+ IExternalPage page = newMock(IExternalPage.class);
- page.getPageName();
- control.setReturnValue(pageName);
+ expect(page.getPageName()).andReturn(pageName);
return page;
}
@@ -57,7 +57,7 @@
page.activateExternalPage(parameters, cycle);
- replayControls();
+ replay();
ExternalCallback callback = new ExternalCallback("Fred", parameters);
@@ -65,7 +65,7 @@
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
public void testByNameNoParameters()
@@ -77,7 +77,7 @@
page.activateExternalPage(null, cycle);
- replayControls();
+ replay();
ExternalCallback callback = new ExternalCallback("Fred", null);
@@ -85,7 +85,7 @@
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
public void testByPage()
@@ -100,7 +100,7 @@
page.activateExternalPage(parameters, cycle);
- replayControls();
+ replay();
ExternalCallback callback = new ExternalCallback(page, parameters);
@@ -108,7 +108,7 @@
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
public void testNotExternalPage()
@@ -116,7 +116,7 @@
IPage page = newPage();
IRequestCycle cycle = newCycleGetPage("Barney", page);
- replayControls();
+ replay();
ExternalCallback callback = new ExternalCallback("Barney", null);
@@ -131,6 +131,6 @@
ex.getMessage());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/callback/TestPageCallback.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.callback;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
@@ -32,7 +34,7 @@
cycle.activate("Fred");
- replayControls();
+ replay();
PageCallback callback = new PageCallback("Fred");
@@ -40,7 +42,7 @@
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
public void testByPage()
@@ -50,7 +52,7 @@
cycle.activate("Barney");
- replayControls();
+ replay();
PageCallback callback = new PageCallback(page);
@@ -58,6 +60,6 @@
callback.performCallback(cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,13 @@
package org.apache.tapestry.coerce;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Collections;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.coerce.TypeConverterWrapper}.
@@ -25,19 +28,17 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestTypeConverterWrapper extends HiveMindTestCase
+public class TestTypeConverterWrapper extends BaseComponentTestCase
{
public void testNonNull()
{
- MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter) tcc.getMock();
+ TypeConverter tc = newMock(TypeConverter.class);
Object expected = "BARNEY";
- tc.convertValue("FRED");
- tcc.setReturnValue(expected);
+ expect(tc.convertValue("FRED")).andReturn(expected);
- replayControls();
+ replay();
TypeConverterContribution contrib = new TypeConverterContribution();
contrib.setSubjectClass(Object.class);
@@ -53,20 +54,18 @@
assertSame(expected, actual);
- verifyControls();
+ verify();
}
public void testNull()
{
- MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter) tcc.getMock();
+ TypeConverter tc = newMock(TypeConverter.class);
Object expected = "NULL";
- tc.convertValue(null);
- tcc.setReturnValue(expected);
+ expect(tc.convertValue(null)).andReturn(expected);
- replayControls();
+ replay();
TypeConverterWrapper w = new TypeConverterWrapper();
@@ -76,7 +75,7 @@
assertSame(expected, actual);
- verifyControls();
+ verify();
}
public void testNullWithNoNullConverter()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/coerce/TestValueConverter.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,16 @@
package org.apache.tapestry.coerce;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Collections;
import java.util.Date;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.coerce.ValueConverterImpl}.
@@ -27,7 +31,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestValueConverter extends HiveMindTestCase
+public class TestValueConverter extends BaseComponentTestCase
{
public void testAlreadyCorrectType()
@@ -90,16 +94,14 @@
public void testConverterFound()
{
- MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter) tcc.getMock();
+ TypeConverter tc = newMock(TypeConverter.class);
Object input = new Integer(7);
Object output = "SEVEN";
- tc.convertValue(input);
- tcc.setReturnValue(output);
+ expect(tc.convertValue(input)).andReturn(output);
- replayControls();
+ replay();
ValueConverterImpl v = new ValueConverterImpl();
@@ -114,20 +116,18 @@
assertSame(output, v.coerceValue(input, String.class));
- verifyControls();
+ verify();
}
public void testConverterFoundForNullValue()
{
- MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter) tcc.getMock();
+ TypeConverter tc = newMock(TypeConverter.class);
Object output = "NULL";
- tc.convertValue(null);
- tcc.setReturnValue(output);
+ expect(tc.convertValue(null)).andReturn(output);
- replayControls();
+ replay();
ValueConverterImpl v = new ValueConverterImpl();
@@ -142,7 +142,7 @@
assertSame(output, v.coerceValue(null, String.class));
- verifyControls();
+ verify();
}
public void testNoConverterFoundForNullValue()
@@ -190,16 +190,14 @@
public void testStringToNonNumericPrimitive()
{
- MockControl tcc = newControl(TypeConverter.class);
- TypeConverter tc = (TypeConverter) tcc.getMock();
+ TypeConverter tc = newMock(TypeConverter.class);
Object input = "false";
Object output = Boolean.FALSE;
- tc.convertValue(input);
- tcc.setReturnValue(output);
+ expect(tc.convertValue(input)).andReturn(output);
- replayControls();
+ replay();
ValueConverterImpl v = new ValueConverterImpl();
@@ -214,7 +212,7 @@
assertSame(output, v.coerceValue(input, Boolean.class));
- verifyControls();
+ verify();
}
public void testNumberToNumber()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestAny.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.components;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
@@ -38,7 +41,7 @@
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
Location l = newLocation();
- replayControls();
+ replay();
Any any = (Any) newInstance(Any.class, new Object[] { "location", l });
@@ -54,7 +57,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testRender()
@@ -69,7 +72,7 @@
writer.end("span");
- replayControls();
+ replay();
Any any = (Any) newInstance(Any.class,
new Object[] { "element", "span" });
@@ -78,7 +81,7 @@
any.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderWithInformalParameters()
@@ -95,7 +98,7 @@
writer.end("span");
- replayControls();
+ replay();
Any any = (Any) newInstance(Any.class, new Object[] { "element",
"span", "specification", new ComponentSpecification() });
@@ -105,7 +108,7 @@
any.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRewind()
@@ -116,7 +119,7 @@
body.render(writer, cycle);
- replayControls();
+ replay();
Any any = (Any) newInstance(Any.class,
new Object[] { "element", "span" });
@@ -125,6 +128,6 @@
any.render(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestBlock.java Tue Jun 27 11:21:31 2006
@@ -14,13 +14,16 @@
package org.apache.tapestry.components;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
import org.apache.tapestry.IRequestCycle;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.components.Block}.
@@ -39,7 +42,7 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(writer);
- replayControls();
+ replay();
IRender body = new IRender()
{
@@ -58,7 +61,7 @@
assertNull(block.getInvoker());
- verifyControls();
+ verify();
}
public void testGetParameter()
@@ -66,14 +69,10 @@
Object parameterValue = new Object();
IBinding binding = newBinding(parameterValue);
+ IComponent component = newComponent();
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
-
- component.getBinding("fred");
- control.setReturnValue(binding);
-
- replayControls();
+ expect(component.getBinding("fred")).andReturn(binding);
+ replay();
Block block = (Block) newInstance(Block.class);
@@ -81,7 +80,7 @@
assertSame(parameterValue, block.getParameter("fred"));
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestConditional.java Tue Jun 27 11:21:31 2006
@@ -60,7 +60,7 @@
IRequestCycle cycle = newCycle(false, writer);
IRender body = newRender(writer, cycle);
- replayControls();
+ replay();
Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE });
@@ -68,7 +68,7 @@
conditional.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testIgnoreElementWhenRewinding()
@@ -77,7 +77,7 @@
IRequestCycle cycle = newCycle(true, writer);
IRender body = newRender(writer, cycle);
- replayControls();
+ replay();
Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE, "element", "div" });
@@ -85,7 +85,7 @@
conditional.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testElement()
@@ -108,7 +108,7 @@
writer.end("div");
- replayControls();
+ replay();
Conditional conditional = (Conditional) newInstance(Conditional.class, new Object[]
{ "condition", Boolean.TRUE, "element", "div", "specification", spec });
@@ -117,6 +117,6 @@
conditional.render(writer, cycle);
- verifyControls();
+ verify();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -15,6 +15,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;
@@ -25,7 +26,6 @@
import org.apache.tapestry.services.DataSqueezer;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.util.io.DataSqueezerUtil;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.components.If}
@@ -65,7 +65,7 @@
IRender body = newRender(writer, cycle);
IRender body2 = newRender();
- replayControls();
+ replay();
IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
{ "condition", Boolean.TRUE });
@@ -77,35 +77,30 @@
reverse.addBody(body2);
reverse.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderPlainFalse()
{
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IRequestCycle cycle = newCycle();
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);
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.FALSE);
- cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
- cyclec.setReturnValue(Boolean.FALSE);
+ expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.FALSE);
- cycle.isRewinding();
- cyclec.setReturnValue(false);
+ expect(cycle.isRewinding()).andReturn(false);
trainResponseBuilder(cycle, writer);
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
- replayControls();
+ replay();
IfBean conditional = (IfBean) newInstance(IfBean.class, new Object[]
{ "condition", Boolean.FALSE });
@@ -116,7 +111,7 @@
reverse.addBody(body2);
reverse.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderInFormTrue()
@@ -126,20 +121,14 @@
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE });
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newMock(IForm.class);
+ IRequestCycle cycle = newCycle();
- cycle.isRewinding();
- cyclec.setReturnValue(false);
+ expect(cycle.isRewinding()).andReturn(false);
- cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- cyclec.setReturnValue(form);
+ expect(cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE)).andReturn(form);
- form.getElementId(conditional);
- formc.setReturnValue("If");
+ expect(form.getElementId(conditional)).andReturn("If");
form.addHiddenValue("If", "T");
@@ -147,13 +136,12 @@
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();
- replayControls();
+ replay();
conditional.addBody(body);
@@ -163,7 +151,7 @@
reverse.addBody(body2);
reverse.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderInFormFalse()
@@ -173,37 +161,29 @@
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.FALSE });
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
- cycle.isRewinding();
- cyclec.setReturnValue(false);
-
- cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- cyclec.setReturnValue(form);
+ expect(cycle.isRewinding()).andReturn(false);
- form.getElementId(conditional);
- formc.setReturnValue("If");
+ expect(cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE)).andReturn(form);
+
+ expect(form.getElementId(conditional)).andReturn("If");
form.addHiddenValue("If", "F");
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.FALSE);
- cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
- cyclec.setReturnValue(Boolean.FALSE);
+ expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.FALSE);
- cycle.isRewinding();
- cyclec.setReturnValue(false);
+ expect(cycle.isRewinding()).andReturn(false);
trainResponseBuilder(cycle, writer);
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
- replayControls();
+ replay();
conditional.addBody(body);
@@ -213,7 +193,7 @@
reverse.addBody(body2);
reverse.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testIgnoreElementWhenRewindingTrue()
@@ -223,38 +203,29 @@
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE, "element", "div" });
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newMock(IForm.class);
+ IRequestCycle cycle = newCycle();
- cycle.isRewinding();
- cyclec.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true);
- cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- cyclec.setReturnValue(form);
+ expect(cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE)).andReturn(form);
- form.isRewinding();
- formc.setReturnValue(true);
+ expect(form.isRewinding()).andReturn(true);
- form.getElementId(conditional);
- formc.setReturnValue("If");
+ expect(form.getElementId(conditional)).andReturn("If");
- cycle.getParameter("If");
- cyclec.setReturnValue("T");
+ expect(cycle.getParameter("If")).andReturn("T");
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();
- replayControls();
+ replay();
conditional.addBody(body);
conditional.render(writer, cycle);
@@ -263,7 +234,7 @@
reverse.addBody(body2);
reverse.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testIgnoreElementWhenRewindingFalse()
@@ -273,41 +244,31 @@
IfBean conditional = (IfBean) newInstance(TestIfBean.class,
new Object[] { "condition", Boolean.TRUE, "element", "div" });
- MockControl formc = newControl(IForm.class);
- IForm form = (IForm) formc.getMock();
-
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
+ IForm form = newMock(IForm.class);
+ IRequestCycle cycle = newCycle();
- cycle.isRewinding();
- cyclec.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true);
- cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE);
- cyclec.setReturnValue(form);
+ expect(cycle.getAttribute(TapestryUtils.FORM_ATTRIBUTE)).andReturn(form);
- form.isRewinding();
- formc.setReturnValue(true);
+ expect(form.isRewinding()).andReturn(true);
- form.getElementId(conditional);
- formc.setReturnValue("If");
+ expect(form.getElementId(conditional)).andReturn("If");
- cycle.getParameter("If");
- cyclec.setReturnValue("F");
+ expect(cycle.getParameter("If")).andReturn("F");
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.FALSE);
- cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE);
- cyclec.setReturnValue(Boolean.FALSE);
+ expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.FALSE);
- cycle.isRewinding();
- cyclec.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true);
trainResponseBuilder(cycle, writer);
IRender body = newRender();
IRender body2 = newRender(writer, cycle);
- replayControls();
+ replay();
conditional.addBody(body);
conditional.render(writer, cycle);
@@ -316,7 +277,7 @@
reverse.addBody(body2);
reverse.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testElement()
@@ -325,15 +286,12 @@
IBinding informal = newBinding("informal-value");
IComponentSpecification spec = newSpec("informal", null);
+
+ IRequestCycle cycle = newCycle();
- MockControl cyclec = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) cyclec.getMock();
-
- 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);
IRender body = newRender(writer, cycle);
@@ -347,7 +305,7 @@
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
- replayControls();
+ replay();
IfBean conditional = (IfBean) newInstance(TestIfBean.class, new Object[]
{ "condition", Boolean.TRUE, "element", "div", "specification", spec });
@@ -356,7 +314,7 @@
conditional.render(writer, cycle);
- verifyControls();
+ verify();
}
public static abstract class TestIfBean extends IfBean
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInsert.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.components;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.Date;
@@ -53,27 +56,27 @@
{
IRequestCycle cycle = newCycle(true, false);
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class);
insert.render(null, cycle);
- verifyControls();
+ verify();
}
public void testNullValue()
{
IRequestCycle cycle = newCycle(false, false);
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", null });
insert.render(null, cycle);
- verifyControls();
+ verify();
}
public void testNoFormat()
@@ -83,14 +86,14 @@
writer.print("42", false);
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", new Integer(42) });
insert.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testFormat()
@@ -104,14 +107,14 @@
writer.print(expected, false);
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", date, "format", format });
insert.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testUnableToFormat()
@@ -127,7 +130,7 @@
IPage page = newBasePage("Flintstone");
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", value, "format", format });
@@ -150,7 +153,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testRaw()
@@ -160,14 +163,14 @@
writer.print("42", true);
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", new Integer(42), "raw", Boolean.TRUE });
insert.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testStyleClass()
@@ -184,7 +187,7 @@
writer.print("42", false);
writer.end();
- replayControls();
+ replay();
Insert insert = (Insert) newInstance(Insert.class, new Object[]
{ "value", "42", "specification", spec, "styleClass", "paisley" });
@@ -193,6 +196,6 @@
insert.render(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestInvokeListener.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,14 @@
package org.apache.tapestry.components;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.listener.ListenerInvoker;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.components.InvokeListener}.
@@ -56,11 +58,11 @@
invoker.invokeListener(listener, component, cycle);
cycle.setListenerParameters(null);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testEnsureParametersClearedAfterException()
@@ -69,25 +71,24 @@
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
IActionListener listener = newListener();
-
- MockControl invokerc = newControl(ListenerInvoker.class);
- ListenerInvoker invoker = (ListenerInvoker) invokerc.getMock();
+
+ ListenerInvoker invoker = newMock(ListenerInvoker.class);
Throwable t = new RuntimeException();
Object[] parameters = new Object[0];
- InvokeListener component = (InvokeListener) newInstance(InvokeListener.class, new Object[]
+ InvokeListener component = newInstance(InvokeListener.class, new Object[]
{ "listener", listener, "parameters", parameters, "listenerInvoker", invoker, });
cycle.setListenerParameters(parameters);
invoker.invokeListener(listener, component, cycle);
- invokerc.setThrowable(t);
+ expectLastCall().andThrow(t);
cycle.setListenerParameters(null);
- replayControls();
+ replay();
try
{
@@ -99,6 +100,6 @@
assertSame(t, ex);
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java Tue Jun 27 11:21:31 2006
@@ -17,7 +17,6 @@
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.components.RenderBlock} component.
@@ -34,17 +33,16 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- replayControls();
+ replay();
rb.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testNonNullBlock()
{
- MockControl bc = newControl(Block.class);
- Block b = (Block) bc.getMock();
+ Block b = newMock(Block.class);
RenderBlock rb = (RenderBlock) newInstance(RenderBlock.class, new Object[]
{ "block", b });
@@ -54,10 +52,10 @@
b.renderForComponent(writer, cycle, rb);
- replayControls();
+ replay();
rb.render(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/BaseDescribeTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/BaseDescribeTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/BaseDescribeTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/BaseDescribeTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.describe;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
@@ -26,27 +26,27 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public abstract class BaseDescribeTestCase extends HiveMindTestCase
+public abstract class BaseDescribeTestCase extends BaseComponentTestCase
{
protected IMarkupWriter newWriter()
{
- return (IMarkupWriter) newMock(IMarkupWriter.class);
+ return newMock(IMarkupWriter.class);
}
protected IRequestCycle newCycle()
{
- return (IRequestCycle) newMock(IRequestCycle.class);
+ return newMock(IRequestCycle.class);
}
protected HTMLDescriber newDescriber()
{
- return (HTMLDescriber) newMock(HTMLDescriber.class);
+ return newMock(HTMLDescriber.class);
}
protected DescriptionReceiver newReceiver()
{
- return (DescriptionReceiver) newMock(DescriptionReceiver.class);
+ return newMock(DescriptionReceiver.class);
}
}