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 [9/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/record/TestPersistentPropertyData.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPersistentPropertyData.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,15 @@
package org.apache.tapestry.record;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotSame;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Collections;
import java.util.List;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.record.PersistentPropertyData}.
@@ -26,7 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestPersistentPropertyData extends HiveMindTestCase
+public class TestPersistentPropertyData extends BaseComponentTestCase
{
public void testStoreChange()
@@ -34,28 +38,28 @@
Object newObject1 = new Object();
Object newObject2 = new Object();
- PersistentPropertyDataEncoder encoder = (PersistentPropertyDataEncoder) newMock(PersistentPropertyDataEncoder.class);
+ PersistentPropertyDataEncoder encoder = newMock(PersistentPropertyDataEncoder.class);
- replayControls();
+ replay();
PersistentPropertyData ppd = new PersistentPropertyData(encoder);
ppd.store("foo", "bar", newObject1);
- assertListsEqual(new Object[]
+ assertEquals(new Object[]
{ new PropertyChangeImpl("foo", "bar", newObject1) }, ppd.getPageChanges());
// Check for overwriting.
ppd.store("foo", "bar", newObject2);
- assertListsEqual(new Object[]
+ assertEquals(new Object[]
{ new PropertyChangeImpl("foo", "bar", newObject2) }, ppd.getPageChanges());
// We only add the one value, because the output order
// is indeterminate.
- verifyControls();
+ verify();
}
public void testDecode()
@@ -64,13 +68,11 @@
String encoded = "ENCODED";
List decoded = Collections.singletonList(new PropertyChangeImpl("foo", "bar", newObject));
- MockControl control = newControl(PersistentPropertyDataEncoder.class);
- PersistentPropertyDataEncoder encoder = (PersistentPropertyDataEncoder) control.getMock();
+ PersistentPropertyDataEncoder encoder = newMock(PersistentPropertyDataEncoder.class);
- encoder.decodePageChanges(encoded);
- control.setReturnValue(decoded);
+ expect(encoder.decodePageChanges(encoded)).andReturn(decoded);
- replayControls();
+ replay();
PersistentPropertyData ppd = new PersistentPropertyData(encoder);
@@ -78,17 +80,17 @@
List l1 = ppd.getPageChanges();
- assertListsEqual(new Object[]
+ assertEquals(new Object[]
{ new PropertyChangeImpl("foo", "bar", newObject) }, l1);
List l2 = ppd.getPageChanges();
assertNotSame(l1, l2);
- assertListsEqual(new Object[]
+ assertEquals(new Object[]
{ new PropertyChangeImpl("foo", "bar", newObject) }, l2);
- verifyControls();
+ verify();
}
public void testEncode()
@@ -97,13 +99,11 @@
Object newObject = new Object();
List changes = Collections.singletonList(new PropertyChangeImpl("foo", "bar", newObject));
- MockControl control = newControl(PersistentPropertyDataEncoder.class);
- PersistentPropertyDataEncoder encoder = (PersistentPropertyDataEncoder) control.getMock();
+ PersistentPropertyDataEncoder encoder = newMock(PersistentPropertyDataEncoder.class);
- encoder.encodePageChanges(changes);
- control.setReturnValue(encoded);
+ expect(encoder.encodePageChanges(changes)).andReturn(encoded);
- replayControls();
+ replay();
PersistentPropertyData ppd = new PersistentPropertyData(encoder);
@@ -112,6 +112,6 @@
assertSame(encoded, ppd.getEncoded());
assertSame(encoded, ppd.getEncoded());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestInjector.java Tue Jun 27 11:21:31 2006
@@ -14,17 +14,19 @@
package org.apache.tapestry.request;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.services.ServletRequestServicer;
import org.apache.tapestry.spec.ILibrarySpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.request.DecodedRequestInjector}.
@@ -32,7 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestDecodedRequestInjector extends HiveMindTestCase
+public class TestDecodedRequestInjector extends BaseComponentTestCase
{
private static class ServicerFixture implements ServletRequestServicer
{
@@ -45,7 +47,7 @@
}
}
- private HttpServletRequest newRequest()
+ private HttpServletRequest newHttpRequest()
{
return (HttpServletRequest) newMock(HttpServletRequest.class);
}
@@ -57,16 +59,14 @@
private ILibrarySpecification newSpec(boolean exists, IRequestDecoder decoder)
{
- MockControl control = newControl(ILibrarySpecification.class);
- ILibrarySpecification spec = (ILibrarySpecification) control.getMock();
+ ILibrarySpecification spec = newMock(ILibrarySpecification.class);
- spec.checkExtension(Tapestry.REQUEST_DECODER_EXTENSION_NAME);
- control.setReturnValue(exists);
+ expect(spec.checkExtension(Tapestry.REQUEST_DECODER_EXTENSION_NAME)).andReturn(exists);
if (exists)
{
- spec.getExtension(Tapestry.REQUEST_DECODER_EXTENSION_NAME, IRequestDecoder.class);
- control.setReturnValue(decoder);
+ expect(spec.getExtension(Tapestry.REQUEST_DECODER_EXTENSION_NAME, IRequestDecoder.class))
+ .andReturn(decoder);
}
return spec;
@@ -74,7 +74,7 @@
public void testNoExtension() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
ILibrarySpecification spec = newSpec(false, null);
@@ -82,7 +82,7 @@
servicer.service(request, response);
- replayControls();
+ replay();
DecodedRequestInjector dri = new DecodedRequestInjector();
@@ -91,16 +91,15 @@
dri.service(request, response, servicer);
- verifyControls();
+ verify();
}
public void testWithExtension() throws Exception
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
-
- MockControl decoderc = newControl(IRequestDecoder.class);
- IRequestDecoder decoder = (IRequestDecoder) decoderc.getMock();
+
+ IRequestDecoder decoder = newMock(IRequestDecoder.class);
ILibrarySpecification spec = newSpec(true, decoder);
ServicerFixture servicer = new ServicerFixture();
@@ -108,10 +107,9 @@
DecodedRequest decoded = new DecodedRequest();
decoded.setRequestURI("/foo/bar/baz");
- decoder.decodeRequest(request);
- decoderc.setReturnValue(decoded);
+ expect(decoder.decodeRequest(request)).andReturn(decoded);
- replayControls();
+ replay();
DecodedRequestInjector dri = new DecodedRequestInjector();
@@ -124,6 +122,6 @@
assertEquals("/foo/bar/baz", servicer._request.getRequestURI());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/request/TestDecodedRequestWrapper.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,12 @@
package org.apache.tapestry.request;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import javax.servlet.http.HttpServletRequest;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.request.DecodedRequestWrapper}and
@@ -26,9 +28,9 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestDecodedRequestWrapper extends HiveMindTestCase
+public class TestDecodedRequestWrapper extends BaseComponentTestCase
{
- private HttpServletRequest newRequest()
+ private HttpServletRequest newHttpRequest()
{
return (HttpServletRequest) newMock(HttpServletRequest.class);
}
@@ -42,9 +44,9 @@
dr.setServerPort(2170);
dr.setServerName("www.flintstone.com");
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- replayControls();
+ replay();
DecodedRequestWrapper w = new DecodedRequestWrapper(request, dr);
@@ -53,27 +55,22 @@
assertEquals(2170, w.getServerPort());
assertEquals("www.flintstone.com", w.getServerName());
- verifyControls();
+ verify();
}
public void testRequestConstructor()
{
- MockControl control = newControl(HttpServletRequest.class);
- HttpServletRequest request = (HttpServletRequest) control.getMock();
+ HttpServletRequest request = newHttpRequest();
- request.getScheme();
- control.setReturnValue("https");
+ expect(request.getScheme()).andReturn("https");
- request.getServerName();
- control.setReturnValue("www.flintstone.com");
+ expect(request.getServerName()).andReturn("www.flintstone.com");
- request.getRequestURI();
- control.setReturnValue("/foo/bar/baz");
+ expect(request.getRequestURI()).andReturn("/foo/bar/baz");
- request.getServerPort();
- control.setReturnValue(2170);
+ expect(request.getServerPort()).andReturn(2170);
- replayControls();
+ replay();
DecodedRequest dr = new DecodedRequest(request);
@@ -82,6 +79,6 @@
assertEquals(2170, dr.getServerPort());
assertEquals("www.flintstone.com", dr.getServerName());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/AbstractSpecificationResolverTestCase.java Tue Jun 27 11:21:31 2006
@@ -20,8 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.hivemind.util.URLResource;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.INamespace;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.ISpecificationSource;
@@ -33,7 +33,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public abstract class AbstractSpecificationResolverTestCase extends HiveMindTestCase
+public abstract class AbstractSpecificationResolverTestCase extends BaseComponentTestCase
{
protected IComponentSpecification newSpecification()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.resolver;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.List;
import org.apache.commons.logging.Log;
@@ -169,8 +173,8 @@
{
ComponentPropertySource source = (ComponentPropertySource) newMock(ComponentPropertySource.class);
- source.getNamespaceProperty(namespace, Tapestry.TEMPLATE_EXTENSION_PROPERTY);
- setReturnValue(source, "html");
+ expect(source.getNamespaceProperty(namespace, Tapestry.TEMPLATE_EXTENSION_PROPERTY))
+ .andReturn("html");
return source;
}
@@ -216,7 +220,7 @@
trainGetApplicationNamespace(source, application);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -229,7 +233,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
@@ -249,7 +253,7 @@
trainGetFrameworkNamespace(source, framework);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -262,7 +266,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(framework, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundAsTemplate()
@@ -307,7 +311,7 @@
trainIsDebugEnabled(log, false);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -340,7 +344,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInApplicationNamespace()
@@ -352,7 +356,7 @@
ISpecificationSource source = newSource(application, framework);
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -365,7 +369,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInChildNamespace()
@@ -382,7 +386,7 @@
ISpecificationSource source = newSource(application, framework);
IRequestCycle cycle = newCycle();
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -395,7 +399,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(child, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInContextRootFolder()
@@ -436,7 +440,7 @@
application.installPageSpecification("ContextRootPage", spec);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -452,7 +456,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInFramework()
@@ -493,7 +497,7 @@
train(log, ResolverMessages.foundFrameworkPage("FrameworkPage"));
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -510,7 +514,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(framework, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInNamespaceFolder()
@@ -542,7 +546,7 @@
application.installPageSpecification("NamespacePage", spec);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -556,7 +560,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInWebInfAppFolder()
@@ -593,7 +597,7 @@
application.installPageSpecification("MyAppPage", spec);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -609,7 +613,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInWebInfFolder()
@@ -651,7 +655,7 @@
application.installPageSpecification("MyWebInfPage", spec);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -667,7 +671,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testWebInf()
@@ -684,7 +688,7 @@
trainIsDebugEnabled(log, false);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
@@ -706,13 +710,13 @@
ex.getMessage());
}
- verifyControls();
+ verify();
trainContainsPage(application, "web-inf/BadName", false);
trainIsDebugEnabled(log, false);
- replayControls();
+ replay();
try
{
@@ -726,7 +730,7 @@
ex.getMessage());
}
- verifyControls();
+ verify();
}
@@ -760,7 +764,7 @@
trainGetNamespaceId(application, "<application namespace>");
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -782,7 +786,7 @@
.getMessage());
}
- verifyControls();
+ verify();
}
public void testProvidedByDelegate()
@@ -818,7 +822,7 @@
application.installPageSpecification("DelegatePage", spec);
- replayControls();
+ replay();
PageSpecificationResolverImpl resolver = new PageSpecificationResolverImpl();
resolver.setContextRoot(contextRoot);
@@ -835,20 +839,18 @@
assertSame(spec, resolver.getSpecification());
assertSame(application, resolver.getNamespace());
- verifyControls();
+ verify();
}
private void trainGetPageSpecification(INamespace namespace, String pageName,
IComponentSpecification spec)
{
- namespace.getPageSpecification(pageName);
- setReturnValue(namespace, spec);
+ expect(namespace.getPageSpecification(pageName)).andReturn(spec);
}
private void trainGetPageSpecification(ISpecificationSource source, Resource resource,
IComponentSpecification pageSpec)
{
- source.getPageSpecification(resource);
- setReturnValue(source, pageSpec);
+ expect(source.getPageSpecification(resource)).andReturn(pageSpec);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/resolver/TestComponentSpecificationResolver.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.resolver;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.commons.logging.Log;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
@@ -24,7 +28,6 @@
import org.apache.tapestry.engine.ISpecificationSource;
import org.apache.tapestry.services.ClassFinder;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.resolver.ComponentSpecificationResolverImpl}.
@@ -34,31 +37,26 @@
*/
public class TestComponentSpecificationResolver extends AbstractSpecificationResolverTestCase
{
- private void trainIsDeprecated(MockControl control, IComponentSpecification spec,
+ private void trainIsDeprecated(IComponentSpecification spec,
boolean isDeprecated)
{
- spec.isDeprecated();
- control.setReturnValue(isDeprecated);
+ expect(spec.isDeprecated()).andReturn(isDeprecated);
}
protected ISpecificationSource newSource(Resource resource, IComponentSpecification spec)
{
- MockControl control = newControl(ISpecificationSource.class);
- ISpecificationSource source = (ISpecificationSource) control.getMock();
+ ISpecificationSource source = newMock(ISpecificationSource.class);
- source.getComponentSpecification(resource);
- control.setReturnValue(spec);
+ expect(source.getComponentSpecification(resource)).andReturn(spec);
return source;
}
protected ISpecificationSource newSource(INamespace framework)
{
- MockControl control = newControl(ISpecificationSource.class);
- ISpecificationSource source = (ISpecificationSource) control.getMock();
+ ISpecificationSource source = newMock(ISpecificationSource.class);
- source.getFrameworkNamespace();
- control.setReturnValue(framework);
+ expect(source.getFrameworkNamespace()).andReturn(framework);
return source;
}
@@ -66,12 +64,9 @@
private ISpecificationResolverDelegate newDelegate(IRequestCycle cycle, INamespace namespace,
String type, IComponentSpecification spec)
{
- MockControl control = newControl(ISpecificationResolverDelegate.class);
- ISpecificationResolverDelegate delegate = (ISpecificationResolverDelegate) control
- .getMock();
+ ISpecificationResolverDelegate delegate = newMock(ISpecificationResolverDelegate.class);
- delegate.findComponentSpecification(cycle, namespace, type);
- control.setReturnValue(spec);
+ expect(delegate.findComponentSpecification(cycle, namespace, type)).andReturn(spec);
return delegate;
}
@@ -80,22 +75,17 @@
{
IRequestCycle cycle = newCycle();
Location l = newLocation();
+
+ IComponentSpecification spec = newSpec();
+ INamespace namespace = newMock(INamespace.class);
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl control = newControl(INamespace.class);
- INamespace namespace = (INamespace) control.getMock();
-
- namespace.containsComponentType("MyComponent");
- control.setReturnValue(true);
-
- namespace.getComponentSpecification("MyComponent");
- control.setReturnValue(spec);
+ expect(namespace.containsComponentType("MyComponent")).andReturn(true);
- trainIsDeprecated(specc, spec, false);
+ expect(namespace.getComponentSpecification("MyComponent")).andReturn(spec);
- replayControls();
+ trainIsDeprecated(spec, false);
+
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
@@ -104,34 +94,29 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testDeprecated()
{
IRequestCycle cycle = newCycle();
Location l = newLocation();
+
+ IComponentSpecification spec = newSpec();
+ INamespace namespace = newMock(INamespace.class);
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
+ expect(namespace.containsComponentType("MyComponent")).andReturn(true);
- MockControl control = newControl(INamespace.class);
- INamespace namespace = (INamespace) control.getMock();
+ expect(namespace.getComponentSpecification("MyComponent")).andReturn(spec);
- namespace.containsComponentType("MyComponent");
- control.setReturnValue(true);
-
- namespace.getComponentSpecification("MyComponent");
- control.setReturnValue(spec);
-
- trainIsDeprecated(specc, spec, true);
+ trainIsDeprecated(spec, true);
Log log = (Log) newMock(Log.class);
log
.warn("Component 'MyComponent' (at classpath:/org/apache/tapestry/resolver/TestComponentSpecificationResolver, line 1) is deprecated, and will likely be removed in a later release. Consult its documentation to find a replacement component.");
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -141,7 +126,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInChildNamespace()
@@ -149,27 +134,19 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
-
- MockControl libraryc = newControl(INamespace.class);
- INamespace library = (INamespace) libraryc.getMock();
+ IComponentSpecification spec = newSpec();
+ INamespace namespace = newMock(INamespace.class);
+ INamespace library = newMock(INamespace.class);
- namespace.getChildNamespace("lib");
- namespacec.setReturnValue(library);
+ expect(namespace.getChildNamespace("lib")).andReturn(library);
- library.containsComponentType("MyComponent");
- libraryc.setReturnValue(true);
+ expect(library.containsComponentType("MyComponent")).andReturn(true);
+
+ expect(library.getComponentSpecification("MyComponent")).andReturn(spec);
- library.getComponentSpecification("MyComponent");
- libraryc.setReturnValue(spec);
+ trainIsDeprecated(spec, false);
- trainIsDeprecated(specc, spec, false);
-
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
@@ -178,7 +155,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(library, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testSearchFoundRelative()
@@ -186,36 +163,30 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
-
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
+ IComponentSpecification spec = newSpec();
+ INamespace namespace = newMock(INamespace.class);
+
+ Log log = newMock(Log.class);
Resource namespaceLocation = newResource("LibraryStandin.library");
Resource specLocation = namespaceLocation.getRelativeResource("MyComponent.jwc");
ISpecificationSource source = newSource(specLocation, spec);
- namespace.containsComponentType("MyComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("MyComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("MyComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(specLocation));
train(log, ResolverMessages.installingComponent("MyComponent", namespace, spec));
namespace.installComponentSpecification("MyComponent", spec);
- trainIsDeprecated(specc, spec, false);
+ trainIsDeprecated(spec, false);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -226,7 +197,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInFrameworkNamespace()
@@ -234,52 +205,41 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
-
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
-
- MockControl frameworkc = newControl(INamespace.class);
- INamespace framework = (INamespace) frameworkc.getMock();
+ IComponentSpecification spec = newSpec();
+ INamespace namespace = newMock(INamespace.class);
+
+ Log log = newMock(Log.class);
+ INamespace framework = newMock(INamespace.class);
Resource namespaceLocation = newResource("LibraryStandin.library");
- namespace.containsComponentType("FrameworkComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("FrameworkComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("FrameworkComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(namespaceLocation
.getRelativeResource("FrameworkComponent.jwc")));
- namespace.isApplicationNamespace();
- namespacec.setReturnValue(false);
+ expect(namespace.isApplicationNamespace()).andReturn(false);
ClassFinder finder = newClassFinder("org.foo", "FrameworkComponent", null);
- trainGetPackages(namespacec, namespace, "org.foo");
+ trainGetPackages(namespace, "org.foo");
ISpecificationSource source = newSource(framework);
- framework.containsComponentType("FrameworkComponent");
- frameworkc.setReturnValue(true);
+ expect(framework.containsComponentType("FrameworkComponent")).andReturn(true);
- framework.getComponentSpecification("FrameworkComponent");
- frameworkc.setReturnValue(spec);
+ expect(framework.getComponentSpecification("FrameworkComponent")).andReturn(spec);
train(log, ResolverMessages
.installingComponent("FrameworkComponent", namespace, spec));
namespace.installComponentSpecification("FrameworkComponent", spec);
- trainIsDeprecated(specc, spec, false);
+ trainIsDeprecated(spec, false);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -291,7 +251,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testProvidedByDelegate()
@@ -299,17 +259,11 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
-
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
-
- MockControl frameworkc = newControl(INamespace.class);
- INamespace framework = (INamespace) frameworkc.getMock();
+ IComponentSpecification spec = newSpec();
+ INamespace namespace = newMock(INamespace.class);
+
+ Log log = newMock(Log.class);
+ INamespace framework = newMock(INamespace.class);
ISpecificationResolverDelegate delegate = newDelegate(
cycle,
@@ -319,36 +273,31 @@
Resource namespaceLocation = newResource("LibraryStandin.library");
- namespace.containsComponentType("DelegateComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("DelegateComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("DelegateComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(namespaceLocation
.getRelativeResource("DelegateComponent.jwc")));
- namespace.isApplicationNamespace();
- namespacec.setReturnValue(false);
+ expect(namespace.isApplicationNamespace()).andReturn(false);
ISpecificationSource source = newSource(framework);
- framework.containsComponentType("DelegateComponent");
- frameworkc.setReturnValue(false);
+ expect(framework.containsComponentType("DelegateComponent")).andReturn(false);
- log.isDebugEnabled();
- logc.setReturnValue(false);
+ expect(log.isDebugEnabled()).andReturn(false);
ClassFinder finder = newClassFinder("org.foo", "DelegateComponent", null);
- trainGetPackages(namespacec, namespace, "org.foo");
+ trainGetPackages(namespace, "org.foo");
namespace.installComponentSpecification("DelegateComponent", spec);
- trainIsDeprecated(specc, spec, false);
+ trainIsDeprecated(spec, false);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -361,22 +310,20 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
- private void trainGetPackages(MockControl namespacec, INamespace namespace, String packages)
+ private void trainGetPackages(INamespace namespace, String packages)
{
- namespace.getPropertyValue("org.apache.tapestry.component-class-packages");
- namespacec.setReturnValue(packages);
+ expect(namespace.getPropertyValue("org.apache.tapestry.component-class-packages"))
+ .andReturn(packages);
}
private ClassFinder newClassFinder(String packages, String className, Class result)
{
- MockControl control = newControl(ClassFinder.class);
- ClassFinder finder = (ClassFinder) control.getMock();
+ ClassFinder finder = newMock(ClassFinder.class);
- finder.findClass(packages, className);
- control.setReturnValue(result);
+ expect(finder.findClass(packages, className)).andReturn(result);
return finder;
}
@@ -385,15 +332,11 @@
{
IRequestCycle cycle = newCycle();
Location l = newLocation();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
-
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
-
- MockControl frameworkc = newControl(INamespace.class);
- INamespace framework = (INamespace) frameworkc.getMock();
+
+ Log log = newMock(Log.class);
+
+ INamespace namespace = newMock(INamespace.class);
+ INamespace framework = newMock(INamespace.class);
ISpecificationResolverDelegate delegate = newDelegate(
cycle,
@@ -403,29 +346,25 @@
Resource namespaceLocation = newResource("LibraryStandin.library");
- namespace.containsComponentType("NotFoundComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("NotFoundComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("NotFoundComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(namespaceLocation
.getRelativeResource("NotFoundComponent.jwc")));
- namespace.isApplicationNamespace();
- namespacec.setReturnValue(false);
+ expect(namespace.isApplicationNamespace()).andReturn(false);
ISpecificationSource source = newSource(framework);
- framework.containsComponentType("NotFoundComponent");
- frameworkc.setReturnValue(false);
+ expect(framework.containsComponentType("NotFoundComponent")).andReturn(false);
ClassFinder finder = newClassFinder("org.foo", "NotFoundComponent", null);
- trainGetPackages(namespacec, namespace, "org.foo");
+ trainGetPackages(namespace, "org.foo");
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -446,7 +385,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
/**
@@ -458,45 +397,38 @@
{
IRequestCycle cycle = newCycle();
Location l = newLocation();
-
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
+
+ IComponentSpecification spec = newSpec();
+ Log log = newLog();
Resource contextRoot = newResource("context/");
-
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
+
+ INamespace namespace = newMock(INamespace.class);
Resource namespaceLocation = newResource("LibraryStandin.library");
Resource specLocation = contextRoot.getRelativeResource("WEB-INF/myapp/MyAppComponent.jwc");
ISpecificationSource source = newSource(specLocation, spec);
- namespace.containsComponentType("MyAppComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("MyAppComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("MyAppComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(namespaceLocation
.getRelativeResource("MyAppComponent.jwc")));
- namespace.isApplicationNamespace();
- namespacec.setReturnValue(true);
+ expect(namespace.isApplicationNamespace()).andReturn(true);
train(log, ResolverMessages.checkingResource(specLocation));
train(log, ResolverMessages.installingComponent("MyAppComponent", namespace, spec));
namespace.installComponentSpecification("MyAppComponent", spec);
- trainIsDeprecated(specc, spec, false);
+ trainIsDeprecated(spec, false);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -510,7 +442,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInWebInfFolder()
@@ -518,35 +450,28 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
+ IComponentSpecification spec = newSpec();
+ Log log = newLog();
Resource contextRoot = newResource("context/");
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
+ INamespace namespace = newMock(INamespace.class);
Resource namespaceLocation = newResource("LibraryStandin.library");
Resource specLocation = contextRoot.getRelativeResource("WEB-INF/MyWebInfComponent.jwc");
ISpecificationSource source = newSource(specLocation, spec);
- namespace.containsComponentType("MyWebInfComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("MyWebInfComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("MyWebInfComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(namespaceLocation
.getRelativeResource("MyWebInfComponent.jwc")));
- namespace.isApplicationNamespace();
- namespacec.setReturnValue(true);
+ expect(namespace.isApplicationNamespace()).andReturn(true);
train(log, ResolverMessages.checkingResource(contextRoot
.getRelativeResource("WEB-INF/myapp/MyWebInfComponent.jwc")));
@@ -555,9 +480,9 @@
namespace.installComponentSpecification("MyWebInfComponent", spec);
- trainIsDeprecated(specc, spec, false);
+ trainIsDeprecated(spec, false);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -571,7 +496,7 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
+ verify();
}
public void testFoundInContextRoot()
@@ -579,35 +504,28 @@
IRequestCycle cycle = newCycle();
Location l = newLocation();
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl logc = newControl(Log.class);
- Log log = (Log) logc.getMock();
+ IComponentSpecification spec = newSpec();
+ Log log = newLog();
Resource contextRoot = newResource("context/");
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
+ INamespace namespace = newMock(INamespace.class);
Resource namespaceLocation = newResource("LibraryStandin.library");
Resource specLocation = contextRoot.getRelativeResource("ContextRootComponent.jwc");
ISpecificationSource source = newSource(specLocation, spec);
- namespace.containsComponentType("ContextRootComponent");
- namespacec.setReturnValue(false);
+ expect(namespace.containsComponentType("ContextRootComponent")).andReturn(false);
train(log, ResolverMessages.resolvingComponent("ContextRootComponent", namespace));
- namespace.getSpecificationLocation();
- namespacec.setReturnValue(namespaceLocation);
+ expect(namespace.getSpecificationLocation()).andReturn(namespaceLocation);
train(log, ResolverMessages.checkingResource(namespaceLocation
.getRelativeResource("ContextRootComponent.jwc")));
- namespace.isApplicationNamespace();
- namespacec.setReturnValue(true);
+ expect(namespace.isApplicationNamespace()).andReturn(true);
train(log, ResolverMessages.checkingResource(contextRoot
.getRelativeResource("WEB-INF/myapp/ContextRootComponent.jwc")));
@@ -619,11 +537,11 @@
namespace,
spec));
- trainIsDeprecated(specc, spec, false);
+ trainIsDeprecated(spec, false);
namespace.installComponentSpecification("ContextRootComponent", spec);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setLog(log);
@@ -637,28 +555,22 @@
assertSame(spec, resolver.getSpecification());
assertSame(namespace, resolver.getNamespace());
- verifyControls();
- }
-
- private Resource newResource()
- {
- return (Resource) newMock(Resource.class);
+ verify();
}
public void testFoundComponentClass()
{
Resource componentResource = newResource();
Resource namespaceResource = newResource("folder/MyComponent.jwc", componentResource);
+
+ INamespace namespace = newMock(INamespace.class);
- MockControl namespacec = newControl(INamespace.class);
- INamespace namespace = (INamespace) namespacec.getMock();
-
- trainGetPackages(namespacec, namespace, "org.foo");
+ trainGetPackages(namespace, "org.foo");
ClassFinder finder = newClassFinder("org.foo", "folder.MyComponent", BaseComponent.class);
- trainGetResource(namespacec, namespace, namespaceResource);
+ trainGetResource(namespace, namespaceResource);
- replayControls();
+ replay();
ComponentSpecificationResolverImpl resolver = new ComponentSpecificationResolverImpl();
resolver.setClassFinder(finder);
@@ -671,22 +583,19 @@
assertSame(componentResource, spec.getSpecificationLocation());
assertSame(componentResource, spec.getLocation().getResource());
- verifyControls();
+ verify();
}
- private void trainGetResource(MockControl control, INamespace namespace, Resource resource)
+ private void trainGetResource(INamespace namespace, Resource resource)
{
- namespace.getSpecificationLocation();
- control.setReturnValue(resource);
+ expect(namespace.getSpecificationLocation()).andReturn(resource);
}
private Resource newResource(String relativePath, Resource relativeResource)
{
- MockControl control = newControl(Resource.class);
- Resource resource = (Resource) control.getMock();
+ Resource resource = newMock(Resource.class);
- resource.getRelativeResource(relativePath);
- control.setReturnValue(relativeResource);
+ expect(resource.getRelativeResource(relativePath)).andReturn(relativeResource);
return resource;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestForeachToken.java Tue Jun 27 11:21:31 2006
@@ -14,13 +14,15 @@
package org.apache.tapestry.script;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests {@link org.apache.tapestry.script.ForeachToken}.
@@ -28,7 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestForeachToken extends HiveMindTestCase
+public class TestForeachToken extends BaseComponentTestCase
{
private static class EchoToken extends AbstractToken
{
@@ -53,22 +55,19 @@
public void testFull()
{
Map symbols = new HashMap();
-
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+
+ ScriptSession s = newMock(ScriptSession.class);
StringBuffer buffer = new StringBuffer();
Iterator i = Arrays.asList(new String[]
{ "buffy", "angel" }).iterator();
- s.evaluate("EXPRESSION", Iterator.class);
- sc.setReturnValue(i);
+ expect(s.evaluate("EXPRESSION", Iterator.class)).andReturn(i);
- s.getSymbols();
- sc.setReturnValue(symbols, 5);
+ expect(s.getSymbols()).andReturn(symbols).times(5);
- replayControls();
+ replay();
ForeachToken t = new ForeachToken("value", "index", "EXPRESSION", null);
t.addToken(new EchoToken("value"));
@@ -76,7 +75,7 @@
t.write(buffer, s);
- verifyControls();
+ verify();
assertEquals("buffy\n0\nangel\n1\n", buffer.toString());
@@ -90,21 +89,18 @@
symbols.put("index", "none");
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+ ScriptSession s = newMock(ScriptSession.class);
StringBuffer buffer = new StringBuffer();
Iterator i = Arrays.asList(new String[]
{ "buffy", "angel" }).iterator();
- s.evaluate("EXPRESSION", Iterator.class);
- sc.setReturnValue(i);
+ expect(s.evaluate("EXPRESSION", Iterator.class)).andReturn(i);
- s.getSymbols();
- sc.setReturnValue(symbols, 5);
+ expect(s.getSymbols()).andReturn(symbols).times(5);
- replayControls();
+ replay();
ForeachToken t = new ForeachToken("value", null, "EXPRESSION", null);
t.addToken(new EchoToken("value"));
@@ -112,7 +108,7 @@
t.write(buffer, s);
- verifyControls();
+ verify();
assertEquals("buffy\nnone\nangel\nnone\n", buffer.toString());
@@ -122,20 +118,18 @@
public void testNullIterator()
{
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+ ScriptSession s = newMock(ScriptSession.class);
- s.evaluate("EXPRESSION", Iterator.class);
- sc.setReturnValue(null);
+ expect(s.evaluate("EXPRESSION", Iterator.class)).andReturn(null);
- IScriptToken inner = (IScriptToken) newMock(IScriptToken.class);
+ IScriptToken inner = newMock(IScriptToken.class);
- replayControls();
+ replay();
ForeachToken t = new ForeachToken("value", "index", "EXPRESSION", null);
t.addToken(inner);
t.write(null, s);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/script/TestIfToken.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,13 @@
package org.apache.tapestry.script;
+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.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests {@link org.apache.tapestry.script.IfToken}, the basis for the <if> and
@@ -26,76 +29,70 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestIfToken extends HiveMindTestCase
+public class TestIfToken extends BaseComponentTestCase
{
public void testEvaluateTrue()
{
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+ ScriptSession s = newMock(ScriptSession.class);
- IScriptToken nested = (IScriptToken) newMock(IScriptToken.class);
+ IScriptToken nested = newMock(IScriptToken.class);
- s.evaluate("EXPRESSION", Boolean.class);
- sc.setReturnValue(Boolean.TRUE);
+ expect(s.evaluate("EXPRESSION", Boolean.class)).andReturn(Boolean.TRUE);
StringBuffer buffer = new StringBuffer();
nested.write(buffer, s);
- replayControls();
+ replay();
IfToken t = new IfToken(true, "EXPRESSION", null);
t.addToken(nested);
t.write(buffer, s);
- verifyControls();
+ verify();
}
public void testEvaluateFalse()
{
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+ ScriptSession s = newMock(ScriptSession.class);
IScriptToken nested = (IScriptToken) newMock(IScriptToken.class);
- s.evaluate("EXPRESSION", Boolean.class);
- sc.setReturnValue(Boolean.FALSE);
+ expect(s.evaluate("EXPRESSION", Boolean.class)).andReturn(Boolean.FALSE);
StringBuffer buffer = new StringBuffer();
- replayControls();
+ replay();
IfToken t = new IfToken(true, "EXPRESSION", null);
t.addToken(nested);
t.write(buffer, s);
- verifyControls();
+ verify();
}
public void testEvaluateMatch()
{
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+ ScriptSession s = newMock(ScriptSession.class);
IScriptToken nested = (IScriptToken) newMock(IScriptToken.class);
- s.evaluate("EXPRESSION", Boolean.class);
- sc.setReturnValue(Boolean.FALSE);
+ expect(s.evaluate("EXPRESSION", Boolean.class)).andReturn(Boolean.FALSE);
StringBuffer buffer = new StringBuffer();
nested.write(buffer, s);
- replayControls();
+ replay();
IfToken t = new IfToken(false, "EXPRESSION", null);
t.addToken(nested);
t.write(buffer, s);
- verifyControls();
+ verify();
}
public void testEvaluateFailure()
@@ -103,13 +100,11 @@
Location l = fabricateLocation(8);
Throwable inner = new ApplicationRuntimeException("Simulated error.");
- MockControl sc = newControl(ScriptSession.class);
- ScriptSession s = (ScriptSession) sc.getMock();
+ ScriptSession s = newMock(ScriptSession.class);
- s.evaluate("EXPRESSION", Boolean.class);
- sc.setThrowable(inner);
+ expect(s.evaluate("EXPRESSION", Boolean.class)).andThrow(inner);
- replayControls();
+ replay();
IfToken t = new IfToken(false, "EXPRESSION", l);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/AbstractEngineServiceProxyTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,8 +14,9 @@
package org.apache.tapestry.services.impl;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.apache.tapestry.IRequestCycle;
+import static org.easymock.EasyMock.expect;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
@@ -25,14 +26,8 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public abstract class AbstractEngineServiceProxyTestCase extends HiveMindTestCase
+public abstract class AbstractEngineServiceProxyTestCase extends BaseComponentTestCase
{
-
- protected IRequestCycle newCycle()
- {
- return (IRequestCycle) newMock(IRequestCycle.class);
- }
-
protected IEngineService newEngineService()
{
return (IEngineService) newMock(IEngineService.class);
@@ -40,8 +35,7 @@
protected void trainGetLink(IEngineService service, boolean post, Object parameter, ILink link)
{
- service.getLink(post, parameter);
- setReturnValue(service, link);
+ expect(service.getLink(post, parameter)).andReturn(link);
}
protected ILink newLink()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java Tue Jun 27 11:21:31 2006
@@ -17,6 +17,10 @@
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.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
import java.util.ArrayList;
import java.util.List;
@@ -106,16 +110,14 @@
script.execute(eq(cycle), eq(prs), isA(Map.class));
- replayControls();
+ replay();
worker.renderComponent(cycle, component);
- verifyControls();
+ verify();
assertEquals(0, worker.getDefferedFormConnections().size());
- resetControls();
-
// test widget render
invoker.addEventListener("wid1", new String[] {"onSelect"}, "testMethod",
@@ -138,11 +140,11 @@
script.execute(eq(cycle), eq(prs), isA(Map.class));
- replayControls();
+ replay();
worker.renderComponent(cycle, widget);
- verifyControls();
+ verify();
}
public void testRewindRender()
@@ -153,11 +155,11 @@
expect(cycle.isRewinding()).andReturn(true);
- replayControls();
+ replay();
worker.renderComponent(cycle, null);
- verifyControls();
+ verify();
}
public void testNullPageSupport()
@@ -170,11 +172,11 @@
expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE)).andReturn(null);
- replayControls();
+ replay();
worker.renderComponent(cycle, null);
- verifyControls();
+ verify();
}
public void testDeferredConnection()
@@ -203,16 +205,14 @@
expect(cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1")).andReturn(null);
- replayControls();
+ replay();
worker.renderComponent(cycle, component);
- verifyControls();
+ verify();
assertEquals(1, worker.getDefferedFormConnections().size());
- resetControls();
-
List deferred = (List)worker.getDefferedFormConnections().get("form1");
assertNotNull(deferred);
assertEquals(1, deferred.size());
@@ -269,16 +269,14 @@
expect(cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1")).andReturn(null);
- replayControls();
+ replay();
worker.renderComponent(cycle, component);
- verifyControls();
+ verify();
assertEquals(1, worker.getDefferedFormConnections().size());
- resetControls();
-
checkOrder(form, false);
checkOrder(component, false);
@@ -310,11 +308,11 @@
script.execute(eq(cycle), eq(prs), isA(Map.class));
- replayControls();
+ replay();
worker.renderComponent(cycle, form);
- verifyControls();
+ verify();
}
public void testScriptResource()
@@ -347,8 +345,8 @@
assertNotNull(worker.getScript(body));
assertEquals(elementScript, worker.getScript(body).getPath());
- replayControls();
+ replay();
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/ComponentEventInvokerTest.java Tue Jun 27 11:21:31 2006
@@ -13,18 +13,21 @@
// limitations under the License.
package org.apache.tapestry.services.impl;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.IgnoreMatcher;
import org.apache.tapestry.event.BrowserEvent;
import org.apache.tapestry.event.EventTarget;
import org.apache.tapestry.form.FormSupport;
@@ -81,22 +84,21 @@
invoker.addEventListener("testId", new String[] { "onSelect" }, "fooListener",
null, false);
- comp.getId();
- setReturnValue(comp, "testId");
- comp.getContainer();
- setReturnValue(comp, comp);
- comp.getListeners();
- setReturnValue(comp, listenerMap);
+ expect(comp.getId()).andReturn("testId");
+
+ expect(comp.getContainer()).andReturn(comp);
+
+ expect(comp.getListeners()).andReturn(listenerMap);
+
+ expect(listenerMap.getListener("fooListener")).andReturn(listener);
- listenerMap.getListener("fooListener");
- setReturnValue(listenerMap, listener);
listenerInvoker.invokeListener(listener, comp, cycle);
- replayControls();
+ replay();
invoker.invokeListeners(comp, cycle, event);
- verifyControls();
+ verify();
}
public void testInvokeElementListener()
@@ -117,22 +119,19 @@
invoker.addElementEventListener("testId", new String[] { "onSelect" },
"fooListener", null, false);
- comp.getId();
- setReturnValue(comp, "testId");
- comp.getContainer();
- setReturnValue(comp, comp);
- comp.getListeners();
- setReturnValue(comp, listenerMap);
+ expect(comp.getId()).andReturn("testId");
- listenerMap.getListener("fooListener");
- setReturnValue(listenerMap, listener);
- listenerInvoker.invokeListener(listener, comp, cycle);
+ expect(comp.getContainer()).andReturn(comp);
+
+ expect(comp.getListeners()).andReturn(listenerMap);
- replayControls();
+ expect(listenerMap.getListener("fooListener")).andReturn(listener);
+
+ replay();
invoker.invokeListeners(comp, cycle, event);
- verifyControls();
+ verify();
}
public void testInvokeFormListener()
@@ -140,7 +139,6 @@
IRequestCycle cycle = newCycle();
IForm form = newForm();
FormSupport formSupport = (FormSupport) newMock(FormSupport.class);
- Runnable runnable = (Runnable)newMock(Runnable.class);
ListenerInvoker listenerInvoker = (ListenerInvoker)newMock(ListenerInvoker.class);
ListenerMap listenerMap = (ListenerMap)newMock(ListenerMap.class);
@@ -156,29 +154,22 @@
invoker.addEventListener("testId", new String[] { "onSelect" }, "fooListener",
"form1", false);
- formSupport.getForm();
- setReturnValue(formSupport, form);
- form.getId();
- setReturnValue(form, "form1");
-
- form.getContainer();
- setReturnValue(form, form);
- form.getContainer();
- setReturnValue(form, form);
- form.getListeners();
- setReturnValue(form, listenerMap);
-
- listenerMap.getListener("fooListener");
- setReturnValue(listenerMap, listener);
-
- form.addDeferredRunnable(runnable);
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(form).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[] { ignore }));
+ expect(formSupport.getForm()).andReturn(form);
+
+ expect(form.getId()).andReturn("form1");
+
+ expect(form.getContainer()).andReturn(form).anyTimes();
+
+ expect(form.getListeners()).andReturn(listenerMap);
+
+ expect(listenerMap.getListener("fooListener")).andReturn(listener);
+
+ form.addDeferredRunnable(isA(Runnable.class));
- replayControls();
+ replay();
invoker.invokeFormListeners(formSupport, cycle, event);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/CookieSourceTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.services.impl;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -21,7 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.services.impl.CookieSourceImpl}.
@@ -29,7 +32,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public class CookieSourceTest extends HiveMindTestCase
+public class CookieSourceTest extends BaseComponentTestCase
{
// In seconds
@@ -79,15 +82,14 @@
cookies = (Cookie[]) l.toArray(new Cookie[l.size()]);
}
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- request.getCookies();
- setReturnValue(request, cookies);
+ expect(request.getCookies()).andReturn(cookies);
return request;
}
- protected HttpServletRequest newRequest()
+ protected HttpServletRequest newHttpRequest()
{
return (HttpServletRequest) newMock(HttpServletRequest.class);
}
@@ -100,13 +102,13 @@
cs.setRequest(request);
- replayControls();
+ replay();
String actual = cs.readCookieValue(name);
assertEquals(expected, actual);
- verifyControls();
+ verify();
}
public void testNoCookies()
@@ -128,7 +130,7 @@
public void testWriteCookie()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
// Training
@@ -140,7 +142,7 @@
response.addCookie(cookie);
- replayControls();
+ replay();
CookieSourceImpl cs = new CookieSourceImpl();
cs.setRequest(request);
@@ -149,12 +151,12 @@
cs.writeCookieValue("foo", "bar");
- verifyControls();
+ verify();
}
public void testWriteCookieWithMaxAge()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
// Training
@@ -166,7 +168,7 @@
response.addCookie(cookie);
- replayControls();
+ replay();
CookieSourceImpl cs = new CookieSourceImpl();
cs.setRequest(request);
@@ -175,13 +177,12 @@
cs.writeCookieValue("foo", "bar", -1);
- verifyControls();
+ verify();
}
private void trainGetContextPath(HttpServletRequest request, String contextPath)
{
- request.getContextPath();
- setReturnValue(request, contextPath);
+ expect(request.getContextPath()).andReturn(contextPath);
}
private HttpServletResponse newResponse()
@@ -191,7 +192,7 @@
public void testRemoveCookie()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
HttpServletResponse response = newResponse();
// Training
@@ -203,7 +204,7 @@
response.addCookie(cookie);
- replayControls();
+ replay();
CookieSourceImpl cs = new CookieSourceImpl();
cs.setRequest(request);
@@ -211,6 +212,6 @@
cs.removeCookieValue("foo");
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java Tue Jun 27 11:21:31 2006
@@ -13,10 +13,14 @@
// limitations under the License.
package org.apache.tapestry.services.impl;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.io.CharArrayWriter;
import java.io.PrintWriter;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
@@ -26,6 +30,7 @@
import org.apache.tapestry.markup.MarkupWriterImpl;
import org.apache.tapestry.markup.UTFMarkupFilter;
import org.apache.tapestry.services.ResponseBuilder;
+import org.testng.annotations.Configuration;
/**
@@ -34,7 +39,7 @@
* @author jkuhnert
*/
@SuppressWarnings("cast")
-public class DefaultResponseBuilderTest extends HiveMindTestCase
+public class DefaultResponseBuilderTest extends BaseComponentTestCase
{
private static CharArrayWriter _writer;
@@ -49,11 +54,10 @@
return new PrintWriter(_writer);
}
+ @Configuration(afterTestClass = true)
protected void tearDown() throws Exception
{
_writer = null;
-
- super.tearDown();
}
private void assertOutput(String expected)
@@ -72,11 +76,11 @@
render.render(null, cycle);
- replayControls();
+ replay();
builder.render(null, render, cycle);
- verifyControls();
+ verify();
assertSame(builder.getWriter(), NullWriter.getSharedInstance());
}
@@ -91,11 +95,11 @@
render.render(writer, cycle);
- replayControls();
+ replay();
builder.render(null, render, cycle);
- verifyControls();
+ verify();
assertSame(builder.getWriter(), writer);
}
@@ -124,7 +128,7 @@
PrintWriter writer = newPrintWriter();
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
ResponseBuilder builder = new DefaultResponseBuilder(mw);
@@ -133,8 +137,8 @@
String imageInit = "image initializations";
String preload = "preloadedvarname";
- verifyControls();
- replayControls();
+ verify();
+ replay();
builder.beginBodyScript(cycle);
@@ -154,7 +158,7 @@
assertOutput("\n\n// --></script>");
- verifyControls();
+ verify();
}
public void testWriteExternalScripts()
@@ -163,7 +167,7 @@
PrintWriter writer = newPrintWriter();
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
ResponseBuilder builder = new DefaultResponseBuilder(mw);
@@ -171,8 +175,8 @@
String script1 = "http://noname/js/package.js";
String script2 = "http://noname/js/package.js";
- verifyControls();
- replayControls();
+ verify();
+ replay();
builder.writeExternalScript(script1, cycle);
@@ -184,7 +188,7 @@
assertOutput("<script type=\"text/javascript\" src=\""
+ script2 + "\"></script>" + LINE_SEPERATOR);
- verifyControls();
+ verify();
}
public void testWriteInitializationScript()
@@ -192,15 +196,15 @@
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
ResponseBuilder builder = new DefaultResponseBuilder(mw);
String script = "doThisInInit();";
- verifyControls();
- replayControls();
+ verify();
+ replay();
builder.writeInitializationScript(script);
@@ -211,6 +215,6 @@
+ "\n// -->"
+ "</script>");
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Tue Jun 27 11:21:31 2006
@@ -13,12 +13,18 @@
// limitations under the License.
package org.apache.tapestry.services.impl;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.io.CharArrayWriter;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRender;
@@ -29,6 +35,7 @@
import org.apache.tapestry.markup.MarkupWriterImpl;
import org.apache.tapestry.markup.UTFMarkupFilter;
import org.apache.tapestry.services.ResponseBuilder;
+import org.testng.annotations.Configuration;
/**
@@ -37,7 +44,7 @@
* @author jkuhnert
*/
@SuppressWarnings("cast")
-public class DojoAjaxResponseBuilderTest extends HiveMindTestCase
+public class DojoAjaxResponseBuilderTest extends BaseComponentTestCase
{
private static CharArrayWriter _writer;
@@ -52,11 +59,10 @@
return new PrintWriter(_writer);
}
+ @Configuration(afterTestClass = true)
protected void tearDown() throws Exception
{
_writer = null;
-
- super.tearDown();
}
private void assertOutput(String expected)
@@ -75,11 +81,11 @@
render.render(NullWriter.getSharedInstance(), cycle);
- replayControls();
+ replay();
builder.render(null, render, cycle);
- verifyControls();
+ verify();
assertSame(builder.getWriter(), null);
}
@@ -94,11 +100,11 @@
render.render(NullWriter.getSharedInstance(), cycle);
- replayControls();
+ replay();
builder.render(null, render, cycle);
- verifyControls();
+ verify();
assertSame(builder.getWriter(), writer);
}
@@ -107,11 +113,11 @@
{
ResponseBuilder builder = new DojoAjaxResponseBuilder(null, null);
- replayControls();
+ replay();
builder.isBodyScriptAllowed(null);
- verifyControls();
+ verify();
}
public void testPartialRender()
@@ -130,17 +136,9 @@
render.render(NullWriter.getSharedInstance(), cycle);
- comp1.getClientId();
- setReturnValue(comp1, "id1");
-
- comp1.getClientId();
- setReturnValue(comp1, "id1");
+ expect(comp1.getClientId()).andReturn("id1").anyTimes();
- comp1.getClientId();
- setReturnValue(comp1, "id1");
-
- writer.getNestedWriter();
- setReturnValue(writer, nested);
+ expect(writer.getNestedWriter()).andReturn(nested);
nested.begin("response");
nested.attribute("id", "id1");
@@ -148,7 +146,7 @@
comp1.render(nested, cycle);
- replayControls();
+ replay();
builder.render(null, render, cycle);
@@ -157,7 +155,7 @@
builder.render(null, comp1, cycle);
- verifyControls();
+ verify();
assertSame(builder.getWriter(), writer);
}
@@ -170,20 +168,19 @@
ResponseBuilder builder = new DojoAjaxResponseBuilder(null, parts);
- comp.getClientId();
- setReturnValue(comp, "comp");
- comp.getClientId();
- setReturnValue(comp, "comp1");
- comp.getClientId();
- setReturnValue(comp, "comp");
+ expect(comp.getClientId()).andReturn("comp");
+
+ expect(comp.getClientId()).andReturn("comp1");
+
+ expect(comp.getClientId()).andReturn("comp");
- replayControls();
+ replay();
assertFalse(builder.isBodyScriptAllowed(comp));
assertTrue(builder.isExternalScriptAllowed(comp));
assertFalse(builder.isInitializationScriptAllowed(comp));
- verifyControls();
+ verify();
}
public void testWriteBodyScript()
@@ -192,7 +189,7 @@
PrintWriter writer = newPrintWriter();
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
DojoAjaxResponseBuilder builder = new DojoAjaxResponseBuilder(mw, null);
@@ -201,8 +198,8 @@
String imageInit = "image initializations";
String preload = "preloadedvarname";
- verifyControls();
- replayControls();
+ verify();
+ replay();
builder.beginResponse();
@@ -231,7 +228,7 @@
"//]]>\n" +
"</script></response></ajax-response>");
- verifyControls();
+ verify();
}
public void testWriteExternalScripts()
@@ -240,7 +237,7 @@
PrintWriter writer = newPrintWriter();
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
DojoAjaxResponseBuilder builder = new DojoAjaxResponseBuilder(mw, null);
@@ -248,8 +245,8 @@
String script1 = "http://noname/js/package.js";
String script2 = "http://noname/js/package.js";
- verifyControls();
- replayControls();
+ verify();
+ replay();
builder.beginResponse();
@@ -268,7 +265,7 @@
LINE_SEPERATOR +
"</response></ajax-response>");
- verifyControls();
+ verify();
}
public void testWriteInitializationScript()
@@ -276,15 +273,15 @@
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
DojoAjaxResponseBuilder builder = new DojoAjaxResponseBuilder(mw, null);
String script = "doThisInInit();";
- verifyControls();
- replayControls();
+ verify();
+ replay();
builder.beginResponse();
@@ -301,6 +298,6 @@
"//]]>\n" +
"</script></response></ajax-response>");
- verifyControls();
+ verify();
}
}