You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/18 00:46:24 UTC
svn commit: r415077 [2/2] - in /tapestry/tapestry4/trunk/framework: ./
src/java/org/apache/tapestry/components/ src/scripts/
src/test/org/apache/tapestry/ src/test/org/apache/tapestry/binding/
src/test/org/apache/tapestry/components/ src/test/org/apach...
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java Sat Jun 17 15:46:22 2006
@@ -14,11 +14,12 @@
package org.apache.tapestry.form.validator;
+import static org.easymock.EasyMock.*;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.form.FormComponentContributorContext;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.ValidationMessages;
-import org.easymock.MockControl;
/**
* Base class for writing {@link org.apache.tapestry.form.validator.Validator} tests.
@@ -30,27 +31,20 @@
{
protected IFormComponent newField(String displayName)
{
- MockControl control = newControl(IFormComponent.class);
- IFormComponent field = (IFormComponent) control.getMock();
-
- field.getDisplayName();
- control.setReturnValue(displayName);
-
+ IFormComponent field = (IFormComponent)newMock(IFormComponent.class);
+
+ expect(field.getDisplayName()).andReturn(displayName);
+
return field;
}
protected IFormComponent newField(String displayName, String clientId)
{
- MockControl control = MockControl.createNiceControl(IFormComponent.class);
- addControl(control);
+ IFormComponent field = (IFormComponent)newMock(IFormComponent.class);
+ checkOrder(field, false);
- IFormComponent field = (IFormComponent) control.getMock();
-
- field.getClientId();
- control.setReturnValue(clientId);
-
- field.getDisplayName();
- control.setReturnValue(displayName);
+ expect(field.getClientId()).andReturn(clientId).anyTimes();
+ expect(field.getDisplayName()).andReturn(displayName);
return field;
}
@@ -68,20 +62,18 @@
protected ValidationMessages newMessages(String messageOverride, String messageKey,
Object[] parameters, String result)
{
- MockControl control = newControl(ValidationMessages.class);
- ValidationMessages messages = (ValidationMessages) control.getMock();
-
- trainFormatMessage(control, messages, messageOverride, messageKey, parameters, result);
+ ValidationMessages messages = (ValidationMessages)newMock(ValidationMessages.class);
+
+ trainFormatMessage(messages, messageOverride, messageKey, parameters, result);
return messages;
}
- protected void trainFormatMessage(MockControl control, ValidationMessages messages,
+ protected void trainFormatMessage(ValidationMessages messages,
String messageOverride, String messageKey, Object[] parameters, String result)
{
- messages.formatValidationMessage(messageOverride, messageKey, parameters);
- control.setMatcher(MockControl.ARRAY_MATCHER);
- control.setReturnValue(result);
+ expect(messages.formatValidationMessage(eq(messageOverride), eq(messageKey), aryEq(parameters)))
+ .andReturn(result);
}
protected FormComponentContributorContext newContext()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestEmail.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestEmail.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestEmail.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestEmail.java Sat Jun 17 15:46:22 2006
@@ -23,7 +23,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.Email}.
@@ -103,16 +102,15 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/RegExValidator.js");
IFormComponent field = newField("Fred", "myfield");
- trainFormatMessage(contextc, context, null, ValidationStrings.INVALID_EMAIL, new Object[]
+ trainFormatMessage(context, null, ValidationStrings.INVALID_EMAIL, new Object[]
{ "Fred" }, "default\\message");
context.addSubmitHandler("function(event) { Tapestry.validate_regex(event, 'myfield', '"
@@ -132,17 +130,14 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/RegExValidator.js");
IFormComponent field = newField("Fred", "barney");
trainFormatMessage(
- contextc,
context,
"custom",
ValidationStrings.INVALID_EMAIL,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMax.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMax.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMax.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMax.java Sat Jun 17 15:46:22 2006
@@ -22,7 +22,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.Max}.
@@ -98,17 +97,16 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "myfield");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/NumberValidator.js");
-
- trainFormatMessage(contextc, context, null, ValidationStrings.VALUE_TOO_LARGE, new Object[]
+
+ trainFormatMessage(context, null, ValidationStrings.VALUE_TOO_LARGE, new Object[]
{ "My Field", new Double(20) }, "default message");
- context
- .addSubmitHandler("function(event) { Tapestry.validate_max_number(event, 'myfield', 20.0, 'default message'); }");
+ context.addSubmitHandler("function(event) { Tapestry.validate_max_number(event, 'myfield', 20.0, 'default message'); }");
replayControls();
@@ -122,23 +120,21 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "myfield");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/NumberValidator.js");
trainFormatMessage(
- contextc,
context,
"custom",
ValidationStrings.VALUE_TOO_LARGE,
new Object[]
{ "My Field", new Double(20) },
"custom\\message");
-
- context
- .addSubmitHandler("function(event) { Tapestry.validate_max_number(event, 'myfield', 20.0, 'custom\\\\message'); }");
+
+ context.addSubmitHandler("function(event) { Tapestry.validate_max_number(event, 'myfield', 20.0, 'custom\\\\message'); }");
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxLength.java Sat Jun 17 15:46:22 2006
@@ -22,7 +22,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
public class TestMaxLength extends BaseValidatorTestCase
{
@@ -96,13 +95,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "myfield");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/StringValidator.js");
- trainFormatMessage(contextc, context, null, ValidationStrings.VALUE_TOO_LONG, new Object[]
+ trainFormatMessage(context, null, ValidationStrings.VALUE_TOO_LONG, new Object[]
{ new Integer(20), "My Field" }, "default\\message");
context
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMin.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMin.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMin.java Sat Jun 17 15:46:22 2006
@@ -22,7 +22,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.Min}.
@@ -97,20 +96,20 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "myfield");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
-
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
+
context.includeClasspathScript("/org/apache/tapestry/form/validator/NumberValidator.js");
-
- trainFormatMessage(contextc, context, null, ValidationStrings.VALUE_TOO_SMALL, new Object[]
+
+ trainFormatMessage(context, null, ValidationStrings.VALUE_TOO_SMALL, new Object[]
{ "My Field", new Double(20) }, "default message");
-
+
context
.addSubmitHandler("function(event) { Tapestry.validate_min_number(event, 'myfield', 20.0, 'default message'); }");
-
+
replayControls();
-
+
new Min("min=20").renderContribution(writer, cycle, context, field);
verifyControls();
@@ -121,14 +120,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "myfield");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/NumberValidator.js");
trainFormatMessage(
- contextc,
context,
"custom",
ValidationStrings.VALUE_TOO_SMALL,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinLength.java Sat Jun 17 15:46:22 2006
@@ -22,7 +22,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.MinLength}.
@@ -97,13 +96,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "myfield");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/StringValidator.js");
- trainFormatMessage(contextc, context, null, ValidationStrings.VALUE_TOO_SHORT, new Object[]
+ trainFormatMessage(context, null, ValidationStrings.VALUE_TOO_SHORT, new Object[]
{ new Integer(20), "My Field" }, "default message");
context
@@ -121,14 +120,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
IFormComponent field = newField("My Field", "customField");
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/StringValidator.js");
trainFormatMessage(
- contextc,
context,
"custom",
ValidationStrings.VALUE_TOO_SHORT,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestPattern.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestPattern.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestPattern.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestPattern.java Sat Jun 17 15:46:22 2006
@@ -23,7 +23,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.Pattern}
@@ -104,16 +103,14 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/RegExValidator.js");
IFormComponent field = newField("Fred", "myfield");
- trainFormatMessage(contextc, context, null, ValidationStrings.REGEX_MISMATCH, new Object[]
+ trainFormatMessage(context, null, ValidationStrings.REGEX_MISMATCH, new Object[]
{ "Fred" }, "default message");
context
@@ -133,17 +130,14 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
context.includeClasspathScript("/org/apache/tapestry/form/validator/RegExValidator.js");
IFormComponent field = newField("Fred", "myfield");
trainFormatMessage(
- contextc,
context,
"custom",
ValidationStrings.REGEX_MISMATCH,
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestRequired.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestRequired.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestRequired.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestRequired.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.easymock.EasyMock.expect;
+
import java.util.Collections;
import org.apache.tapestry.IMarkupWriter;
@@ -21,11 +23,11 @@
import org.apache.tapestry.form.FormComponentContributorContext;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.ValidationMessages;
+import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.valid.ValidationConstants;
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.Required}.
@@ -153,33 +155,31 @@
verifyControls();
}
+ // TODO: Need to validate JSON object contributions!
public void testRenderContribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
-
+
+ FormComponentContributorContext context =
+ (FormComponentContributorContext)newMock(FormComponentContributorContext.class);
+
IFormComponent field = newField("Fred", "fred");
-
+
context.registerForFocus(ValidationConstants.REQUIRED_FIELD);
-
+
+ expect(context.getProfile()).andReturn(new JSONObject());
+
trainFormatMessage(
- contextc,
context,
null,
ValidationStrings.REQUIRED_FIELD,
new Object[]
{ "Fred" },
"Default\\Message for Fred.");
-
- context
- .addSubmitHandler("function(event) { Tapestry.require_field(event, 'fred', 'Default\\\\Message for Fred.'); }");
-
+
replayControls();
-
+
new Required().renderContribution(writer, cycle, context, field);
verifyControls();
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.link;
+import static org.easymock.EasyMock.*;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
@@ -193,14 +194,12 @@
protected void trainGetScheme(ILinkComponent component, String scheme)
{
- component.getScheme();
- setReturnValue(component, scheme);
+ expect(component.getScheme()).andReturn(scheme);
}
protected void trainGetPort(ILinkComponent component, Integer port)
{
- component.getPort();
- setReturnValue(component, port);
+ expect(component.getPort()).andReturn(port);
}
public void testStandardWithSchemaAnchorAndTarget()
@@ -458,19 +457,16 @@
protected void trainGetAnchor(ILinkComponent component, String anchor)
{
- component.getAnchor();
- setReturnValue(component, anchor);
+ expect(component.getAnchor()).andReturn(anchor);
}
protected void trainGetTarget(ILinkComponent component, String target)
{
- component.getTarget();
- setReturnValue(component, target);
+ expect(component.getTarget()).andReturn(target);
}
protected void trainIsDisabled(ILinkComponent component, boolean isDisabled)
{
- component.isDisabled();
- setReturnValue(component, isDisabled);
+ expect(component.isDisabled()).andReturn(isDisabled);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,7 @@
package org.apache.tapestry.record;
+import static org.easymock.EasyMock.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -188,45 +189,38 @@
private void trainDecodePageChanges(PersistentPropertyDataEncoder encoder, String encoded,
List changes)
{
- encoder.decodePageChanges(encoded);
- setReturnValue(encoder, changes);
+ expect(encoder.decodePageChanges(encoded)).andReturn(changes);
}
private void trainExtractPageName(ClientPropertyPersistenceScope scope, String parameterName,
String pageName)
{
- scope.extractPageName(parameterName);
- setReturnValue(scope, pageName);
+ expect(scope.extractPageName(parameterName)).andReturn(pageName);
}
private void trainGetPage(IRequestCycle cycle, IPage page)
{
- cycle.getPage();
- setReturnValue(cycle, page);
+ expect(cycle.getPage()).andReturn(page);
}
private void trainGetPageName(IPage page, String pageName)
{
- page.getPageName();
- setReturnValue(page, pageName);
+ expect(page.getPageName()).andReturn(pageName);
}
private void trainGetParameterNames(WebRequest request, String[] names)
{
- request.getParameterNames();
- setReturnValue(request, Arrays.asList(names));
+ expect(request.getParameterNames()).andReturn(Arrays.asList(names));
}
private void trainGetParameterValue(WebRequest request, String parameterName, String value)
{
- request.getParameterValue(parameterName);
- setReturnValue(request, value);
+ expect(request.getParameterValue(parameterName)).andReturn(value);
}
private void trainIsParameterForScope(ClientPropertyPersistenceScope scope,
String parameterName, boolean result)
{
- scope.isParameterForScope(parameterName);
- setReturnValue(scope, result);
+ expect(scope.isParameterForScope(parameterName)).andReturn(result);
}
}
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=415077&r1=415076&r2=415077&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 Sat Jun 17 15:46:22 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.resolver;
+import static org.easymock.EasyMock.expect;
+
import java.net.URL;
import org.apache.commons.logging.Log;
@@ -24,7 +26,6 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.ISpecificationSource;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.easymock.MockControl;
/**
* Base class for testing specification resolvers.
@@ -52,11 +53,9 @@
protected Resource newResource(URL url)
{
- MockControl control = newControl(Resource.class);
- Resource resource = (Resource) control.getMock();
+ Resource resource = (Resource)newMock(Resource.class);
- resource.getResourceURL();
- control.setReturnValue(url);
+ expect(resource.getResourceURL()).andReturn(url);
return resource;
}
@@ -68,8 +67,7 @@
protected void train(Log log, String message)
{
- log.isDebugEnabled();
- setReturnValue(log, true);
+ expect(log.isDebugEnabled()).andReturn(true);
log.debug(message);
}
@@ -91,62 +89,52 @@
protected void trainContainsPage(INamespace namespace, String pageName, boolean containsPage)
{
- namespace.containsPage(pageName);
- setReturnValue(namespace, containsPage);
+ expect(namespace.containsPage(pageName)).andReturn(containsPage);
}
protected void trainFindPageSpecification(ISpecificationResolverDelegate delegate, IRequestCycle cycle, INamespace application, String pageName, IComponentSpecification spec)
{
- delegate.findPageSpecification(cycle, application, pageName);
- setReturnValue(delegate, spec);
+ expect(delegate.findPageSpecification(cycle, application, pageName)).andReturn(spec);
}
protected void trainGetApplicationNamespace(ISpecificationSource source, INamespace application)
{
- source.getApplicationNamespace();
- setReturnValue(source, application);
+ expect(source.getApplicationNamespace()).andReturn(application);
}
protected void trainGetChildNamespace(INamespace child, String name, INamespace application)
{
- application.getChildNamespace(name);
- setReturnValue(application, child);
+ expect(application.getChildNamespace(name)).andReturn(child);
}
protected void trainGetFrameworkNamespace(ISpecificationSource source, INamespace framework)
{
- source.getFrameworkNamespace();
- setReturnValue(source, framework);
+ expect(source.getFrameworkNamespace()).andReturn(framework);
}
protected void trainGetNamespaceId(INamespace namespace, String namespaceId)
{
- namespace.getNamespaceId();
- setReturnValue(namespace, namespaceId);
+ expect(namespace.getNamespaceId()).andReturn(namespaceId);
}
protected void trainGetSpecificationLocation(INamespace namespace, Resource resource)
{
- namespace.getSpecificationLocation();
- setReturnValue(namespace, resource);
+ expect(namespace.getSpecificationLocation()).andReturn(resource);
}
protected void trainGetSpecificationLocation(INamespace namespace, Resource root, String path)
{
- namespace.getSpecificationLocation();
- setReturnValue(namespace, root.getRelativeResource(path));
+ expect(namespace.getSpecificationLocation()).andReturn(root.getRelativeResource(path));
}
protected void trainIsApplicationNamespace(INamespace namespace, boolean isApplicationNamespace)
{
- namespace.isApplicationNamespace();
- setReturnValue(namespace, isApplicationNamespace);
+ expect(namespace.isApplicationNamespace()).andReturn(isApplicationNamespace);
}
protected void trainIsDebugEnabled(Log log, boolean isDebugEnabled)
{
- log.isDebugEnabled();
- setReturnValue(log, isDebugEnabled);
+ expect(log.isDebugEnabled()).andReturn(isDebugEnabled);
}
}
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=415077&r1=415076&r2=415077&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 Sat Jun 17 15:46:22 2006
@@ -13,23 +13,24 @@
// limitations under the License.
package org.apache.tapestry.services.impl;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.hivemind.ClassResolver;
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.DefaultClassResolver;
-import org.apache.hivemind.test.AggregateArgumentsMatcher;
-import org.apache.hivemind.test.ArgumentMatcher;
import org.apache.hivemind.util.ClasspathResource;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IDirectEvent;
import org.apache.tapestry.IForm;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.IScript;
-import org.apache.tapestry.IgnoreMatcher;
import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.TapestryUtils;
import org.apache.tapestry.dojo.IWidget;
@@ -90,35 +91,20 @@
invoker.addEventListener("comp1", new String[] {"onclick"},
"testMethod", null, false);
- cycle.isRewinding();
- setReturnValue(cycle, false);
-
- component.getId();
- setReturnValue(component, "comp1");
-
- component.getId();
- setReturnValue(component, "comp1");
+ expect(cycle.isRewinding()).andReturn(false);
- component.getClientId();
- setReturnValue(component, "comp1");
+ expect(component.getId()).andReturn("comp1").anyTimes();
+ expect(component.getClientId()).andReturn("comp1").anyTimes();
trainGetLinkCheckIgnoreParameter(engine, cycle, false, new Object(), link);
trainGetURL(link, "/some/url");
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
-
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
-
- scriptSource.getScript(compScriptResource);
- setReturnValue(scriptSource, script);
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE))
+ .andReturn(prs).anyTimes();
- script.execute(cycle, prs, new HashMap());
+ expect(scriptSource.getScript(compScriptResource)).andReturn(script);
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(script).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, null, ignore }));
+ script.execute(eq(cycle), eq(prs), isA(Map.class));
replayControls();
@@ -137,34 +123,20 @@
assertTrue(invoker.hasEvents("wid1"));
- cycle.isRewinding();
- setReturnValue(cycle, false);
+ expect(cycle.isRewinding()).andReturn(false);
- widget.getId();
- setReturnValue(widget, "wid1");
-
- widget.getId();
- setReturnValue(widget, "wid1");
-
- widget.getClientId();
- setReturnValue(widget, "wid1");
+ expect(widget.getId()).andReturn("wid1").anyTimes();
+ expect(widget.getClientId()).andReturn("wid1").anyTimes();
trainGetLinkCheckIgnoreParameter(engine, cycle, false, new Object(), link);
trainGetURL(link, "/some/url2");
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
-
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
-
- scriptSource.getScript(widScriptResource);
- setReturnValue(scriptSource, script);
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE))
+ .andReturn(prs).anyTimes();
- script.execute(cycle, prs, new HashMap());
+ expect(scriptSource.getScript(widScriptResource)).andReturn(script);
- getControl(script).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, null, ignore }));
+ script.execute(eq(cycle), eq(prs), isA(Map.class));
replayControls();
@@ -179,8 +151,7 @@
ComponentEventConnectionWorker worker = new ComponentEventConnectionWorker();
- cycle.isRewinding();
- setReturnValue(cycle, true);
+ expect(cycle.isRewinding()).andReturn(true);
replayControls();
@@ -195,11 +166,9 @@
ComponentEventConnectionWorker worker = new ComponentEventConnectionWorker();
- cycle.isRewinding();
- setReturnValue(cycle, false);
+ expect(cycle.isRewinding()).andReturn(false);
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, null);
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE)).andReturn(null);
replayControls();
@@ -225,23 +194,14 @@
invoker.addEventListener("comp1", new String[] {"onclick"},
"testMethod", "form1", false);
- cycle.isRewinding();
- setReturnValue(cycle, false);
+ expect(cycle.isRewinding()).andReturn(false);
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE)).andReturn(prs);
- component.getId();
- setReturnValue(component, "comp1");
+ expect(component.getId()).andReturn("comp1").anyTimes();
+ expect(component.getClientId()).andReturn("comp1").anyTimes();
- cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1");
- setReturnValue(cycle, null);
-
- component.getId();
- setReturnValue(component, "comp1");
-
- component.getClientId();
- setReturnValue(component, "comp1");
+ expect(cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1")).andReturn(null);
replayControls();
@@ -300,23 +260,14 @@
invoker.addEventListener("comp1", new String[] {"onclick"},
"testMethod", "form1", false);
- cycle.isRewinding();
- setReturnValue(cycle, false);
-
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
+ expect(cycle.isRewinding()).andReturn(false);
- component.getId();
- setReturnValue(component, "comp1");
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE)).andReturn(prs);
- component.getId();
- setReturnValue(component, "comp1");
+ expect(component.getId()).andReturn("comp1").anyTimes();
+ expect(component.getClientId()).andReturn("comp1").anyTimes();
- component.getClientId();
- setReturnValue(component, "comp1");
-
- cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1");
- setReturnValue(cycle, null);
+ expect(cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1")).andReturn(null);
replayControls();
@@ -328,55 +279,36 @@
resetControls();
- cycle.isRewinding();
- setReturnValue(cycle, false);
+ checkOrder(form, false);
+ checkOrder(component, false);
+
+ expect(cycle.isRewinding()).andReturn(false);
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE)).andReturn(prs);
- form.getId();
- setReturnValue(form, "form1");
+ expect(form.getId()).andReturn("form1").anyTimes();
- cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1");
- setReturnValue(cycle, null);
-
- form.getId();
- setReturnValue(form, "form1");
-
- cycle.setAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1", new ArrayList());
- ArgumentMatcher ignore = new IgnoreMatcher();
- getControl(cycle)
- .setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]{ null, ignore }));
-
- form.getId();
- setReturnValue(form, "form1");
-
- form.getName();
- setReturnValue(form, "form1_0");
-
- form.getId();
- setReturnValue(form, "form1");
- component.getId();
- setReturnValue(component, "comp1");
- form.getId();
- setReturnValue(form, "form1");
- form.getId();
- setReturnValue(form, "form1");
+ expect(cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1")).andReturn(null);
+
+ cycle.setAttribute(eq(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1"),
+ isA(List.class));
+
+ expect(form.getName()).andReturn("form1_0").anyTimes();
+
+ expect(component.getId()).andReturn("comp1").anyTimes();
List formNames = new ArrayList();
formNames.add("form1_0");
- cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1");
- setReturnValue(cycle, formNames);
- cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE);
- setReturnValue(cycle, prs);
+ expect(cycle.getAttribute(ComponentEventConnectionWorker.FORM_NAME_LIST + "form1"))
+ .andReturn(formNames);
+
+ expect(cycle.getAttribute(TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE))
+ .andReturn(prs);
- scriptSource.getScript(compScriptResource);
- setReturnValue(scriptSource, script);
+ expect(scriptSource.getScript(compScriptResource)).andReturn(script);
- script.execute(cycle, prs, new HashMap());
- getControl(script).setMatcher(new AggregateArgumentsMatcher(new ArgumentMatcher[]
- { null, null, ignore }));
+ script.execute(eq(cycle), eq(prs), isA(Map.class));
replayControls();
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=415077&r1=415076&r2=415077&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 Sat Jun 17 15:46:22 2006
@@ -133,21 +133,12 @@
comp1.getClientId();
setReturnValue(comp1, "id1");
- /*comp1.getBinding("id");
- setReturnValue(comp1, null);*/
-
comp1.getClientId();
setReturnValue(comp1, "id1");
- /*comp1.getBinding("id");
- setReturnValue(comp1, null);*/
-
comp1.getClientId();
setReturnValue(comp1, "id1");
- /*comp1.getBinding("id");
- setReturnValue(comp1, null);*/
-
writer.getNestedWriter();
setReturnValue(writer, nested);
@@ -181,18 +172,10 @@
comp.getClientId();
setReturnValue(comp, "comp");
- /*comp.getBinding("id");
- setReturnValue(comp, null);*/
-
comp.getClientId();
setReturnValue(comp, "comp1");
- /*comp.getBinding("id");
- setReturnValue(comp, null);*/
-
comp.getClientId();
setReturnValue(comp, "comp");
- /*comp.getBinding("id");
- setReturnValue(comp, null);*/
replayControls();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java?rev=415077&r1=415076&r2=415077&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/web/TestServletWebRequest.java Sat Jun 17 15:46:22 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.web;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+
import java.io.IOException;
import java.util.List;
@@ -24,7 +27,6 @@
import javax.servlet.http.HttpSession;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.web.ServletWebRequest}.
@@ -54,9 +56,8 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getParameterNames();
- setReturnValue(request, newEnumeration());
-
+ expect(request.getParameterNames()).andReturn(newEnumeration());
+
replayControls();
WebRequest wr = new ServletWebRequest(request, response);
@@ -75,8 +76,7 @@
String value = "William Orbit";
- request.getParameter("artist");
- setReturnValue(request, value);
+ expect(request.getParameter("artist")).andReturn(value);
replayControls();
@@ -95,8 +95,7 @@
String[] values =
{ "William Orbit", "Steely Dan" };
- request.getParameterValues("artist");
- setReturnValue(request, values);
+ expect(request.getParameterValues("artist")).andReturn(values);
replayControls();
@@ -112,8 +111,7 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getContextPath();
- setReturnValue(request, "/foo");
+ expect(request.getContextPath()).andReturn("/foo");
replayControls();
@@ -129,9 +127,8 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getAttributeNames();
- setReturnValue(request, newEnumeration());
-
+ expect(request.getAttributeNames()).andReturn(newEnumeration());
+
replayControls();
WebRequest wr = new ServletWebRequest(request, response);
@@ -150,8 +147,7 @@
Object attribute = new Object();
- request.getAttribute("attr");
- setReturnValue(request, attribute);
+ expect(request.getAttribute("attr")).andReturn(attribute);
replayControls();
@@ -236,8 +232,7 @@
private void trainGetSession(HttpServletRequest request, boolean create, HttpSession session)
{
- request.getSession(create);
- setReturnValue(request, session);
+ expect(request.getSession(create)).andReturn(session);
}
private HttpSession newSession()
@@ -250,8 +245,7 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getScheme();
- setReturnValue(request, "http");
+ expect(request.getScheme()).andReturn("http");
replayControls();
@@ -267,8 +261,7 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getServerName();
- setReturnValue(request, "www.myhost.com");
+ expect(request.getServerName()).andReturn("www.myhost.com");
replayControls();
@@ -284,9 +277,8 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getServerPort();
- setReturnValue(request, 80);
-
+ expect(request.getServerPort()).andReturn(80);
+
replayControls();
WebRequest wr = new ServletWebRequest(request, response);
@@ -301,8 +293,7 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getRequestURI();
- setReturnValue(request, "/foo/bar");
+ expect(request.getRequestURI()).andReturn("/foo/bar");
replayControls();
@@ -354,8 +345,7 @@
private void trainGetRequestDispatcher(HttpServletRequest request, String path,
RequestDispatcher dispatcher)
{
- request.getRequestDispatcher(path);
- setReturnValue(request, dispatcher);
+ expect(request.getRequestDispatcher(path)).andReturn(dispatcher);
}
public void testForwardInternalNoDispatcher() throws Exception
@@ -395,7 +385,7 @@
trainGetRequestDispatcher(request, "/servlet-exception.html", dispatcher);
dispatcher.forward(request, response);
- setThrowable(dispatcher, t1);
+ expectLastCall().andThrow(t1);
replayControls();
@@ -421,7 +411,7 @@
trainGetRequestDispatcher(request, "/io-exception.html", dispatcher);
dispatcher.forward(request, response);
- setThrowable(dispatcher, t2);
+ expectLastCall().andThrow(t2);
replayControls();
@@ -446,9 +436,8 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- response.encodeRedirectURL("http://foo.bar");
- setReturnValue(response, "<encoded: http://foo.bar>");
-
+ expect(response.encodeRedirectURL("http://foo.bar")).andReturn("<encoded: http://foo.bar>");
+
response.sendRedirect("<encoded: http://foo.bar>");
replayControls();
@@ -463,17 +452,15 @@
public void testForwardExternalFailure() throws Exception
{
HttpServletRequest request = newRequest();
- MockControl responsec = newControl(HttpServletResponse.class);
- HttpServletResponse response = (HttpServletResponse) responsec.getMock();
+ HttpServletResponse response = (HttpServletResponse)newMock(HttpServletResponse.class);
Throwable t = new IOException("Mock IO Exception");
- response.encodeRedirectURL("/");
- responsec.setReturnValue("<encoded: http://foo.bar>");
-
+ expect(response.encodeRedirectURL("/")).andReturn("<encoded: http://foo.bar>");
+
response.sendRedirect("<encoded: http://foo.bar>");
- responsec.setThrowable(t);
-
+ expectLastCall().andThrow(t);
+
replayControls();
WebRequest wr = new ServletWebRequest(request, response);
@@ -497,9 +484,8 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getServletPath();
- setReturnValue(request, "/foo");
-
+ expect(request.getServletPath()).andReturn("/foo");
+
replayControls();
WebRequest wr = new ServletWebRequest(request, response);
@@ -514,9 +500,8 @@
HttpServletRequest request = newRequest();
HttpServletResponse response = newResponse();
- request.getPathInfo();
- setReturnValue(request, "bar/baz");
-
+ expect(request.getPathInfo()).andReturn("bar/baz");
+
replayControls();
WebRequest wr = new ServletWebRequest(request, response);