You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/06/27 20:21:40 UTC
svn commit: r417545 [3/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/describe/CookieStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/CookieStrategyTest.java Tue Jun 27 11:21:31 2006
@@ -29,7 +29,7 @@
receiver.title("a-name=some-value");
- replayControls();
+ replay();
Cookie cookie = new Cookie("a-name", "some-value");
@@ -37,7 +37,7 @@
strategy.describeObject(cookie, receiver);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.describe;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -92,7 +95,7 @@
IMarkupWriter writer = newWriter();
DescribableStrategy adapter = newStrategy();
- replayControls();
+ replay();
DescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
@@ -109,7 +112,7 @@
assertEquals(DescribeMessages.setTitleOnce(), ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testSetSectionBeforeTitleFails()
@@ -117,7 +120,7 @@
IMarkupWriter writer = newWriter();
DescribableStrategy adapter = newStrategy();
- replayControls();
+ replay();
DescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
@@ -131,7 +134,7 @@
assertEquals(DescribeMessages.mustSetTitleBeforeSection(), ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testIntProperty()
@@ -143,7 +146,7 @@
trainForSection(writer, "Section");
trainForKeyValue(writer, "intProperty", "97", true);
- replayControls();
+ replay();
DescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
@@ -151,7 +154,7 @@
dr.section("Section");
dr.property("intProperty", 97);
- verifyControls();
+ verify();
}
public void testPropertiesWithoutSection()
@@ -163,7 +166,7 @@
trainForKeyValue(writer, "first", "1", true);
trainForKeyValue(writer, "second", "2", false);
- replayControls();
+ replay();
DescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
@@ -171,19 +174,19 @@
dr.property("first", 1);
dr.property("second", 2);
- verifyControls();
+ verify();
trainForSection(writer, "Section 1");
trainForKeyValue(writer, "s1", "1", true);
trainForKeyValue(writer, "s2", "2", false);
- replayControls();
+ replay();
dr.section("Section 1");
dr.property("s1", 1);
dr.property("s2", 2);
- verifyControls();
+ verify();
}
public void testFinishWithProperties()
@@ -194,23 +197,23 @@
trainForTitle(writer, "Object Title");
trainForKeyValue(writer, "first", "1", true);
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
dr.title("Object Title");
dr.property("first", 1);
- verifyControls();
+ verify();
writer.end("table");
writer.println();
- replayControls();
+ replay();
dr.finishUp(null);
- verifyControls();
+ verify();
}
public void testFinishNoPropertiesNoTitle()
@@ -223,13 +226,13 @@
writer.print("Fred");
writer.println();
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
dr.finishUp(object);
- verifyControls();
+ verify();
}
public void testFinishNoPropertiesWithTitle()
@@ -242,7 +245,7 @@
writer.print("Fred Title");
writer.println();
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
@@ -250,7 +253,7 @@
dr.finishUp(object);
- verifyControls();
+ verify();
}
public void testArray()
@@ -265,14 +268,14 @@
trainForNestedKeyValue(writer, "list", "Fred", true);
trainForNestedKeyValue(writer, null, "Barney", false);
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
dr.title("Array");
dr.array("list", array);
- verifyControls();
+ verify();
}
public void testCollection()
@@ -288,14 +291,14 @@
trainForNestedKeyValue(writer, "list", "Fred", true);
trainForNestedKeyValue(writer, null, "Barney", false);
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, adapter);
dr.title("Collection");
dr.collection("list", collection);
- verifyControls();
+ verify();
}
public void testArrayNullAndEmpty()
@@ -303,7 +306,7 @@
IMarkupWriter writer = newWriter();
DescribableStrategy strategy = newStrategy();
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, strategy);
@@ -311,7 +314,7 @@
dr.array("null", null);
dr.array("empty", new Object[0]);
- verifyControls();
+ verify();
}
public void testCollectionNullAndEmpty()
@@ -319,7 +322,7 @@
IMarkupWriter writer = newWriter();
DescribableStrategy strategy = newStrategy();
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, strategy);
@@ -327,7 +330,7 @@
dr.collection("null", null);
dr.collection("empty", Collections.EMPTY_LIST);
- verifyControls();
+ verify();
}
public void testScalarProperties()
@@ -345,7 +348,7 @@
trainForKeyValue(writer, "float", "3.14", true);
trainForKeyValue(writer, "double", "-2.7", false);
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, strategy);
@@ -359,7 +362,7 @@
dr.property("float", (float) 3.14);
dr.property("double", -2.7);
- verifyControls();
+ verify();
}
public void testNullRoot()
@@ -369,13 +372,13 @@
writer.print(HTMLDescriptionReceiver.NULL_VALUE);
- replayControls();
+ replay();
RootDescriptionReciever dr = new HTMLDescriptionReceiver(writer, strategy);
dr.describe(null);
- verifyControls();
+ verify();
}
public void testNullProperty()
@@ -386,14 +389,14 @@
trainForTitle(writer, "Null Property");
trainForKeyValue(writer, "null", HTMLDescriptionReceiver.NULL_VALUE, true);
- replayControls();
+ replay();
HTMLDescriptionReceiver dr = new HTMLDescriptionReceiver(writer, strategy);
dr.title("Null Property");
dr.property("null", null);
- verifyControls();
+ verify();
}
@@ -411,22 +414,20 @@
writer.print("Tapestry");
writer.println();
- replayControls();
+ replay();
HTMLDescriberImpl d = new HTMLDescriberImpl();
d.setReceiverFactory(factory);
d.describeObject(object, writer);
- verifyControls();
+ verify();
}
protected void trainGetReciever(RootDescriptionReceiverFactory factory, IMarkupWriter writer,
RootDescriptionReciever receiver)
{
- factory.newRootDescriptionReceiver(writer);
- setReturnValue(factory, receiver);
-
+ expect(factory.newRootDescriptionReceiver(writer)).andReturn(receiver);
}
protected RootDescriptionReceiverFactory newReceiverFactory()
@@ -445,10 +446,10 @@
strategy.describeObject(alternate, dr);
- replayControls();
+ replay();
dr.describeAlternate(alternate);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ObjectArrayRenderStrategyTest.java Tue Jun 27 11:21:31 2006
@@ -16,6 +16,7 @@
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
+import org.testng.annotations.Test;
/**
* Tests for {@link ObjectArrayRenderStrategy}.
@@ -23,6 +24,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
+@Test
public class ObjectArrayRenderStrategyTest extends BaseDescribeTestCase
{
public void testEmpty()
@@ -36,11 +38,11 @@
writer.print("empty list");
writer.end();
- replayControls();
+ replay();
new ObjectArrayRenderStrategy().renderObject(array, writer, cycle);
- verifyControls();
+ verify();
}
public void testNonEmpty()
@@ -73,7 +75,7 @@
writer.end();
writer.end();
- replayControls();
+ replay();
ObjectArrayRenderStrategy subject = new ObjectArrayRenderStrategy();
@@ -81,7 +83,7 @@
subject.renderObject(array, writer, cycle);
- verifyControls();
+ verify();
}
public void testNullInArray()
@@ -100,10 +102,10 @@
writer.end();
writer.end();
- replayControls();
+ replay();
new ObjectArrayRenderStrategy().renderObject(array, writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/PreformattedRenderableStrategyTest.java Tue Jun 27 11:21:31 2006
@@ -35,10 +35,10 @@
writer.print(object);
writer.end();
- replayControls();
+ replay();
new PreformattedRenderStrategy().renderObject(object, writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/ReportStatusHubTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.describe;
+import static org.easymock.EasyMock.expect;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.event.ReportStatusEvent;
import org.apache.tapestry.event.ReportStatusListener;
@@ -31,9 +33,7 @@
{
RootDescriptionReceiverFactory factory = newReceiverFactory();
- factory.newRootDescriptionReceiver(writer);
-
- setReturnValue(factory, receiver);
+ expect(factory.newRootDescriptionReceiver(writer)).andReturn(receiver);
return factory;
}
@@ -63,7 +63,7 @@
receiver.finishUp();
- replayControls();
+ replay();
ReportStatusHubImpl hub = new ReportStatusHubImpl();
@@ -73,7 +73,7 @@
hub.fireReportStatus(writer);
- verifyControls();
+ verify();
}
public void testRemove()
@@ -81,7 +81,7 @@
IMarkupWriter writer = newWriter();
RootDescriptionReceiverFactory factory = newReceiverFactory();
- replayControls();
+ replay();
ReportStatusHubImpl hub = new ReportStatusHubImpl();
@@ -93,7 +93,7 @@
hub.fireReportStatus(writer);
- verifyControls();
+ verify();
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestLocationRenderStrategy.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.describe;
+import static org.easymock.EasyMock.expect;
+
import java.net.URL;
import org.apache.hivemind.Location;
@@ -22,7 +24,6 @@
import org.apache.hivemind.util.URLResource;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.describe.LocationRenderStrategy}.
@@ -34,11 +35,9 @@
{
private Resource newResource(URL url)
{
- MockControl control = newControl(Resource.class);
- Resource resource = (Resource) control.getMock();
+ Resource resource = newMock(Resource.class);
- resource.getResourceURL();
- control.setReturnValue(url);
+ expect(resource.getResourceURL()).andReturn(url);
return resource;
}
@@ -85,19 +84,17 @@
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
- MockControl lc = newControl(Location.class);
- Location l = (Location) lc.getMock();
+ Location l = newLocation();
- l.getLineNumber();
- lc.setReturnValue(0);
+ expect(l.getLineNumber()).andReturn(0);
writer.print(l.toString());
- replayControls();
+ replay();
new LocationRenderStrategy().renderObject(l, writer, cycle);
- verifyControls();
+ verify();
}
public void testNoURL()
@@ -105,22 +102,17 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
Resource resource = newResource(null);
- MockControl lc = newControl(Location.class);
- Location l = (Location) lc.getMock();
-
- l.getLineNumber();
- lc.setReturnValue(99);
+ Location l = fabricateLocation(99);
- l.getResource();
- lc.setReturnValue(resource);
+ expect(l.getResource()).andReturn(resource);
writer.print(l.toString());
- replayControls();
+ replay();
new LocationRenderStrategy().renderObject(l, writer, cycle);
- verifyControls();
+ verify();
}
/**
@@ -137,11 +129,11 @@
train(writer, 2, 7, new String[]
{ "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine" });
- replayControls();
+ replay();
new LocationRenderStrategy().renderObject(l, writer, cycle);
- verifyControls();
+ verify();
}
/**
@@ -158,10 +150,10 @@
train(writer, 1, 3, new String[]
{ "Line One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight" });
- replayControls();
+ replay();
new LocationRenderStrategy().renderObject(l, writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/describe/TestRenderStrategy.java Tue Jun 27 11:21:31 2006
@@ -43,11 +43,11 @@
strategy.renderObject(object, writer, cycle);
- replayControls();
+ replay();
new RenderBridge(object, strategy).render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderableAdapterFactory()
@@ -60,7 +60,7 @@
strategy.renderObject(object, writer, cycle);
- replayControls();
+ replay();
RenderableAdapterFactoryImpl factory = new RenderableAdapterFactoryImpl();
factory.setStrategy(strategy);
@@ -69,7 +69,7 @@
renderable.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testDefaultRenderableAdapter()
@@ -82,13 +82,13 @@
describer.describeObject(object, writer);
- replayControls();
+ replay();
DefaultRenderStrategy strategy = new DefaultRenderStrategy();
strategy.setDescriber(describer);
strategy.renderObject(object, writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java Tue Jun 27 11:21:31 2006
@@ -17,6 +17,7 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import static org.testng.AssertJUnit.assertEquals;
import java.util.Map;
@@ -83,11 +84,11 @@
unreachable();
}
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertEquals(values[0], component.getValue());
}
@@ -113,11 +114,11 @@
trainIsRewinding(form, false);
trainIsRewinding(cycle, true);
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRender()
@@ -177,11 +178,11 @@
script.execute(eq(cycle), eq(prs), isA(Map.class));
- replayControls();
+ replay();
component.render(writer, cycle);
- verifyControls();
+ verify();
assertBuffer("<span class=\"prefix\"><select name=\"fred\" class=\"validation-delegate\"></select></span>");
}
@@ -199,11 +200,11 @@
{ "name", "fred", "model", model,
"filter", "l" });
- replayControls();
+ replay();
component.renderComponent(json, cycle);
- verifyControls();
+ verify();
assertEquals(json.length(), 2);
assertEquals(json.get("3"), "yellow");
@@ -219,10 +220,10 @@
expect(support.isRequired(field)).andReturn(true);
- replayControls();
+ replay();
assertEquals(true, field.isRequired());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ActionServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.engine;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
@@ -68,13 +71,13 @@
trainConstructLink(lf, as, false, parameters, true, link);
- replayControls();
+ replay();
ActionServiceParameter p = new ActionServiceParameter(component, "action-id");
assertSame(link, as.getLink(false, p));
- verifyControls();
+ verify();
}
public void testGetLinkSimplePost()
@@ -106,13 +109,13 @@
trainConstructLink(lf, as, true, parameters, true, link);
- replayControls();
+ replay();
ActionServiceParameter p = new ActionServiceParameter(component, "action-id");
assertSame(link, as.getLink(true, p));
- verifyControls();
+ verify();
}
public void testGetLinkComplex()
@@ -145,13 +148,13 @@
trainConstructLink(lf, as, false, parameters, true, link);
- replayControls();
+ replay();
ActionServiceParameter p = new ActionServiceParameter(component, "action-id");
assertSame(link, as.getLink(false, p));
- verifyControls();
+ verify();
}
public void testServiceSimple() throws Exception
@@ -177,14 +180,14 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
ActionService as = new ActionService();
as.setResponseRenderer(rr);
as.service(cycle);
- verifyControls();
+ verify();
}
private IAction newAction()
@@ -219,7 +222,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
ActionService as = new ActionService();
as.setResponseRenderer(rr);
@@ -227,7 +230,7 @@
as.service(cycle);
- verifyControls();
+ verify();
}
public void testServiceNotAction() throws Exception
@@ -253,7 +256,7 @@
trainGetLocation(component, l);
- replayControls();
+ replay();
ActionService as = new ActionService();
@@ -271,7 +274,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testServiceStaleSession() throws Exception
@@ -302,7 +305,7 @@
trainGetPageName(page, "ActivePage");
- replayControls();
+ replay();
ActionService as = new ActionService();
as.setRequest(request);
@@ -322,7 +325,7 @@
assertEquals("ActivePage", ex.getPageName());
}
- verifyControls();
+ verify();
}
public void testServiceComplex() throws Exception
@@ -351,14 +354,14 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
ActionService as = new ActionService();
as.setResponseRenderer(rr);
as.service(cycle);
- verifyControls();
+ verify();
}
protected void trainGetRequiresSession(IAction action, boolean requiresSession)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectEventServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,19 +14,20 @@
package org.apache.tapestry.engine;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IDirectEvent;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.IgnoreMatcher;
import org.apache.tapestry.StaleSessionException;
import org.apache.tapestry.event.BrowserEvent;
import org.apache.tapestry.services.LinkFactory;
@@ -79,11 +80,11 @@
trainConstructLink(lf, ds, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(false, new DirectEventServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testGetLinkOnSamePageForPost()
@@ -117,11 +118,11 @@
trainConstructLink(lf, ds, true, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(true, new DirectEventServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testGetLinkOnSamePageStateful()
@@ -155,11 +156,11 @@
trainConstructLink(lf, ds, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(false, new DirectEventServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testGetLinkOnDifferentPage()
@@ -193,11 +194,11 @@
trainConstructLink(lf, ds, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(false, new DirectEventServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testServiceSimple() throws Exception
@@ -223,20 +224,13 @@
trainExtractBrowserEvent(cycle);
- cycle.setListenerParameters(parameters);
-
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(cycle).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- {ignore }));
+ cycle.setListenerParameters(isA(Object[].class));
- d.triggerEvent(cycle, new BrowserEvent(null, null));
-
- getControl(d).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, ignore }));
+ d.triggerEvent(cycle, isA(BrowserEvent.class));
rr.renderResponse(cycle);
- replayControls();
+ replay();
DirectEventService ds = new DirectEventService();
ds.setLinkFactory(lf);
@@ -244,7 +238,7 @@
ds.service(cycle);
- verifyControls();
+ verify();
}
/**
@@ -278,20 +272,13 @@
trainExtractBrowserEvent(cycle);
- cycle.setListenerParameters(parameters);
-
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(cycle).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- {ignore }));
+ cycle.setListenerParameters(isA(Object[].class));
- d.triggerEvent(cycle, new BrowserEvent(null, null));
-
- getControl(d).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, ignore }));
+ d.triggerEvent(cycle, isA(BrowserEvent.class));
rr.renderResponse(cycle);
- replayControls();
+ replay();
DirectEventService ds = new DirectEventService();
ds.setLinkFactory(lf);
@@ -299,7 +286,7 @@
ds.service(cycle);
- verifyControls();
+ verify();
}
public void testServiceNotDirect() throws Exception
@@ -322,7 +309,7 @@
trainGetExtendedId(c, "ActivePage/fred.barney");
trainGetLocation(c, l);
- replayControls();
+ replay();
DirectEventService ds = new DirectEventService();
@@ -340,7 +327,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testSessionActiveAndRequired() throws Exception
@@ -370,20 +357,13 @@
trainExtractBrowserEvent(cycle);
- cycle.setListenerParameters(parameters);
-
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(cycle).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- {ignore }));
-
- d.triggerEvent(cycle, new BrowserEvent(null, null));
+ cycle.setListenerParameters(isA(Object[].class));
- getControl(d).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, ignore }));
+ d.triggerEvent(cycle, isA(BrowserEvent.class));
rr.renderResponse(cycle);
- replayControls();
+ replay();
DirectEventService ds = new DirectEventService();
ds.setLinkFactory(lf);
@@ -392,7 +372,7 @@
ds.service(cycle);
- verifyControls();
+ verify();
}
public void testStaleSession() throws Exception
@@ -419,7 +399,7 @@
trainGetLocation(page, l);
trainGetPageName(page, "ActivePage");
- replayControls();
+ replay();
DirectEventService ds = new DirectEventService();
ds.setRequest(request);
@@ -440,7 +420,7 @@
assertSame(page, ex.getPage());
}
- verifyControls();
+ verify();
}
public void testNoBrowserEvent() throws Exception
@@ -464,10 +444,9 @@
trainExtractListenerParameters(lf, cycle, parameters);
- cycle.getParameter(BrowserEvent.NAME);
- setReturnValue(cycle, null);
+ expect(cycle.getParameter(BrowserEvent.NAME)).andReturn(null);
- replayControls();
+ replay();
DirectEventService ds = new DirectEventService();
ds.setLinkFactory(lf);
@@ -480,7 +459,7 @@
assertExceptionSubstring(e, "no browser event was found");
}
- verifyControls();
+ verify();
}
protected void trainIsStateful(IDirectEvent direct, boolean isStateful)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.engine;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
@@ -75,11 +78,11 @@
trainConstructLink(lf, ds, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(false, new DirectServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testGetLinkOnSamePageForPost()
@@ -113,11 +116,11 @@
trainConstructLink(lf, ds, true, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(true, new DirectServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testGetLinkOnSamePageStateful()
@@ -151,11 +154,11 @@
trainConstructLink(lf, ds, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(false, new DirectServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testGetLinkOnDifferentPage()
@@ -189,11 +192,11 @@
trainConstructLink(lf, ds, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ds.getLink(false, new DirectServiceParameter(c, serviceParameters)));
- verifyControls();
+ verify();
}
public void testServiceSimple() throws Exception
@@ -223,7 +226,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
DirectService ds = new DirectService();
ds.setLinkFactory(lf);
@@ -231,7 +234,7 @@
ds.service(cycle);
- verifyControls();
+ verify();
}
/**
@@ -269,7 +272,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
DirectService ds = new DirectService();
ds.setLinkFactory(lf);
@@ -277,7 +280,7 @@
ds.service(cycle);
- verifyControls();
+ verify();
}
public void testServiceNotDirect() throws Exception
@@ -300,7 +303,7 @@
trainGetExtendedId(c, "ActivePage/fred.barney");
trainGetLocation(c, l);
- replayControls();
+ replay();
DirectService ds = new DirectService();
@@ -318,7 +321,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testSessionActiveAndRequired() throws Exception
@@ -352,7 +355,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
DirectService ds = new DirectService();
ds.setLinkFactory(lf);
@@ -361,7 +364,7 @@
ds.service(cycle);
- verifyControls();
+ verify();
}
protected void trainIsStateful(IDirect direct, boolean isStateful)
@@ -393,7 +396,7 @@
trainGetLocation(page, l);
trainGetPageName(page, "ActivePage");
- replayControls();
+ replay();
DirectService ds = new DirectService();
ds.setRequest(request);
@@ -414,6 +417,6 @@
assertSame(page, ex.getPage());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineServiceLinkTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.engine;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.HashMap;
import java.util.Map;
@@ -59,13 +61,13 @@
EngineServiceLink l = new EngineServiceLink(rc, "/context/servlet", ENCODING, _urlCodec,
request, buildParameters("myservice", null), true);
- replayControls();
+ replay();
assertEquals("/context/servlet?service=myservice;encoded", l.getURL());
- verifyControls();
+ verify();
- assertListsEqual(new String[]
+ assertEquals(new String[]
{ ServiceConstants.SERVICE, ServiceConstants.PARAMETER }, l.getParameterNames());
}
@@ -83,11 +85,11 @@
"/ctx/app?service=foo&sp=godzilla&sp=frodo",
"/ctx/app?service=foo&sp=godzilla&sp=frodo");
- replayControls();
+ replay();
assertEquals("/ctx/app?service=foo&sp=godzilla&sp=frodo", l.getURL());
- verifyControls();
+ verify();
}
/** @since 4.0 */
@@ -102,11 +104,11 @@
trainEncodeURL(rc, "/context/servlet", "/context/servlet;encoded");
- replayControls();
+ replay();
assertEquals("/context/servlet;encoded", l.getURL(null, false));
- verifyControls();
+ verify();
}
/** @since 4.0 */
@@ -121,11 +123,11 @@
trainEncodeURL(rc, "/context/servlet#anchor", "/context/servlet#anchor");
- replayControls();
+ replay();
assertEquals("/context/servlet#anchor", l.getURL("anchor", false));
- verifyControls();
+ verify();
}
public void testGetURLWithAnchorAndParameters() throws Exception
@@ -140,11 +142,11 @@
"/context/servlet?service=myservice#anchor",
"/context/servlet?service=myservice#anchor");
- replayControls();
+ replay();
assertEquals("/context/servlet?service=myservice#anchor", l.getURL("anchor", true));
- verifyControls();
+ verify();
}
public void testGetAbsoluteURL() throws Exception
@@ -165,11 +167,11 @@
"HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice",
"HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice");
- replayControls();
+ replay();
assertEquals("HTTP://TESTSERVER.COM:9187/ctx/app?service=myservice", l.getAbsoluteURL());
- verifyControls();
+ verify();
}
public void testGetAbsoluteURLWithOverrides() throws Exception
@@ -184,7 +186,7 @@
"https://myserver.net:9100/ctx/app?service=myservice",
"https://myserver.net:9100/ctx/app?service=myservice");
- replayControls();
+ replay();
assertEquals("https://myserver.net:9100/ctx/app?service=myservice", l.getAbsoluteURL(
"https",
@@ -193,7 +195,7 @@
null,
true));
- verifyControls();
+ verify();
}
public void testGetURLNotAbsolute()
@@ -209,7 +211,7 @@
"/ctx/app?service=myservice#myanchor",
"/ctx/app?service=myservice#myanchor");
- replayControls();
+ replay();
EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
buildParameters("myservice", null), false);
@@ -221,7 +223,7 @@
"myanchor",
true));
- verifyControls();
+ verify();
}
public void testGetURLAbsolute()
@@ -235,7 +237,7 @@
"https://override.net:8080/ctx/app?service=myservice#myanchor",
"https://override.net:8080/ctx/app?service=myservice#myanchor");
- replayControls();
+ replay();
EngineServiceLink l = new EngineServiceLink(rc, "/ctx/app", ENCODING, _urlCodec, request,
buildParameters("myservice", null), false);
@@ -247,6 +249,6 @@
"myanchor",
true));
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/EngineUtilsTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.engine;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.web.WebRequest;
/**
@@ -31,11 +33,11 @@
trainGetScheme(request, "http");
- replayControls();
+ replay();
assertEquals(true, EngineUtils.needAbsoluteURL("https", null, 0, request));
- verifyControls();
+ verify();
}
public void testNeedAbsoluteURLForServer()
@@ -44,11 +46,11 @@
trainGetServerName(request, "someserver.net");
- replayControls();
+ replay();
assertEquals(true, EngineUtils.needAbsoluteURL(null, "myserver.com", 0, request));
- verifyControls();
+ verify();
}
public void testNeedAbsoluteURLForServerPort()
@@ -57,22 +59,22 @@
trainGetServerPort(request, 80);
- replayControls();
+ replay();
assertEquals(true, EngineUtils.needAbsoluteURL(null, null, 8197, request));
- verifyControls();
+ verify();
}
public void testDontNeedAbsoluteURL()
{
WebRequest request = newRequest();
- replayControls();
+ replay();
assertEquals(false, EngineUtils.needAbsoluteURL(null, null, 0, request));
- verifyControls();
+ verify();
trainGetScheme(request, "http");
@@ -80,10 +82,10 @@
trainGetServerPort(request, 80);
- replayControls();
+ replay();
assertEquals(false, EngineUtils.needAbsoluteURL("http", "myserver.com", 80, request));
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ExternalServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.engine;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
@@ -49,13 +52,13 @@
trainConstructLink(lf, es, false, parameters, true, link);
- replayControls();
+ replay();
ExternalServiceParameter p = new ExternalServiceParameter("ActivePage", serviceParameters);
assertSame(link, es.getLink(false, p));
- verifyControls();
+ verify();
}
public void testService() throws Exception
@@ -79,7 +82,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
ExternalService es = new ExternalService();
es.setLinkFactory(lf);
@@ -87,7 +90,7 @@
es.service(cycle);
- verifyControls();
+ verify();
}
public void testServiceWrongType() throws Exception
@@ -104,7 +107,7 @@
trainGetPageName(page, "ActivePage");
trainGetLocation(page, l);
- replayControls();
+ replay();
ExternalService es = new ExternalService();
@@ -122,6 +125,6 @@
assertSame(page, ex.getComponent());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/PageServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.engine;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
@@ -41,11 +43,11 @@
trainConstructLink(lf, ps, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, ps.getLink(false, "TargetPage"));
- verifyControls();
+ verify();
}
public void testService() throws Exception
@@ -59,13 +61,13 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
PageService ps = new PageService();
ps.setResponseRenderer(rr);
ps.service(cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RequestCycleTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.engine;
-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.ErrorHandler;
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.IEngine;
@@ -93,7 +96,7 @@
infrastructure, newStrategySource(), newBuilder());
IEngine engine = newEngine();
- replayControls();
+ replay();
IRequestCycle cycle = new RequestCycle(engine, new QueryParameterMap(), "fred", env);
@@ -101,7 +104,7 @@
assertSame(service, cycle.getService());
assertSame(engine, cycle.getEngine());
- verifyControls();
+ verify();
}
private ServiceMap newServiceMap(String serviceName, IEngineService service)
@@ -121,21 +124,21 @@
infrastructure, source, newBuilder());
IEngine engine = newEngine();
- replayControls();
+ replay();
IRequestCycle cycle = new RequestCycle(engine, new QueryParameterMap(), null, env);
cycle.getEngine();
- verifyControls();
+ verify();
source.discardAllStoredChanged("MyPage");
- replayControls();
+ replay();
cycle.forgetPage("MyPage");
- verifyControls();
+ verify();
}
public void testSendRedirect()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ResetServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.engine;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
@@ -51,11 +54,11 @@
trainConstructLink(lf, s, false, parameters, true, link);
- replayControls();
+ replay();
assertSame(link, s.getLink(false, null));
- verifyControls();
+ verify();
}
public void testService() throws Exception
@@ -72,7 +75,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
ResetService rs = new ResetService();
rs.setEnabled(true);
@@ -81,7 +84,7 @@
rs.service(cycle);
- verifyControls();
+ verify();
}
public void testServiceNotEnabled() throws Exception
@@ -96,7 +99,7 @@
rr.renderResponse(cycle);
- replayControls();
+ replay();
ResetService rs = new ResetService();
rs.setEnabled(false);
@@ -105,7 +108,7 @@
rs.service(cycle);
- verifyControls();
+ verify();
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/RestartServiceTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.engine;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -42,7 +45,7 @@
response.sendRedirect("http://myserver/app");
- replayControls();
+ replay();
RestartService s = new RestartService();
s.setRequest(request);
@@ -51,13 +54,12 @@
s.service(cycle);
- verifyControls();
+ verify();
}
private void trainGetSession(HttpServletRequest request, boolean create, HttpSession session)
{
- request.getSession(create);
- setReturnValue(request, session);
+ expect(request.getSession(create)).andReturn(session);
}
private HttpServletResponse newServletResponse()
@@ -88,7 +90,7 @@
response.sendRedirect("http://myserver/app");
- replayControls();
+ replay();
RestartService s = new RestartService();
s.setRequest(request);
@@ -97,7 +99,7 @@
s.service(cycle);
- verifyControls();
+ verify();
}
private HttpSession newHttpSession()
@@ -120,7 +122,7 @@
trainGetSession(request, false, session);
session.invalidate();
- setThrowable(session, ex);
+ expectLastCall().andThrow(ex);
log.warn("Exception thrown invalidating HttpSession.", ex);
@@ -128,7 +130,7 @@
response.sendRedirect("http://myserver/app");
- replayControls();
+ replay();
RestartService s = new RestartService();
s.setRequest(request);
@@ -138,6 +140,6 @@
s.service(cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/ServiceTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,8 @@
package org.apache.tapestry.engine;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -25,7 +26,6 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.event.BrowserEvent;
import org.apache.tapestry.services.LinkFactory;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.web.WebRequest;
@@ -165,33 +165,6 @@
protected void trainGetAbsoluteURL(IRequestCycle cycle, String shortURL, String fullURL)
{
expect(cycle.getAbsoluteURL(shortURL)).andReturn(fullURL);
- }
-
- protected void trainExtractBrowserEvent(IRequestCycle cycle)
- {
- cycle.getParameter(BrowserEvent.NAME);
- setReturnValue(cycle, "onClick");
-
- cycle.getParameter(BrowserEvent.NAME);
- setReturnValue(cycle, "onClick");
-
- cycle.getParameter(BrowserEvent.TYPE);
- setReturnValue(cycle, "click");
- cycle.getParameters(BrowserEvent.KEYS);
- setReturnValue(cycle, null);
- cycle.getParameter(BrowserEvent.CHAR_CODE);
- setReturnValue(cycle, null);
- cycle.getParameter(BrowserEvent.PAGE_X);
- setReturnValue(cycle, "123");
- cycle.getParameter(BrowserEvent.PAGE_Y);
- setReturnValue(cycle, "1243");
- cycle.getParameter(BrowserEvent.LAYER_X);
- setReturnValue(cycle, null);
- cycle.getParameter(BrowserEvent.LAYER_Y);
- setReturnValue(cycle, null);
-
- cycle.getParameter(BrowserEvent.TARGET + "." + BrowserEvent.TARGET_ATTR_ID);
- setReturnValue(cycle, "element1");
}
protected Log newLog()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java Tue Jun 27 11:21:31 2006
@@ -14,19 +14,22 @@
package org.apache.tapestry.engine.encoders;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.asset.AssetService;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
+import com.javaforge.tapestry.testng.TestBase;
+
/**
* Tests for {@link org.apache.tapestry.engine.encoders.AssetEncoder}.
*
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class AssetEncoderTest extends HiveMindTestCase
+public class AssetEncoderTest extends TestBase
{
public void testWrongService()
{
@@ -34,17 +37,16 @@
trainGetParameterValue(encoding, ServiceConstants.SERVICE, "foo");
- replayControls();
+ replay();
new AssetEncoder().encode(encoding);
- verifyControls();
+ verify();
}
protected void trainGetParameterValue(ServiceEncoding encoding, String name, String value)
{
- encoding.getParameterValue(name);
- setReturnValue(encoding, value);
+ expect(encoding.getParameterValue(name)).andReturn(value);
}
protected ServiceEncoding newEncoding()
@@ -58,20 +60,19 @@
trainGetServletPath(encoding, "/Home.page");
- replayControls();
+ replay();
AssetEncoder encoder = new AssetEncoder();
encoder.setPath("/assets");
encoder.decode(encoding);
- verifyControls();
+ verify();
}
protected void trainGetServletPath(ServiceEncoding encoding, String servletPath)
{
- encoding.getServletPath();
- setReturnValue(encoding, servletPath);
+ expect(encoding.getServletPath()).andReturn(servletPath);
}
public void testEncode()
@@ -87,14 +88,14 @@
encoding.setParameterValue(AssetService.DIGEST, null);
encoding.setParameterValue(ServiceConstants.SERVICE, null);
- replayControls();
+ replay();
AssetEncoder encoder = new AssetEncoder();
encoder.setPath("/assets");
encoder.encode(encoding);
- verifyControls();
+ verify();
}
public void testDecode()
@@ -108,19 +109,18 @@
encoding.setParameterValue(AssetService.DIGEST, "12345");
encoding.setParameterValue(AssetService.PATH, "/foo/bar/Baz.gif");
- replayControls();
+ replay();
AssetEncoder encoder = new AssetEncoder();
encoder.setPath("/assets");
encoder.decode(encoding);
- verifyControls();
+ verify();
}
protected void trainGetPathInfo(ServiceEncoding encoding, String pathInfo)
{
- encoding.getPathInfo();
- setReturnValue(encoding, pathInfo);
+ expect(encoding.getPathInfo()).andReturn(pathInfo);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestDirectServiceEncoder.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,12 @@
package org.apache.tapestry.engine.encoders;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.engine.encoders.DirectServiceEncoder}.
@@ -26,68 +27,62 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestDirectServiceEncoder extends HiveMindTestCase
+public class TestDirectServiceEncoder extends BaseComponentTestCase
{
private ServiceEncoding newEncoding(String servletPath)
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding encoding = (ServiceEncoding) control.getMock();
+ ServiceEncoding encoding = newMock(ServiceEncoding.class);
- encoding.getServletPath();
- control.setReturnValue(servletPath);
+ expect(encoding.getServletPath()).andReturn(servletPath);
return encoding;
}
- private void train(MockControl control, ServiceEncoding encoding, String parameterName,
+ private void train(ServiceEncoding encoding, String parameterName,
String parameterValue)
{
- encoding.getParameterValue(parameterName);
- control.setReturnValue(parameterValue);
+ expect(encoding.getParameterValue(parameterName)).andReturn(parameterValue);
}
public void testEncodeWrongService()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding encoding = (ServiceEncoding) control.getMock();
+ ServiceEncoding encoding = newMock(ServiceEncoding.class);
- train(control, encoding, ServiceConstants.SERVICE, "foo");
+ train(encoding, ServiceConstants.SERVICE, "foo");
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.encode(encoding);
- verifyControls();
+ verify();
}
public void testEncodePageInNamespace()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding encoding = (ServiceEncoding) control.getMock();
+ ServiceEncoding encoding = newMock(ServiceEncoding.class);
- train(control, encoding, ServiceConstants.SERVICE, Tapestry.DIRECT_SERVICE);
- train(control, encoding, ServiceConstants.PAGE, "foo:Bar");
+ train(encoding, ServiceConstants.SERVICE, Tapestry.DIRECT_SERVICE);
+ train(encoding, ServiceConstants.PAGE, "foo:Bar");
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.encode(encoding);
- verifyControls();
+ verify();
}
public void testEncodeStateless()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding encoding = (ServiceEncoding) control.getMock();
+ ServiceEncoding encoding = newMock(ServiceEncoding.class);
- train(control, encoding, ServiceConstants.SERVICE, Tapestry.DIRECT_SERVICE);
- train(control, encoding, ServiceConstants.PAGE, "admin/Menu");
- train(control, encoding, ServiceConstants.SESSION, null);
- train(control, encoding, ServiceConstants.COMPONENT, "border.link");
+ train(encoding, ServiceConstants.SERVICE, Tapestry.DIRECT_SERVICE);
+ train(encoding, ServiceConstants.PAGE, "admin/Menu");
+ train(encoding, ServiceConstants.SESSION, null);
+ train(encoding, ServiceConstants.COMPONENT, "border.link");
encoding.setServletPath("/admin/Menu,border.link.direct");
encoding.setParameterValue(ServiceConstants.SERVICE, null);
@@ -95,25 +90,24 @@
encoding.setParameterValue(ServiceConstants.SESSION, null);
encoding.setParameterValue(ServiceConstants.COMPONENT, null);
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.setStatelessExtension("direct");
encoder.encode(encoding);
- verifyControls();
+ verify();
}
public void testEncodeStateful()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding encoding = (ServiceEncoding) control.getMock();
+ ServiceEncoding encoding = newMock(ServiceEncoding.class);
- train(control, encoding, ServiceConstants.SERVICE, Tapestry.DIRECT_SERVICE);
- train(control, encoding, ServiceConstants.PAGE, "admin/Menu");
- train(control, encoding, ServiceConstants.SESSION, "T");
- train(control, encoding, ServiceConstants.COMPONENT, "border.link");
+ train(encoding, ServiceConstants.SERVICE, Tapestry.DIRECT_SERVICE);
+ train(encoding, ServiceConstants.PAGE, "admin/Menu");
+ train(encoding, ServiceConstants.SESSION, "T");
+ train(encoding, ServiceConstants.COMPONENT, "border.link");
encoding.setServletPath("/admin/Menu,border.link.sdirect");
encoding.setParameterValue(ServiceConstants.SERVICE, null);
@@ -121,21 +115,21 @@
encoding.setParameterValue(ServiceConstants.SESSION, null);
encoding.setParameterValue(ServiceConstants.COMPONENT, null);
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.setStatefulExtension("sdirect");
encoder.encode(encoding);
- verifyControls();
+ verify();
}
public void testDecodeWrongExtension()
{
ServiceEncoding encoding = newEncoding("/foo.svc");
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.setStatelessExtension("direct");
@@ -143,7 +137,7 @@
encoder.decode(encoding);
- verifyControls();
+ verify();
}
public void testDecodeStateless()
@@ -155,7 +149,7 @@
encoding.setParameterValue(ServiceConstants.SESSION, null);
encoding.setParameterValue(ServiceConstants.COMPONENT, "border.link");
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.setStatelessExtension("direct");
@@ -163,7 +157,7 @@
encoder.decode(encoding);
- verifyControls();
+ verify();
}
public void testDecodeStateful()
@@ -175,7 +169,7 @@
encoding.setParameterValue(ServiceConstants.SESSION, "T");
encoding.setParameterValue(ServiceConstants.COMPONENT, "border.link");
- replayControls();
+ replay();
DirectServiceEncoder encoder = new DirectServiceEncoder();
encoder.setStatelessExtension("direct");
@@ -183,6 +177,6 @@
encoder.decode(encoding);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestPageServiceEncoder.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,11 @@
package org.apache.tapestry.engine.encoders;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.engine.encoders.PageServiceEncoder}.
@@ -25,42 +26,37 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestPageServiceEncoder extends HiveMindTestCase
+public class TestPageServiceEncoder extends BaseComponentTestCase
{
public void testEncodeOtherService()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getParameterValue(ServiceConstants.SERVICE);
- control.setReturnValue("foo");
+ expect(e.getParameterValue(ServiceConstants.SERVICE)).andReturn("foo");
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.setServiceName("page");
encoder.encode(e);
- verifyControls();
+ verify();
}
public void testEncode()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getParameterValue(ServiceConstants.SERVICE);
- control.setReturnValue("page");
+ expect(e.getParameterValue(ServiceConstants.SERVICE)).andReturn("page");
- e.getParameterValue(ServiceConstants.PAGE);
- control.setReturnValue("Home");
+ expect(e.getParameterValue(ServiceConstants.PAGE)).andReturn("Home");
e.setServletPath("/Home.html");
e.setParameterValue(ServiceConstants.SERVICE, null);
e.setParameterValue(ServiceConstants.PAGE, null);
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.setServiceName("page");
@@ -68,25 +64,22 @@
encoder.encode(e);
- verifyControls();
+ verify();
}
public void testEncodeHtm()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getParameterValue(ServiceConstants.SERVICE);
- control.setReturnValue("page");
+ expect(e.getParameterValue(ServiceConstants.SERVICE)).andReturn("page");
- e.getParameterValue(ServiceConstants.PAGE);
- control.setReturnValue("Home");
+ expect(e.getParameterValue(ServiceConstants.PAGE)).andReturn("Home");
e.setServletPath("/Home.htm");
e.setParameterValue(ServiceConstants.SERVICE, null);
e.setParameterValue(ServiceConstants.PAGE, null);
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.setServiceName("page");
@@ -94,93 +87,82 @@
encoder.encode(e);
- verifyControls();
+ verify();
}
public void testEncodeInNamespace()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
-
- e.getParameterValue(ServiceConstants.SERVICE);
- control.setReturnValue("page");
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getParameterValue(ServiceConstants.PAGE);
- control.setReturnValue("contrib:Foo");
+ expect(e.getParameterValue(ServiceConstants.SERVICE)).andReturn("page");
- replayControls();
+ expect(e.getParameterValue(ServiceConstants.PAGE)).andReturn("contrib:Foo");
+
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.setServiceName("page");
encoder.encode(e);
- verifyControls();
+ verify();
}
public void testDecodeNoExtension()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
-
- e.getServletPath();
- control.setReturnValue("/app");
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- replayControls();
+ expect(e.getServletPath()).andReturn("/app");
+
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.decode(e);
- verifyControls();
+ verify();
}
public void testDecodeEndsWithDot()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getServletPath();
- control.setReturnValue("/ends.with.dot.");
+ expect(e.getServletPath()).andReturn("/ends.with.dot.");
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.decode(e);
- verifyControls();
+ verify();
}
public void testDecodeWrongExtension()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getServletPath();
- control.setReturnValue("/Home.direct");
+ expect(e.getServletPath()).andReturn("/Home.direct");
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.decode(e);
- verifyControls();
+ verify();
}
public void testDecodeSuccess()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getServletPath();
- control.setReturnValue("/Home.html");
+ expect(e.getServletPath()).andReturn("/Home.html");
e.setParameterValue(ServiceConstants.SERVICE, "page");
e.setParameterValue(ServiceConstants.PAGE, "Home");
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.setExtension("html");
@@ -188,21 +170,19 @@
encoder.decode(e);
- verifyControls();
+ verify();
}
public void testDecodeHtmSuccess()
{
- MockControl control = newControl(ServiceEncoding.class);
- ServiceEncoding e = (ServiceEncoding) control.getMock();
+ ServiceEncoding e = newMock(ServiceEncoding.class);
- e.getServletPath();
- control.setReturnValue("/Home.htm");
+ expect(e.getServletPath()).andReturn("/Home.htm");
e.setParameterValue(ServiceConstants.SERVICE, "page");
e.setParameterValue(ServiceConstants.PAGE, "Home");
- replayControls();
+ replay();
PageServiceEncoder encoder = new PageServiceEncoder();
encoder.setExtension("htm");
@@ -210,6 +190,6 @@
encoder.decode(e);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/encoders/TestServiceExtensionEncoder.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,11 @@
package org.apache.tapestry.engine.encoders;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.services.ServiceConstants;
-import org.easymock.MockControl;
/**
* Tests {@link org.apache.tapestry.engine.encoders.ServiceExtensionEncoder}.
@@ -25,64 +26,58 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestServiceExtensionEncoder extends HiveMindTestCase
+public class TestServiceExtensionEncoder extends BaseComponentTestCase
{
public void testEncode()
{
- MockControl c = newControl(ServiceEncoding.class);
- ServiceEncoding sec = (ServiceEncoding) c.getMock();
+ ServiceEncoding sec = newMock(ServiceEncoding.class);
- sec.getParameterValue(ServiceConstants.SERVICE);
- c.setReturnValue("heavy");
+ expect(sec.getParameterValue(ServiceConstants.SERVICE)).andReturn("heavy");
sec.setServletPath("/heavy.svc");
sec.setParameterValue(ServiceConstants.SERVICE, null);
- replayControls();
+ replay();
ServiceExtensionEncoder e = new ServiceExtensionEncoder();
e.setExtension("svc");
e.encode(sec);
- verifyControls();
+ verify();
}
public void testDecodeWrongExtension()
{
- MockControl c = newControl(ServiceEncoding.class);
- ServiceEncoding sec = (ServiceEncoding) c.getMock();
+ ServiceEncoding sec = newMock(ServiceEncoding.class);
- sec.getServletPath();
- c.setReturnValue("/foo/bar/baz.direct");
+ expect(sec.getServletPath()).andReturn("/foo/bar/baz.direct");
- replayControls();
+ replay();
ServiceExtensionEncoder e = new ServiceExtensionEncoder();
e.setExtension("svc");
e.decode(sec);
- verifyControls();
+ verify();
}
public void testDecode()
{
- MockControl c = newControl(ServiceEncoding.class);
- ServiceEncoding sec = (ServiceEncoding) c.getMock();
+ ServiceEncoding sec = newMock(ServiceEncoding.class);
- sec.getServletPath();
- c.setReturnValue("/hitter.svc");
+ expect(sec.getServletPath()).andReturn("/hitter.svc");
sec.setParameterValue(ServiceConstants.SERVICE, "hitter");
- replayControls();
+ replay();
ServiceExtensionEncoder e = new ServiceExtensionEncoder();
e.setExtension("svc");
e.decode(sec);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestApplicationStateManager.java Tue Jun 27 11:21:31 2006
@@ -14,8 +14,11 @@
package org.apache.tapestry.engine.state;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.engine.state.ApplicationStateManagerImpl}.
@@ -23,17 +26,14 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestApplicationStateManager extends HiveMindTestCase
+public class TestApplicationStateManager extends BaseComponentTestCase
{
private StateObjectManagerRegistry newRegistry(String name,
StateObjectManager manager)
{
- MockControl c = newControl(StateObjectManagerRegistry.class);
- StateObjectManagerRegistry result = (StateObjectManagerRegistry) c
- .getMock();
+ StateObjectManagerRegistry result = newMock(StateObjectManagerRegistry.class);
- result.get(name);
- c.setReturnValue(manager);
+ expect(result.get(name)).andReturn(manager);
return result;
}
@@ -41,16 +41,14 @@
public void testExistsInCache()
{
Object stateObject = new Object();
+
+ StateObjectManager m = newMock(StateObjectManager.class);
- MockControl c = newControl(StateObjectManager.class);
- StateObjectManager m = (StateObjectManager) c.getMock();
-
- m.get();
- c.setReturnValue(stateObject);
+ expect(m.get()).andReturn(stateObject);
StateObjectManagerRegistry r = newRegistry("fred", m);
- replayControls();
+ replay();
ApplicationStateManagerImpl asm = new ApplicationStateManagerImpl();
asm.setRegistry(r);
@@ -59,71 +57,62 @@
assertEquals(true, asm.exists("fred"));
- verifyControls();
+ verify();
}
public void testNotExist()
{
- MockControl c = newControl(StateObjectManager.class);
- StateObjectManager m = (StateObjectManager) c.getMock();
+ StateObjectManager m = newMock(StateObjectManager.class);
- m.exists();
- c.setReturnValue(false);
+ expect(m.exists()).andReturn(false);
StateObjectManagerRegistry r = newRegistry("barney", m);
- replayControls();
+ replay();
ApplicationStateManagerImpl asm = new ApplicationStateManagerImpl();
asm.setRegistry(r);
assertEquals(false, asm.exists("barney"));
- verifyControls();
+ verify();
}
public void testGet()
{
Object stateObject = new Object();
- MockControl c = newControl(StateObjectManager.class);
- StateObjectManager m = (StateObjectManager) c.getMock();
-
- m.get();
- c.setReturnValue(stateObject);
+ StateObjectManager m = newMock(StateObjectManager.class);
- MockControl rc = newControl(StateObjectManagerRegistry.class);
- StateObjectManagerRegistry r = (StateObjectManagerRegistry) rc
- .getMock();
+ expect(m.get()).andReturn(stateObject);
+
+ StateObjectManagerRegistry r = newMock(StateObjectManagerRegistry.class);
- r.get("barney");
- rc.setReturnValue(m);
+ expect(r.get("barney")).andReturn(m);
- replayControls();
+ replay();
ApplicationStateManagerImpl asm = new ApplicationStateManagerImpl();
asm.setRegistry(r);
assertSame(stateObject, asm.get("barney"));
- verifyControls();
+ verify();
- replayControls();
+ replay();
// Note: doesn't affect the SOPM
assertSame(stateObject, asm.get("barney"));
- verifyControls();
+ verify();
- r.get("barney");
- rc.setReturnValue(m);
+ expect(r.get("barney")).andReturn(m);
- m.get();
- c.setReturnValue(stateObject);
+ expect(m.get()).andReturn(stateObject);
- replayControls();
+ replay();
// Clear the cache
asm.passivateService();
@@ -131,44 +120,38 @@
// This invoked on the SOPM
assertSame(stateObject, asm.get("barney"));
- verifyControls();
+ verify();
}
public void testFlush()
{
Object stateObject = new Object();
- MockControl c = newControl(StateObjectManager.class);
- StateObjectManager m = (StateObjectManager) c.getMock();
+ StateObjectManager m = newMock(StateObjectManager.class);
- m.get();
- c.setReturnValue(stateObject);
+ expect(m.get()).andReturn(stateObject);
- MockControl rc = newControl(StateObjectManagerRegistry.class);
- StateObjectManagerRegistry r = (StateObjectManagerRegistry) rc
- .getMock();
+ StateObjectManagerRegistry r = newMock(StateObjectManagerRegistry.class);
- r.get("barney");
- rc.setReturnValue(m);
+ expect(r.get("barney")).andReturn(m);
- replayControls();
+ replay();
ApplicationStateManagerImpl asm = new ApplicationStateManagerImpl();
asm.setRegistry(r);
assertSame(stateObject, asm.get("barney"));
- verifyControls();
+ verify();
- r.get("barney");
- rc.setReturnValue(m);
+ expect(r.get("barney")).andReturn(m);
m.store(stateObject);
- replayControls();
+ replay();
asm.flush();
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/state/TestSOMRegistry.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.engine.state;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -21,8 +25,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.HiveMindTestCase;
-import org.easymock.MockControl;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests {@link TestSOMRegistry}.
@@ -30,18 +33,17 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestSOMRegistry extends HiveMindTestCase
+public class TestSOMRegistry extends BaseComponentTestCase
{
public void testInitializeAndGet()
{
Object stateObject = new Object();
- MockControl pmc = newControl(StateObjectPersistenceManager.class);
- StateObjectPersistenceManager pm = (StateObjectPersistenceManager) pmc.getMock();
+
+ StateObjectPersistenceManager pm = newMock(StateObjectPersistenceManager.class);
- StateObjectFactory f = (StateObjectFactory) newMock(StateObjectFactory.class);
+ StateObjectFactory f = newMock(StateObjectFactory.class);
- pm.get("fred", f);
- pmc.setReturnValue(stateObject);
+ expect(pm.get("fred", f)).andReturn(stateObject);
StateObjectContribution c = new StateObjectContribution();
c.setName("fred");
@@ -54,7 +56,7 @@
Map persistenceManagers = new HashMap();
persistenceManagers.put("wierd", pm);
- replayControls();
+ replay();
SOMRegistryImpl r = new SOMRegistryImpl();
r.setApplicationContributions(applicationContributions);
@@ -66,7 +68,7 @@
assertSame(stateObject, som.get());
- verifyControls();
+ verify();
}
public void testInitializeUnknownScope()
@@ -84,7 +86,7 @@
log.error(StateMessages.unknownScope("fred", "wierd"), l, null);
- replayControls();
+ replay();
SOMRegistryImpl r = new SOMRegistryImpl();
r.setApplicationContributions(applicationContributions);
@@ -93,7 +95,7 @@
r.setErrorLog(log);
r.initializeService();
- verifyControls();
+ verify();
}
public void testGetUnknownObjectName()