You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/27 20:21:40 UTC
svn commit: r417545 [7/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/form/TestValidationMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidationMessages.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidationMessages.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/TestValidationMessages.java Tue Jun 27 11:21:31 2006
@@ -14,13 +14,16 @@
package org.apache.tapestry.form;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Locale;
import org.apache.hivemind.Messages;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.valid.ValidationStrings;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.ValidationMessagesImpl}.
@@ -28,7 +31,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public class TestValidationMessages extends HiveMindTestCase
+public class TestValidationMessages extends BaseComponentTestCase
{
private IFormComponent newField()
{
@@ -41,7 +44,7 @@
ValidationMessages m = new ValidationMessagesImpl(field, Locale.ENGLISH);
- replayControls();
+ replay();
assertEquals("You must enter a value for My Field.", m.formatValidationMessage(
null,
@@ -57,7 +60,7 @@
new Object[]
{ "My Field" }));
- verifyControls();
+ verify();
}
public void testGetLocale()
@@ -66,11 +69,11 @@
ValidationMessages m = new ValidationMessagesImpl(field, Locale.ENGLISH);
- replayControls();
+ replay();
assertSame(Locale.ENGLISH, m.getLocale());
- verifyControls();
+ verify();
}
public void testMessageOverride()
@@ -79,7 +82,7 @@
ValidationMessages m = new ValidationMessagesImpl(field, Locale.ENGLISH);
- replayControls();
+ replay();
assertEquals("Gimme data for My Field.", m.formatValidationMessage(
"Gimme data for {0}.",
@@ -87,7 +90,7 @@
new Object[]
{ "My Field" }));
- verifyControls();
+ verify();
}
/**
@@ -102,7 +105,7 @@
ValidationMessages m = new ValidationMessagesImpl(field, Locale.ENGLISH);
- replayControls();
+ replay();
assertEquals("Yo Dawg! Gimme a piece of My Field.", m.formatValidationMessage(
"%myfield-required",
@@ -110,38 +113,32 @@
new Object[]
{ "My Field" }));
- verifyControls();
+ verify();
}
private IFormComponent newField(IComponent container)
{
- MockControl control = newControl(IFormComponent.class);
- IFormComponent field = (IFormComponent) control.getMock();
+ IFormComponent field = newMock(IFormComponent.class);
- field.getContainer();
- control.setReturnValue(container);
+ expect(field.getContainer()).andReturn(container);
return field;
}
private IComponent newComponent(Messages messages)
{
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
+ IComponent component = newComponent();
- component.getMessages();
- control.setReturnValue(messages);
+ expect(component.getMessages()).andReturn(messages);
return component;
}
private Messages newMessage(String key, String message)
{
- MockControl control = newControl(Messages.class);
- Messages messages = (Messages) control.getMock();
+ Messages messages = newMock(Messages.class);
- messages.getMessage(key);
- control.setReturnValue(message);
+ expect(messages.getMessage(key)).andReturn(message);
return messages;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestDateTranslator.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.translator;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -26,7 +28,6 @@
import org.apache.tapestry.valid.ValidationConstraint;
import org.apache.tapestry.valid.ValidationStrings;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Test case for {@link DateTranslator}.
@@ -81,13 +82,13 @@
{
IFormComponent field = newField();
- replayControls();
+ replay();
String result = translator.format(field, Locale.ENGLISH, date);
assertEquals(expected, result);
- verifyControls();
+ verify();
}
public void testNullFormat()
@@ -156,13 +157,13 @@
ValidationMessages messages = newValidationMessages(Locale.ENGLISH);
- replayControls();
+ replay();
Date result = (Date) translator.parse(field, messages, date);
assertEquals(expected, result);
- verifyControls();
+ verify();
}
public void testFailedParseDefaultMessage() throws Exception
@@ -186,15 +187,13 @@
throws Exception
{
IFormComponent field = newField("My Field");
+
+ ValidationMessages messages = newMock(ValidationMessages.class);
- MockControl messagesc = newControl(ValidationMessages.class);
- ValidationMessages messages = (ValidationMessages) messagesc.getMock();
-
- trainGetLocale(messagesc, messages, Locale.ENGLISH);
- trainGetLocale(messagesc, messages, Locale.ENGLISH);
+ trainGetLocale(messages, Locale.ENGLISH);
+ trainGetLocale(messages, Locale.ENGLISH);
trainBuildMessage(
- messagesc,
messages,
overrideMessage,
ValidationStrings.INVALID_DATE,
@@ -202,7 +201,7 @@
{ "My Field", "MM/DD/YYYY" },
"final message");
- replayControls();
+ replay();
try
{
@@ -216,7 +215,7 @@
assertEquals(ValidationConstraint.DATE_FORMAT, e.getConstraint());
}
- verifyControls();
+ verify();
}
public void testRenderContribution()
@@ -241,14 +240,14 @@
trainTrim(context, "foo");
- replayControls();
+ replay();
DateTranslator dt = new DateTranslator();
dt.setTrim(true);
dt.renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.translator;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Locale;
import org.apache.tapestry.IMarkupWriter;
@@ -25,7 +27,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.translator.NumberTranslator}
@@ -122,19 +123,18 @@
private void testParse(Translator translator, String number, Number expected) throws Exception
{
IFormComponent field = newField();
+
+ ValidationMessages messages = newMock(ValidationMessages.class);
- MockControl messagesc = newControl(ValidationMessages.class);
- ValidationMessages messages = (ValidationMessages) messagesc.getMock();
-
- trainGetLocale(messagesc, messages, Locale.ENGLISH);
+ trainGetLocale(messages, Locale.ENGLISH);
- replayControls();
+ replay();
Number result = (Number) translator.parse(field, messages, number);
assertEquals(expected, result);
- verifyControls();
+ verify();
}
@@ -159,15 +159,13 @@
private void testFailedParse(Translator translator, String messageOverride)
{
IFormComponent field = newField("Number Field");
+
+ ValidationMessages messages = newMock(ValidationMessages.class);
- MockControl messagesc = newControl(ValidationMessages.class);
- ValidationMessages messages = (ValidationMessages) messagesc.getMock();
-
- trainGetLocale(messagesc, messages, Locale.ENGLISH);
- trainGetLocale(messagesc, messages, Locale.ENGLISH);
+ trainGetLocale(messages, Locale.ENGLISH);
+ trainGetLocale(messages, Locale.ENGLISH);
trainBuildMessage(
- messagesc,
messages,
messageOverride,
ValidationStrings.INVALID_NUMBER,
@@ -175,7 +173,7 @@
{ "Number Field", "#" },
"invalid number");
- replayControls();
+ replay();
try
{
@@ -189,7 +187,7 @@
assertEquals(ValidationConstraint.NUMBER_FORMAT, e.getConstraint());
}
- verifyControls();
+ verify();
}
public void testRenderContribution()
@@ -198,16 +196,14 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
context.includeClasspathScript(translator.defaultScript());
- trainGetLocale(contextc, context, Locale.ENGLISH);
+ trainGetLocale(context, Locale.ENGLISH);
- trainBuildMessage(contextc, context, null, ValidationStrings.INVALID_NUMBER, new Object[]
+ trainBuildMessage(context, null, ValidationStrings.INVALID_NUMBER, new Object[]
{ "Number Field", "#" }, "invalid number message");
context
@@ -215,11 +211,11 @@
IFormComponent field = newField("Number Field", "numberField", 1);
- replayControls();
+ replay();
translator.renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testMessageRenderContribution()
@@ -230,17 +226,14 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
context.includeClasspathScript(translator.defaultScript());
- trainGetLocale(contextc, context, Locale.ENGLISH);
+ trainGetLocale(context, Locale.ENGLISH);
trainBuildMessage(
- contextc,
context,
messageOverride,
ValidationStrings.INVALID_NUMBER,
@@ -253,13 +246,13 @@
IFormComponent field = newField("Number Field", "myfield", 1);
- replayControls();
+ replay();
translator.setMessage(messageOverride);
translator.renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testTrimRenderContribution()
@@ -271,29 +264,27 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
context.includeClasspathScript(translator.defaultScript());
trainTrim(context, "myfield");
- trainGetLocale(contextc, context, Locale.ENGLISH);
+ trainGetLocale(context, Locale.ENGLISH);
- trainBuildMessage(contextc, context, null, ValidationStrings.INVALID_NUMBER, new Object[]
+ trainBuildMessage(context, null, ValidationStrings.INVALID_NUMBER, new Object[]
{ "Number Field", "#" }, "invalid number message");
context
.addSubmitHandler("function(event) { Tapestry.validate_number(event, 'myfield', 'invalid number message'); }");
- replayControls();
+ replay();
translator.setTrim(true);
translator.renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestStringTranslator.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,13 @@
package org.apache.tapestry.form.translator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.valid.ValidatorException;
-import org.easymock.MockControl;
/**
* Test case for {@link StringTranslator}.
@@ -150,22 +151,20 @@
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
-
- MockControl contextc = newControl(FormComponentContributorContext.class);
- FormComponentContributorContext context = (FormComponentContributorContext) contextc
- .getMock();
+
+ FormComponentContributorContext context = newMock(FormComponentContributorContext.class);
IFormComponent field = newFieldWithClientId("myfield");
trainTrim(context, "myfield");
- replayControls();
+ replay();
Translator t = new StringTranslator("trim");
t.renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestTranslatorBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestTranslatorBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestTranslatorBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TestTranslatorBinding.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.form.translator;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.lib.BeanFactory;
@@ -21,7 +26,6 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.BindingTestCase;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.translator.TranslatorBinding} and
@@ -37,16 +41,14 @@
Location l = newLocation();
ValueConverter vc = newValueConverter();
IComponent component = newComponent();
+
+ BeanFactory bf = newMock(BeanFactory.class);
- MockControl bfc = newControl(BeanFactory.class);
- BeanFactory bf = (BeanFactory) bfc.getMock();
-
- Translator translator = (Translator) newMock(Translator.class);
+ Translator translator =newMock(Translator.class);
- bf.get("string");
- bfc.setReturnValue(translator);
+ expect(bf.get("string")).andReturn(translator);
- replayControls();
+ replay();
TranslatorBindingFactory f = new TranslatorBindingFactory();
f.setValueConverter(vc);
@@ -59,7 +61,7 @@
assertTrue(binding.isInvariant());
assertEquals("description", binding.getDescription());
- verifyControls();
+ verify();
}
public void testFailure()
@@ -67,15 +69,13 @@
Location l = newLocation();
IComponent component = newComponent();
- MockControl bfc = newControl(BeanFactory.class);
- BeanFactory bf = (BeanFactory) bfc.getMock();
+ BeanFactory bf = newMock(BeanFactory.class);
Throwable t = new RuntimeException("Boom!");
- bf.get("string");
- bfc.setThrowable(t);
+ expect(bf.get("string")).andThrow(t);
- replayControls();
+ replay();
TranslatorBindingFactory f = new TranslatorBindingFactory();
f.setTranslatorBeanFactory(bf);
@@ -92,7 +92,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TranslatorTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TranslatorTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TranslatorTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/translator/TranslatorTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,8 +14,10 @@
package org.apache.tapestry.form.translator;
-import org.apache.tapestry.form.FormEventType;
+import static org.easymock.EasyMock.expect;
+
import org.apache.tapestry.form.FormComponentContributorTestCase;
+import org.apache.tapestry.form.FormEventType;
/**
* Abstract test case for {@link Translator}.
@@ -27,16 +29,12 @@
{
protected void trim()
{
- _component.getForm();
- _componentControl.setReturnValue(_form);
+ expect(_component.getForm()).andReturn(_form);
- _form.getName();
- _formControl.setReturnValue("formName");
+ expect(_form.getName()).andReturn("formName");
- _component.getName();
- _componentControl.setReturnValue("fieldName");
+ expect(_component.getName()).andReturn("fieldName");
_form.addEventHandler(FormEventType.SUBMIT, "trim(document.formName.fieldName)");
- _formControl.setVoidCallable();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.form.validator;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.form.FormComponentContributorContext;
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
@@ -37,11 +39,11 @@
IFormComponent field = newField();
ValidationMessages messages = newMessages();
- replayControls();
+ replay();
new Email().validate(field, messages, "hlship@apache.org");
- verifyControls();
+ verify();
}
public void testFail()
@@ -54,7 +56,7 @@
{ "My Email" },
"default message");
- replayControls();
+ replay();
try
{
@@ -67,7 +69,7 @@
assertEquals(ValidationConstraint.EMAIL_FORMAT, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testFailCustomMessage()
@@ -80,7 +82,7 @@
{ "My Email" },
"custom message");
- replayControls();
+ replay();
try
{
@@ -93,7 +95,7 @@
assertEquals(ValidationConstraint.EMAIL_FORMAT, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testRenderContribution()
@@ -116,11 +118,11 @@
context.addSubmitHandler("function(event) { Tapestry.validate_regex(event, 'myfield', '"
+ pattern + "', 'default\\\\message'); }");
- replayControls();
+ replay();
new Email().renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testRenderContributionCustomMessage()
@@ -148,11 +150,11 @@
context.addSubmitHandler("function(event) { Tapestry.validate_regex(event, 'barney', '"
+ pattern + "', 'custom message'); }");
- replayControls();
+ replay();
new Email("message=custom").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
@@ -39,11 +41,11 @@
Integer object = new Integer(10);
- replayControls();
+ replay();
new Max("max=50").validate(field, messages, object);
- verifyControls();
+ verify();
}
public void testFail()
@@ -56,7 +58,7 @@
{ "My Field", new Double(10) },
"Exception!");
- replayControls();
+ replay();
try
{
@@ -79,7 +81,7 @@
{ "My Field", new Double(100) },
"custom message");
- replayControls();
+ replay();
try
{
@@ -108,11 +110,11 @@
context.addSubmitHandler("function(event) { Tapestry.validate_max_number(event, 'myfield', 20.0, 'default message'); }");
- replayControls();
+ replay();
new Max("max=20").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testRenderContributionCustomMessage()
@@ -136,11 +138,11 @@
context.addSubmitHandler("function(event) { Tapestry.validate_max_number(event, 'myfield', 20.0, 'custom\\\\message'); }");
- replayControls();
+ replay();
new Max("max=20,message=custom").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMaxDate.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Date;
import org.apache.tapestry.IMarkupWriter;
@@ -45,14 +47,14 @@
IFormComponent field = newField();
ValidationMessages message = newMessages();
- replayControls();
+ replay();
MaxDate v = new MaxDate();
v.setMaxDate(today);
v.validate(field, message, yesterday);
- verifyControls();
+ verify();
}
public void testFail() throws Exception
@@ -70,7 +72,7 @@
{ "Fred", today },
"default message");
- replayControls();
+ replay();
MaxDate v = new MaxDate();
v.setMaxDate(today);
@@ -86,7 +88,7 @@
assertEquals(ValidationConstraint.TOO_LARGE, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testFailCustomMessage() throws Exception
@@ -104,7 +106,7 @@
{ "Fred", today },
"custom message");
- replayControls();
+ replay();
MaxDate v = new MaxDate("message=custom");
v.setMaxDate(today);
@@ -120,7 +122,7 @@
assertEquals(ValidationConstraint.TOO_LARGE, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testRenderComponentNoOp()
@@ -130,10 +132,10 @@
FormComponentContributorContext context = newContext();
IFormComponent field = newField();
- replayControls();
+ replay();
new MaxDate().renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
@@ -33,11 +35,11 @@
String object = "short and sweet";
- replayControls();
+ replay();
new MaxLength("maxLength=50").validate(field, messages, object);
- verifyControls();
+ verify();
}
public void testFail()
@@ -50,7 +52,7 @@
{ new Integer(10), "My Field" },
"Exception!");
- replayControls();
+ replay();
try
{
@@ -74,7 +76,7 @@
{ new Integer(10), "My Field" },
"Exception!");
- replayControls();
+ replay();
try
{
@@ -107,10 +109,10 @@
context
.addSubmitHandler("function(event) { Tapestry.validate_max_length(event, 'myfield', 20, 'default\\\\message'); }");
- replayControls();
+ replay();
new MaxLength("maxLength=20").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
@@ -38,11 +40,11 @@
Integer object = new Integer(10);
- replayControls();
+ replay();
new Min("min=5").validate(field, messages, object);
- verifyControls();
+ verify();
}
public void testFail()
@@ -55,7 +57,7 @@
{ "My Field", new Double(10) },
"Exception!");
- replayControls();
+ replay();
try
{
@@ -78,7 +80,7 @@
{ "My Field", new Double(10) },
"custom message");
- replayControls();
+ replay();
try
{
@@ -108,11 +110,11 @@
context
.addSubmitHandler("function(event) { Tapestry.validate_min_number(event, 'myfield', 20.0, 'default message'); }");
- replayControls();
+ replay();
new Min("min=20").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testRenderContributionCustomMessage()
@@ -137,10 +139,10 @@
context
.addSubmitHandler("function(event) { Tapestry.validate_min_number(event, 'myfield', 20.0, 'custom\\\\message'); }");
- replayControls();
+ replay();
new Min("min=20,message=custom").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestMinDate.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Date;
import org.apache.tapestry.IMarkupWriter;
@@ -45,14 +47,14 @@
IFormComponent field = newField();
ValidationMessages message = newMessages();
- replayControls();
+ replay();
MinDate v = new MinDate();
v.setMinDate(yesterday);
v.validate(field, message, today);
- verifyControls();
+ verify();
}
public void testFail() throws Exception
@@ -70,7 +72,7 @@
{ "Fred", tomorrow },
"default message");
- replayControls();
+ replay();
MinDate v = new MinDate();
v.setMinDate(tomorrow);
@@ -86,7 +88,7 @@
assertEquals(ValidationConstraint.TOO_SMALL, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testFailCustomMessage() throws Exception
@@ -104,7 +106,7 @@
{ "Fred", tomorrow },
"custom message");
- replayControls();
+ replay();
MinDate v = new MinDate("message=custom");
v.setMinDate(tomorrow);
@@ -120,7 +122,7 @@
assertEquals(ValidationConstraint.TOO_SMALL, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testRenderComponentNoOp()
@@ -130,10 +132,10 @@
FormComponentContributorContext context = newContext();
IFormComponent field = newField();
- replayControls();
+ replay();
new MinDate().renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
@@ -38,11 +40,11 @@
String object = "a nice long string";
- replayControls();
+ replay();
new MinLength("minLength=5").validate(field, messages, object);
- verifyControls();
+ verify();
}
public void testFail()
@@ -55,7 +57,7 @@
{ new Integer(10), "My Field" },
"Exception!");
- replayControls();
+ replay();
try
{
@@ -78,7 +80,7 @@
{ new Integer(10), "My Field" },
"Exception!");
- replayControls();
+ replay();
try
{
@@ -108,11 +110,11 @@
context
.addSubmitHandler("function(event) { Tapestry.validate_min_length(event, 'myfield', 20, 'default message'); }");
- replayControls();
+ replay();
new MinLength("minLength=20").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testRenderContributionCustomMessage()
@@ -137,7 +139,7 @@
context
.addSubmitHandler("function(event) { Tapestry.validate_min_length(event, 'customField', 25, 'custom\\\\message'); }");
- replayControls();
+ replay();
new MinLength("minLength=25,message=custom").renderContribution(
writer,
@@ -145,7 +147,7 @@
context,
field);
- verifyControls();
+ verify();
}
public void testNotRequired()
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.form.validator;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
@@ -38,11 +40,11 @@
IFormComponent field = newField();
ValidationMessages messages = newMessages();
- replayControls();
+ replay();
new Pattern("pattern=\\d+").validate(field, messages, "1232");
- verifyControls();
+ verify();
}
public void testFail()
@@ -55,7 +57,7 @@
{ "My Pattern" },
"default message");
- replayControls();
+ replay();
try
{
@@ -68,7 +70,7 @@
assertEquals(ValidationConstraint.PATTERN_MISMATCH, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testFailCustomMessage()
@@ -81,7 +83,7 @@
{ "My Pattern" },
"custom message");
- replayControls();
+ replay();
try
{
@@ -94,7 +96,7 @@
assertEquals(ValidationConstraint.PATTERN_MISMATCH, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testRenderContribution()
@@ -117,11 +119,11 @@
.addSubmitHandler("function(event) { Tapestry.validate_regex(event, 'myfield', '"
+ pattern + "', 'default message'); }");
- replayControls();
+ replay();
new Pattern("pattern=\\d+").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testRenderContributionCustomMessage()
@@ -149,11 +151,11 @@
.addSubmitHandler("function(event) { Tapestry.validate_regex(event, 'myfield', '"
+ pattern + "', 'custom\\\\message'); }");
- replayControls();
+ replay();
new Pattern("pattern=\\d+,message=custom").renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
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=417545&r1=417544&r2=417545&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 Tue Jun 27 11:21:31 2006
@@ -15,6 +15,9 @@
package org.apache.tapestry.form.validator;
import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertSame;
import java.util.Collections;
@@ -23,6 +26,7 @@
import org.apache.tapestry.form.FormComponentContributorContext;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.ValidationMessages;
+import org.apache.tapestry.json.JSONArray;
import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.valid.ValidationConstants;
import org.apache.tapestry.valid.ValidationConstraint;
@@ -42,11 +46,11 @@
IFormComponent field = newField();
ValidationMessages messages = newMessages();
- replayControls();
+ replay();
new Required().validate(field, messages, "not null");
- verifyControls();
+ verify();
}
public void testValidateNull() throws Exception
@@ -59,7 +63,7 @@
{ "Fred" },
"Default Message for Fred.");
- replayControls();
+ replay();
try
{
@@ -72,7 +76,7 @@
assertSame(ValidationConstraint.REQUIRED, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testValidateEmptyString() throws Exception
@@ -85,7 +89,7 @@
{ "Fred" },
"Default Message for Fred.");
- replayControls();
+ replay();
try
{
@@ -98,7 +102,7 @@
assertSame(ValidationConstraint.REQUIRED, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testValidateEmptyCollection() throws Exception
@@ -111,7 +115,7 @@
{ "Fred" },
"Default Message for Fred.");
- replayControls();
+ replay();
try
{
@@ -124,7 +128,7 @@
assertSame(ValidationConstraint.REQUIRED, ex.getConstraint());
}
- verifyControls();
+ verify();
}
public void testValidateNullCustomMessage() throws Exception
@@ -137,7 +141,7 @@
{ "Fred" },
"Custom Message for Fred.");
- replayControls();
+ replay();
try
{
@@ -152,14 +156,14 @@
assertSame(ValidationConstraint.REQUIRED, ex.getConstraint());
}
- verifyControls();
+ verify();
}
-
- // TODO: Need to validate JSON object contributions!
+
public void testRenderContribution()
{
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle();
+ JSONObject json = new JSONObject();
FormComponentContributorContext context =
(FormComponentContributorContext)newMock(FormComponentContributorContext.class);
@@ -168,7 +172,7 @@
context.registerForFocus(ValidationConstants.REQUIRED_FIELD);
- expect(context.getProfile()).andReturn(new JSONObject());
+ expect(context.getProfile()).andReturn(json);
trainFormatMessage(
context,
@@ -178,12 +182,21 @@
{ "Fred" },
"Default\\Message for Fred.");
- replayControls();
+ replay();
new Required().renderContribution(writer, cycle, context, field);
- verifyControls();
+
+ verify();
+
+ assertNotNull(json.get(ValidationConstants.REQUIRED));
+ JSONArray arr = json.getJSONArray(ValidationConstants.REQUIRED);
+ assertEquals("fred", arr.getString(0));
+
+ assertNotNull(json.get("fred"));
+ JSONObject obj = json.getJSONObject("fred");
+ assertEquals("Default\\Message for Fred.", obj.getString(ValidationConstants.REQUIRED));
}
-
+
public void testIsRequired()
{
assertEquals(true, new Required().isRequired());
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.form.validator;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -25,7 +30,6 @@
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.ValidationMessages;
import org.apache.tapestry.junit.TapestryTestCase;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.ValidatorFactoryImpl}.
@@ -57,20 +61,20 @@
IComponent component = newComponent();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
- replayControls();
+ replay();
List result = vf.constructValidatorList(component, "");
assertTrue(result.isEmpty());
- verifyControls();
+ verify();
}
public void testSingle()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(buildContributions("value", true));
@@ -81,14 +85,14 @@
assertEquals("foo", fixture.getValue());
- verifyControls();
+ verify();
}
public void testMessage()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(buildContributions("fred", false));
@@ -99,14 +103,14 @@
assertEquals("fred's message", fixture.getMessage());
- verifyControls();
+ verify();
}
public void testConfigureAndMessage()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(buildContributions("value", true));
@@ -118,14 +122,14 @@
assertEquals("biff", fixture.getValue());
assertEquals("fred's message", fixture.getMessage());
- verifyControls();
+ verify();
}
public void testMissingConfiguration()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(buildContributions("fred", true));
@@ -141,14 +145,14 @@
+ "The value is configured by changing 'name' to 'name=value'.", ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testMultiple()
{
IComponent component = newComponent();
- replayControls();
+ replay();
Map map = new HashMap();
map.put("required", newContribution(false, Required.class));
@@ -173,14 +177,14 @@
assertEquals(10, minLength.getMinLength());
assertEquals("EMail must be at least ten characters long", minLength.getMessage());
- verifyControls();
+ verify();
}
public void testUnparseable()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(buildContributions("fred", false));
@@ -194,14 +198,14 @@
assertEquals("Unable to parse 'fred,=foo' into a list of validators.", ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testUnwantedConfiguration()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(buildContributions("fred", false));
@@ -217,14 +221,14 @@
.getMessage());
}
- verifyControls();
+ verify();
}
public void testMissingValidator()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(Collections.EMPTY_MAP);
@@ -239,14 +243,14 @@
assertEquals("No validator named 'missing' has been defined.", ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testInstantiateFailure()
{
IComponent component = newComponent();
- replayControls();
+ replay();
Map map = new HashMap();
@@ -266,7 +270,7 @@
"Error initializing validator 'fred' (class java.lang.Object): java.lang.Object"));
}
- verifyControls();
+ verify();
}
private Validator newValidator()
@@ -276,22 +280,18 @@
private IBeanProvider newBeanProvider(String beanName, Object bean)
{
- MockControl control = newControl(IBeanProvider.class);
- IBeanProvider provider = (IBeanProvider) control.getMock();
+ IBeanProvider provider = newMock(IBeanProvider.class);
- provider.getBean(beanName);
- control.setReturnValue(bean);
+ expect(provider.getBean(beanName)).andReturn(bean);
return provider;
}
private IComponent newComponent(IBeanProvider provider)
{
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
+ IComponent component = newComponent();
- component.getBeans();
- control.setReturnValue(provider);
+ expect(component.getBeans()).andReturn(provider);
return component;
}
@@ -309,7 +309,7 @@
validator.validate(field, messages, value);
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(Collections.EMPTY_MAP);
@@ -322,7 +322,7 @@
wrapper.validate(field, messages, value);
- verifyControls();
+ verify();
}
private ValidationMessages newMessages()
@@ -341,7 +341,7 @@
IBeanProvider provider = newBeanProvider("fred", bean);
IComponent component = newComponent(provider);
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(Collections.EMPTY_MAP);
@@ -363,14 +363,14 @@
assertSame(bean, ex.getComponent());
}
- verifyControls();
+ verify();
}
public void testBeanReferenceWithValue()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(Collections.EMPTY_MAP);
@@ -387,14 +387,14 @@
ex.getMessage());
}
- verifyControls();
+ verify();
}
public void testBeanReferenceWithMessage()
{
IComponent component = newComponent();
- replayControls();
+ replay();
ValidatorFactoryImpl vf = new ValidatorFactoryImpl();
vf.setValidators(Collections.EMPTY_MAP);
@@ -411,6 +411,6 @@
ex.getMessage());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorWrapper.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorWrapper.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,14 @@
package org.apache.tapestry.form.validator;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.form.FormComponentContributorContext;
import org.apache.tapestry.form.IFormComponent;
import org.apache.tapestry.form.ValidationMessages;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.AbstractValidatorWrapper}
@@ -59,11 +61,11 @@
delegate.validate(field, messages, value);
- replayControls();
+ replay();
new Fixture(delegate).validate(field, messages, value);
- verifyControls();
+ verify();
}
public void testRenderContribution()
@@ -77,62 +79,56 @@
delegate.renderContribution(writer, cycle, context, field);
- replayControls();
+ replay();
new Fixture(delegate).renderContribution(writer, cycle, context, field);
- verifyControls();
+ verify();
}
public void testGetAcceptsNull()
{
- MockControl delegatec = newControl(Validator.class);
- Validator delegate = (Validator) delegatec.getMock();
+ Validator delegate = newMock(Validator.class);
- delegate.getAcceptsNull();
- delegatec.setReturnValue(true);
+ expect(delegate.getAcceptsNull()).andReturn(true);
- replayControls();
+ replay();
Validator wrapper = new Fixture(delegate);
assertEquals(true, wrapper.getAcceptsNull());
- verifyControls();
+ verify();
- delegate.getAcceptsNull();
- delegatec.setReturnValue(false);
+ expect(delegate.getAcceptsNull()).andReturn(false);
- replayControls();
+ replay();
assertEquals(false, wrapper.getAcceptsNull());
- verifyControls();
+ verify();
}
public void testIsRequired()
{
- MockControl delegatec = newControl(Validator.class);
- Validator delegate = (Validator) delegatec.getMock();
+ Validator delegate = newMock(Validator.class);
- delegate.isRequired();
- delegatec.setReturnValue(true);
+ expect(delegate.isRequired()).andReturn(true);
- replayControls();
+ replay();
Validator wrapper = new Fixture(delegate);
assertEquals(true, wrapper.isRequired());
- verifyControls();
+ verify();
- delegate.isRequired();
- delegatec.setReturnValue(false);
+ expect(delegate.isRequired()).andReturn(false);
- replayControls();
+ replay();
assertEquals(false, wrapper.isRequired());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorsBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorsBinding.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorsBinding.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/form/validator/TestValidatorsBinding.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.form.validator;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.List;
import org.apache.hivemind.ApplicationRuntimeException;
@@ -22,7 +26,6 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.BindingTestCase;
import org.apache.tapestry.coerce.ValueConverter;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.form.validator.ValidatorsBinding} and
@@ -37,16 +40,14 @@
{
IComponent component = newComponent();
Location l = newLocation();
- List validators = (List) newMock(List.class);
+ List validators = newMock(List.class);
ValueConverter vc = newValueConverter();
+
+ ValidatorFactory vf = newMock(ValidatorFactory.class);
- MockControl control = newControl(ValidatorFactory.class);
- ValidatorFactory vf = (ValidatorFactory) control.getMock();
-
- vf.constructValidatorList(component, "required");
- control.setReturnValue(validators);
+ expect(vf.constructValidatorList(component, "required")).andReturn(validators);
- replayControls();
+ replay();
ValidatorsBindingFactory factory = new ValidatorsBindingFactory();
factory.setValueConverter(vc);
@@ -58,7 +59,7 @@
assertSame(l, binding.getLocation());
assertEquals("my desc", binding.getDescription());
- verifyControls();
+ verify();
}
public void testFailure()
@@ -69,13 +70,11 @@
ValueConverter vc = newValueConverter();
- MockControl control = newControl(ValidatorFactory.class);
- ValidatorFactory vf = (ValidatorFactory) control.getMock();
+ ValidatorFactory vf = newMock(ValidatorFactory.class);
- vf.constructValidatorList(component, "required");
- control.setThrowable(t);
+ expect(vf.constructValidatorList(component, "required")).andThrow(t);
- replayControls();
+ replay();
ValidatorsBindingFactory factory = new ValidatorsBindingFactory();
factory.setValueConverter(vc);
@@ -93,6 +92,6 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/BodyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/BodyTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/BodyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/BodyTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.html;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.TapestryUtils;
@@ -32,11 +35,11 @@
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, null);
- replayControls();
+ replay();
assertNull(Body.get(cycle));
- verifyControls();
+ verify();
}
public void testGetReturnsBody()
@@ -46,10 +49,10 @@
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, body);
- replayControls();
+ replay();
assertSame(body, Body.get(cycle));
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/DescribeTest.java Tue Jun 27 11:21:31 2006
@@ -31,13 +31,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(true, false);
- replayControls();
+ replay();
Describe component = (Describe) newInstance(Describe.class);
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRender()
@@ -51,13 +51,13 @@
describer.describeObject(object, writer);
- replayControls();
+ replay();
Describe component = (Describe) newInstance(Describe.class, new Object[]
{ "object", object, "describer", describer });
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/FrameTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/FrameTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/FrameTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/FrameTest.java Tue Jun 27 11:21:31 2006
@@ -47,14 +47,14 @@
writer.closeTag();
- replayControls();
+ replay();
Frame frame = (Frame) newInstance(Frame.class, new Object[]
{ "pageService", pageService, "targetPage", "FramePage" });
frame.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderWithInformal()
@@ -75,7 +75,7 @@
writer.closeTag();
- replayControls();
+ replay();
Frame frame = (Frame) newInstance(Frame.class, new Object[]
{ "pageService", pageService, "targetPage", "FramePage", "specification",
@@ -84,6 +84,6 @@
frame.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/ScriptTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.html;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotSame;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.HashMap;
import java.util.Map;
@@ -92,13 +97,13 @@
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
component.addBody(body);
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testWithSymbolsMap()
@@ -133,13 +138,13 @@
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
component.addBody(body);
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
assertEquals(baseSymbols, script._symbols);
assertSame(script._symbols, component.getSymbols());
@@ -182,13 +187,13 @@
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
component.addBody(body);
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
Map expectedSymbols = new HashMap(baseSymbols);
expectedSymbols.put("fred", "mercury");
@@ -207,7 +212,7 @@
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
Script component = (Script) newInstance(Script.class);
@@ -215,7 +220,7 @@
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testMultiParamException()
@@ -239,7 +244,7 @@
trainGetPageRenderSupport(cycle, support);
- replayControls();
+ replay();
component.addBody(body);
@@ -249,7 +254,7 @@
assertExceptionSubstring(ex, "Script component has both script IAsset");
}
- verifyControls();
+ verify();
}
public void testIAssetParamRender()
@@ -267,10 +272,9 @@
IAsset scriptAsset = newAsset();
- scriptAsset.getResourceLocation();
- setReturnValue(scriptAsset, scriptLocation);
+ expect(scriptAsset.getResourceLocation()).andReturn(scriptLocation);
- Script component = (Script) newInstance(Script.class, new Object[]
+ Script component = newInstance(Script.class, new Object[]
{ "specification", new ComponentSpecification(), "container", container, "scriptSource",
source, "scriptAsset", scriptAsset });
@@ -284,13 +288,13 @@
trainResponseBuilder(cycle, writer);
- replayControls();
+ replay();
component.addBody(body);
component.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
protected IScript newScript()
@@ -300,8 +304,7 @@
protected void trainGetScript(IScriptSource source, Resource scriptLocation, IScript script)
{
- source.getScript(scriptLocation);
- setReturnValue(source, script);
+ expect(source.getScript(scriptLocation)).andReturn(script);
}
protected IScriptSource newScriptSource()
@@ -315,13 +318,10 @@
IComponentSpecification spec = newSpec();
Resource resource = newResource();
- component.getSpecification();
- setReturnValue(component, spec);
-
- spec.getSpecificationLocation();
- setReturnValue(spec, resource);
+ expect(component.getSpecification()).andReturn(spec);
+
+ expect(spec.getSpecificationLocation()).andReturn(resource);
- resource.getRelativeResource(scriptPath);
- setReturnValue(resource, scriptLocation);
+ expect(resource.getRelativeResource(scriptPath)).andReturn(scriptLocation);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestImage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestImage.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestImage.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestImage.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.html;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
@@ -41,11 +44,11 @@
Image image = (Image) newInstance(Image.class);
- replayControls();
+ replay();
image.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
public void testNoImage()
@@ -63,7 +66,7 @@
Image image = (Image) newInstance(Image.class, new Object[]
{ "location", l, "id", "barney", "page", page, "container", page });
- replayControls();
+ replay();
try
{
@@ -78,7 +81,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testRender()
@@ -99,7 +102,7 @@
writer.closeTag();
- replayControls();
+ replay();
Image image = (Image) newInstance(Image.class, new Object[]
{ "image", asset, "specification", spec });
@@ -108,6 +111,6 @@
image.renderComponent(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java Tue Jun 27 11:21:31 2006
@@ -31,13 +31,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(true, false);
- replayControls();
+ replay();
InsertText component = (InsertText) newInstance(InsertText.class);
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderNull()
@@ -45,13 +45,13 @@
IMarkupWriter writer = newWriter();
IRequestCycle cycle = newCycle(false, false);
- replayControls();
+ replay();
InsertText component = (InsertText) newInstance(InsertText.class);
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderBreaks()
@@ -65,7 +65,7 @@
writer.beginEmpty("br");
writer.print("to come to the aid of their Tapestry.", false);
- replayControls();
+ replay();
InsertText component = (InsertText) newInstance(
InsertText.class,
@@ -75,7 +75,7 @@
component.finishLoad(cycle, null, null);
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderParas()
@@ -95,7 +95,7 @@
writer.print("to come to the aid of their Tapestry.", false);
writer.end();
- replayControls();
+ replay();
InsertText component = (InsertText) newInstance(InsertText.class, new Object[]
{ "mode", InsertTextMode.PARAGRAPH, "value",
@@ -103,7 +103,7 @@
component.render(writer, cycle);
- verifyControls();
+ verify();
}
public void testRenderRaw()
@@ -115,7 +115,7 @@
writer.beginEmpty("br");
writer.print("<b>raw</b>", true);
- replayControls();
+ replay();
InsertText component = (InsertText) newInstance(InsertText.class, new Object[]
{ "value", "output\n<b>raw</b>", "raw", Boolean.TRUE });
@@ -123,6 +123,6 @@
component.finishLoad(cycle, null, null);
component.render(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestPageEvents.java Tue Jun 27 11:21:31 2006
@@ -14,21 +14,24 @@
package org.apache.tapestry.html;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.test.Creator;
-import org.easymock.MockControl;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestPageEvents extends HiveMindTestCase
+public class TestPageEvents extends BaseComponentTestCase
{
- private IPage newPage()
+ private IPage createPage()
{
Creator creator = new Creator();
@@ -37,7 +40,7 @@
public void testPageDetached()
{
- IPage page = newPage();
+ IPage page = createPage();
ListenerFixture l = new ListenerFixture();
// Code path: no listener list
@@ -63,7 +66,7 @@
public void testPageAttached()
{
- IPage page = newPage();
+ IPage page = createPage();
ListenerFixture l = new ListenerFixture();
// Code path: no listener list
@@ -87,44 +90,29 @@
public void testPageBeginRender()
{
- IPage page = newPage();
+ IPage page = createPage();
ListenerFixture l = new ListenerFixture();
-
- MockControl control = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) control.getMock();
- ResponseBuilder builder = (ResponseBuilder)newMock(ResponseBuilder.class);
- cycle.isRewinding();
- control.setReturnValue(true);
+ IRequestCycle cycle = newCycle();
+ ResponseBuilder builder = newMock(ResponseBuilder.class);
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true).anyTimes();
builder.render(NullWriter.getSharedInstance(), page, cycle);
- replayControls();
+ replay();
// Code path: no listener list
page.renderPage(builder, cycle);
- verifyControls();
+ verify();
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true).anyTimes();
builder.render(NullWriter.getSharedInstance(), page, cycle);
- replayControls();
+ replay();
page.addPageBeginRenderListener(l);
@@ -136,68 +124,46 @@
page.removePageBeginRenderListener(l);
- verifyControls();
+ verify();
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true).anyTimes();
builder.render(NullWriter.getSharedInstance(), page, cycle);
- replayControls();
+ replay();
page.renderPage(builder, cycle);
assertNull(l.getMethod());
- verifyControls();
+ verify();
}
public void testPageEndRender()
{
- IPage page = newPage();
+ IPage page = createPage();
ListenerFixture l = new ListenerFixture();
-
- MockControl control = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) control.getMock();
- ResponseBuilder builder = (ResponseBuilder)newMock(ResponseBuilder.class);
-
- cycle.isRewinding();
- control.setReturnValue(true);
- cycle.isRewinding();
- control.setReturnValue(true);
+ IRequestCycle cycle = newCycle();
+ ResponseBuilder builder = newMock(ResponseBuilder.class);
- cycle.isRewinding();
- control.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true).anyTimes();
builder.render(NullWriter.getSharedInstance(), page, cycle);
- replayControls();
+ replay();
// Code path: no listener list
page.renderPage(builder, cycle);
- verifyControls();
+ verify();
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true).anyTimes();
builder.render(NullWriter.getSharedInstance(), page, cycle);
- replayControls();
+ replay();
page.addPageEndRenderListener(l);
@@ -209,31 +175,24 @@
page.removePageEndRenderListener(l);
- verifyControls();
+ verify();
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
-
- cycle.isRewinding();
- control.setReturnValue(true);
+ expect(cycle.isRewinding()).andReturn(true).anyTimes();
builder.render(NullWriter.getSharedInstance(), page, cycle);
- replayControls();
+ replay();
page.renderPage(builder, cycle);
assertNull(l.getMethod());
- verifyControls();
+ verify();
}
public void testPageValidate()
{
- IPage page = newPage();
+ IPage page = createPage();
ListenerFixture l = new ListenerFixture();
// Code path: no listener list
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/html/TestShell.java Tue Jun 27 11:21:31 2006
@@ -44,7 +44,7 @@
body.render(writer, cycle);
- replayControls();
+ replay();
Shell shell = (Shell) _creator.newInstance(Shell.class);
@@ -52,6 +52,6 @@
shell.render(writer, cycle);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
import org.apache.tapestry.util.ContentType;
/**
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Arrays;
import java.util.List;
@@ -25,8 +27,8 @@
import org.apache.hivemind.Resource;
import org.apache.hivemind.impl.DefaultClassResolver;
import org.apache.hivemind.impl.RegistryBuilder;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.hivemind.util.ClasspathResource;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.Tapestry;
@@ -46,7 +48,7 @@
* @since 2.2
*/
-public abstract class TapestryTestCase extends HiveMindTestCase
+public abstract class TapestryTestCase extends BaseComponentTestCase
{
protected static final boolean IS_JDK13 = System.getProperty("java.specification.version")
.equals("1.3");
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponent.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertTrue;
+
import org.apache.tapestry.BaseComponent;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
@@ -82,15 +85,14 @@
list[i] = new TestRender();
c.addOuterTest(list[i]);
- cycle.getResponseBuilder();
- setReturnValue(cycle, builder);
+ expect(cycle.getResponseBuilder()).andReturn(builder);
}
- replayControls();
+ replay();
c.testRenderComponent(writer, cycle);
- verifyControls();
+ verify();
for (int i = 0; i < list.length; i++)
assertTrue("Outer object #" + i + " did render.", list[i].rendered);
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
import java.io.InputStream;
import java.util.Properties;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestMultipart.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.multipart.ValuePart;
/**
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestStaticLink.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.engine.ILink;
import org.apache.tapestry.link.StaticLink;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryCheckMethodInvocation.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.Tapestry;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/TestTapestryGetClassName.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.Tapestry;
/**