You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/03/03 21:20:12 UTC
svn commit: r1076774 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/test/TapestryTestCase.java
test/java/org/apache/tapestry5/internal/transform/RetainWorkerTest.java
Author: hlship
Date: Thu Mar 3 20:20:11 2011
New Revision: 1076774
URL: http://svn.apache.org/viewvc?rev=1076774&view=rev
Log:
TAP5-1466: Remove deprecated methods from TapestryTestCase
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/RetainWorkerTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java?rev=1076774&r1=1076773&r2=1076774&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java Thu Mar 3 20:20:11 2011
@@ -14,14 +14,11 @@
package org.apache.tapestry5.test;
-import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
-
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.net.URL;
import java.util.Arrays;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
@@ -31,7 +28,28 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.tapestry5.*;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.Asset2;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ComponentResourcesCommon;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldTranslator;
+import org.apache.tapestry5.FieldValidationSupport;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.NullFieldStrategy;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.PropertyOverrides;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.ValueEncoder;
import org.apache.tapestry5.annotations.Id;
import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.annotations.Path;
@@ -55,7 +73,43 @@ import org.apache.tapestry5.model.Embedd
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.model.ParameterModel;
import org.apache.tapestry5.runtime.Component;
-import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.services.ApplicationStateCreator;
+import org.apache.tapestry5.services.ApplicationStateManager;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategy;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategySource;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.BaseURLSource;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.ComponentEventRequestHandler;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.services.ComponentRequestHandler;
+import org.apache.tapestry5.services.Context;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.FieldTranslatorSource;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.Heartbeat;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.services.InjectionProvider;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.PageRenderLinkSource;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
+import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.services.Session;
+import org.apache.tapestry5.services.TransformField;
+import org.apache.tapestry5.services.TransformMethodSignature;
+import org.apache.tapestry5.services.TranslatorSource;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.services.ValueEncoderSource;
import org.apache.tapestry5.services.javascript.JavaScriptSupport;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -305,20 +359,6 @@ public abstract class TapestryTestCase e
return newMock(Validator.class);
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_addField(ClassTransformation transformation, int modifiers, String type,
- String suggestedName, String actualName)
- {
- expect(transformation.addField(modifiers, type, suggestedName)).andReturn(actualName);
- }
-
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_addInjectedField(ClassTransformation ct, Class type, String suggestedName, Object value,
- String fieldName)
- {
- expect(ct.addInjectedField(type, suggestedName, value)).andReturn(fieldName);
- }
-
protected final void train_buildConstraints(ValidationConstraintGenerator generator, Class propertyType,
AnnotationProvider provider, String... constraints)
{
@@ -362,77 +402,21 @@ public abstract class TapestryTestCase e
{
expect(source.getAsset(root, path, locale)).andReturn(asset);
}
-
- protected final void train_matchFields(ClassTransformation transformation, TransformField field)
- {
- expect(transformation.matchFields(EasyMock.isA(Predicate.class))).andReturn(Arrays.asList(field));
- }
-
- protected final void train_getName(TransformField field, String name)
- {
- expect(field.getName()).andReturn(name);
- }
-
- protected final <T extends Annotation> void train_getAnnotation(TransformField field, Class<T> annotationClass, T anotation)
- {
- expect(field.getAnnotation(annotationClass)).andReturn(anotation);
- }
-
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_findFieldsWithAnnotation(ClassTransformation transformation,
- Class<? extends Annotation> annotationClass, List<String> fieldNames)
- {
- expect(transformation.findFieldsWithAnnotation(annotationClass)).andReturn(fieldNames);
- }
-
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_findFieldsWithAnnotation(ClassTransformation transformation,
- Class<? extends Annotation> annotationClass, String... fieldNames)
- {
- train_findFieldsWithAnnotation(transformation, annotationClass, Arrays.asList(fieldNames));
- }
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_findMethods(ClassTransformation transformation,
- final TransformMethodSignature... signatures)
+ protected final void train_matchFields(ClassTransformation transformation, TransformField field)
{
- IAnswer<List<TransformMethodSignature>> answer = new IAnswer<List<TransformMethodSignature>>()
- {
- public List<TransformMethodSignature> answer() throws Throwable
- {
- // Can't think of a way to do this without duplicating some code out of
- // InternalClassTransformationImpl
-
- List<TransformMethodSignature> result = newList();
- MethodFilter filter = (MethodFilter) EasyMock.getCurrentArguments()[0];
-
- for (TransformMethodSignature sig : signatures)
- {
- if (filter.accept(sig))
- result.add(sig);
- }
-
- // We don't have to sort them for testing purposes. Usually there's just going to be
- // one in there.
-
- return result;
- }
- };
-
- expect(transformation.findMethods(EasyMock.isA(MethodFilter.class))).andAnswer(answer);
+ expect(transformation.matchFields(EasyMock.isA(Predicate.class))).andReturn(Arrays.asList(field));
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_findMethodsWithAnnotation(ClassTransformation tf,
- Class<? extends Annotation> annotationType, List<TransformMethodSignature> sigs)
+ protected final void train_getName(TransformField field, String name)
{
- expect(tf.findMethodsWithAnnotation(annotationType)).andReturn(sigs);
+ expect(field.getName()).andReturn(name);
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_findUnclaimedFields(ClassTransformation transformation, String... fieldNames)
+ protected final <T extends Annotation> void train_getAnnotation(TransformField field, Class<T> annotationClass,
+ T anotation)
{
- expect(transformation.findUnclaimedFields()).andReturn(Arrays.asList(fieldNames));
+ expect(field.getAnnotation(annotationClass)).andReturn(anotation);
}
protected final void train_generateChecksum(ResourceDigestGenerator generator, URL url, String digest)
@@ -542,24 +526,11 @@ public abstract class TapestryTestCase e
expect(request.getDateHeader(name)).andReturn(value).atLeastOnce();
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final <T extends Annotation> void train_getFieldAnnotation(ClassTransformation transformation,
- String fieldName, Class<T> annotationClass, T annotation)
- {
- expect(transformation.getFieldAnnotation(fieldName, annotationClass)).andReturn(annotation);
- }
-
protected final void train_getFieldPersistenceStrategy(ComponentModel model, String fieldName, String fieldStrategy)
{
expect(model.getFieldPersistenceStrategy(fieldName)).andReturn(fieldStrategy).atLeastOnce();
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_getFieldType(ClassTransformation transformation, String fieldName, String type)
- {
- expect(transformation.getFieldType(fieldName)).andReturn(type).atLeastOnce();
- }
-
protected final void train_getId(ComponentResources resources, String id)
{
expect(resources.getId()).andReturn(id).atLeastOnce();
@@ -595,13 +566,6 @@ public abstract class TapestryTestCase e
expect(model.getMeta(key)).andReturn(value).atLeastOnce();
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final <T extends Annotation> void train_getMethodAnnotation(ClassTransformation ct,
- TransformMethodSignature signature, Class<T> annotationClass, T annotation)
- {
- expect(ct.getMethodAnnotation(signature, annotationClass)).andReturn(annotation).atLeastOnce();
- }
-
protected final void train_getMethodIdentifier(ClassTransformation transformation,
TransformMethodSignature signature, String id)
{
@@ -651,12 +615,6 @@ public abstract class TapestryTestCase e
expect(model.getPersistentFieldNames()).andReturn(Arrays.asList(names)).atLeastOnce();
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_getResourcesFieldName(ClassTransformation transformation, String name)
- {
- expect(transformation.getResourcesFieldName()).andReturn(name).atLeastOnce();
- }
-
protected final void train_getRootResource(AssetFactory factory, Resource rootResource)
{
expect(factory.getRootResource()).andReturn(rootResource);
@@ -832,13 +790,6 @@ public abstract class TapestryTestCase e
expect(annotation.value()).andReturn(value).atLeastOnce();
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final void train_create(BeanModelSource source, Class beanClass, boolean filterReadOnly,
- Messages messages, BeanModel model)
- {
- expect(source.create(beanClass, filterReadOnly, messages)).andReturn(model);
- }
-
protected final void train_getBoundType(ComponentResources resources, String parameterName, Class type)
{
expect(resources.getBoundType(parameterName)).andReturn(type);
@@ -935,12 +886,6 @@ public abstract class TapestryTestCase e
return newMock(FieldValidationSupport.class);
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final RenderSupport mockRenderSupport()
- {
- return newMock(RenderSupport.class);
- }
-
protected final void train_getInheritInformalParameters(EmbeddedComponentModel model, boolean inherits)
{
expect(model.getInheritInformalParameters()).andReturn(inherits).atLeastOnce();
@@ -1112,7 +1057,7 @@ public abstract class TapestryTestCase e
{
expect(translator.getType()).andReturn(type).atLeastOnce();
}
-
+
protected final void train_getType(TransformField field, String type)
{
expect(field.getType()).andReturn(type).atLeastOnce();
@@ -1206,12 +1151,6 @@ public abstract class TapestryTestCase e
return newMock(PageRenderLinkSource.class);
}
- /** @deprecated May be removed in Tapestry 5.3 */
- protected final ClientInfrastructure mockClientInfrastucture()
- {
- return newMock(ClientInfrastructure.class);
- }
-
protected final JavaScriptSupport mockJavaScriptSupport()
{
return newMock(JavaScriptSupport.class);