You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/01/25 19:57:18 UTC
svn commit: r499907 -
/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
Author: hlship
Date: Thu Jan 25 10:57:17 2007
New Revision: 499907
URL: http://svn.apache.org/viewvc?view=rev&rev=499907
Log:
Move a few test methods to IOCTestCase.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java?view=diff&rev=499907&r1=499906&r2=499907
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java Thu Jan 25 10:57:17 2007
@@ -48,7 +48,6 @@
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.MessageFormatter;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.ServiceLocator;
@@ -680,23 +679,6 @@
expect(validator.getMessageKey()).andReturn(messageKey).atLeastOnce();
}
- protected final void train_getMessageFormatter(Messages messages, String key,
- MessageFormatter formatter)
- {
- expect(messages.getFormatter(key)).andReturn(formatter).atLeastOnce();
- }
-
- protected final MessageFormatter newMessageFormatter()
- {
- return newMock(MessageFormatter.class);
- }
-
- /** Have to put the result before the varargs. */
- protected void train_format(MessageFormatter formatter, String result, Object... arguments)
- {
- expect(formatter.format(arguments)).andReturn(result);
- }
-
protected final Field newFieldWithLabel(String label)
{
Field field = newField();
@@ -711,16 +693,12 @@
expect(field.getLabel()).andReturn(label).atLeastOnce();
}
- protected final void train_getContainerResources(ComponentResources resources, ComponentResources containerResources)
+ protected final void train_getContainerResources(ComponentResources resources,
+ ComponentResources containerResources)
{
expect(resources.getContainerResources()).andReturn(containerResources).atLeastOnce();
}
- protected final void train_contains(Messages messages, String key, boolean result)
- {
- expect(messages.contains(key)).andReturn(result).atLeastOnce();
- }
-
protected final void train_getId(ComponentResources resources, String id)
{
expect(resources.getId()).andReturn(id).atLeastOnce();
@@ -741,7 +719,8 @@
expect(validator.skipIfBlank()).andReturn(skipIfBlank).atLeastOnce();
}
- protected final void train_getFieldPersistenceStrategy(ComponentModel model, String fieldName, String fieldStrategy)
+ protected final void train_getFieldPersistenceStrategy(ComponentModel model, String fieldName,
+ String fieldStrategy)
{
expect(model.getFieldPersistenceStrategy(fieldName)).andReturn(fieldStrategy).atLeastOnce();
}