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 2006/11/21 03:48:16 UTC
svn commit: r477478 - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/internal/
main/java/org/apache/tapestry/internal/services/
main/java/org/apache/tapestry/internal/test/
main/java/org/apache/tapestry/ioc/internal/util/...
Author: hlship
Date: Mon Nov 20 18:48:14 2006
New Revision: 477478
URL: http://svn.apache.org/viewvc?view=rev&rev=477478
Log:
Continue segragating th Tapestry IOC code
Added:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ClasspathResource.java
- copied, changed from r477473, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TestBase.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
- copied, changed from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
Removed:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TestBase.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/BaseLocatableTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessagesImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodIteratorTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodSignatureTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/InfrastructureContributionTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java Mon Nov 20 18:48:14 2006
@@ -24,10 +24,10 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.events.InvalidationListener;
-import org.apache.tapestry.internal.ClasspathResource;
import org.apache.tapestry.internal.model.MutableComponentModelImpl;
import org.apache.tapestry.ioc.LogSource;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java Mon Nov 20 18:48:14 2006
@@ -23,12 +23,12 @@
import java.util.Set;
import org.apache.tapestry.events.UpdateListener;
-import org.apache.tapestry.internal.ClasspathResource;
import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
import org.apache.tapestry.internal.parser.ComponentTemplate;
import org.apache.tapestry.internal.parser.TemplateToken;
import org.apache.tapestry.internal.util.URLChangeTracker;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.ClasspathResource;
/**
* Service implementation that manages a cache of parsed component templates.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Mon Nov 20 18:48:14 2006
@@ -59,7 +59,7 @@
import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.services.TapestryModule;
import org.apache.tapestry.services.WebRequest;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.easymock.EasyMock;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterSuite;
@@ -69,7 +69,7 @@
* Contains additional factory and training methods related to internal interfaces.
*/
-public class InternalBaseTestCase extends BaseTestCase implements Registry
+public class InternalBaseTestCase extends TapestryTestCase implements Registry
{
private static Registry _registry;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ClasspathResource.java (from r477473, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ClasspathResource.java?view=diff&rev=477478&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java&r1=477473&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ClasspathResource.java&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/ClasspathResource.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/ClasspathResource.java Mon Nov 20 18:48:14 2006
@@ -12,97 +12,94 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
-
-import java.net.URL;
-import java.util.Locale;
-
+package org.apache.tapestry.ioc.internal.util;
+
+import java.net.URL;
+import java.util.Locale;
+
import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
-
-/**
- * Bare-bones, temporary implementation.
- *
- *
- */
-public class ClasspathResource implements Resource
-{
- private final ClassLoader _classLoader;
-
- private final String _path;
-
- private URL _url;
-
- public ClasspathResource(String path)
- {
- this(Thread.currentThread().getContextClassLoader(), path);
- }
-
- public ClasspathResource(ClassLoader classLoader, String path)
- {
- _classLoader = classLoader;
- _path = path;
- }
-
- private ClasspathResource(ClassLoader classLoader, String path, URL url)
- {
- this(classLoader, path);
- _url = url;
- }
-
- public synchronized URL getResourceURL()
- {
- if (_url == null)
- _url = _classLoader.getResource(_path);
-
- return _url;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (obj == null)
- return false;
-
- if (obj == this)
- return true;
-
- if (obj.getClass() != getClass())
- return false;
-
- ClasspathResource other = (ClasspathResource) obj;
-
- return other._classLoader == _classLoader && other._path.equals(_path);
- }
-
- @Override
- public int hashCode()
- {
- return 227 ^ _path.hashCode();
- }
-
- public Resource getLocalization(Locale locale)
- {
- for (String path : new LocalizedNameGenerator(_path, locale))
- {
- URL url = _classLoader.getResource(path);
-
- if (url == null)
- continue;
-
- if (_path.equals(path))
- return this;
-
- return new ClasspathResource(_classLoader, path, url);
- }
-
- return null;
- }
-
- @Override
- public String toString()
- {
- return "classpath:" + _path;
- }
-
-}
+
+/**
+ * Bare-bones, temporary implementation.
+ */
+public class ClasspathResource implements Resource
+{
+ private final ClassLoader _classLoader;
+
+ private final String _path;
+
+ private URL _url;
+
+ public ClasspathResource(String path)
+ {
+ this(Thread.currentThread().getContextClassLoader(), path);
+ }
+
+ public ClasspathResource(ClassLoader classLoader, String path)
+ {
+ _classLoader = classLoader;
+ _path = path;
+ }
+
+ private ClasspathResource(ClassLoader classLoader, String path, URL url)
+ {
+ this(classLoader, path);
+ _url = url;
+ }
+
+ public synchronized URL getResourceURL()
+ {
+ if (_url == null)
+ _url = _classLoader.getResource(_path);
+
+ return _url;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ return false;
+
+ if (obj == this)
+ return true;
+
+ if (obj.getClass() != getClass())
+ return false;
+
+ ClasspathResource other = (ClasspathResource) obj;
+
+ return other._classLoader == _classLoader && other._path.equals(_path);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return 227 ^ _path.hashCode();
+ }
+
+ public Resource getLocalization(Locale locale)
+ {
+ for (String path : new LocalizedNameGenerator(_path, locale))
+ {
+ URL url = _classLoader.getResource(path);
+
+ if (url == null)
+ continue;
+
+ if (_path.equals(path))
+ return this;
+
+ return new ClasspathResource(_classLoader, path, url);
+ }
+
+ return null;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "classpath:" + _path;
+ }
+
+}
Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java?view=auto&rev=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java Mon Nov 20 18:48:14 2006
@@ -0,0 +1,233 @@
+package org.apache.tapestry.ioc.test;
+
+import java.lang.reflect.Method;
+
+import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.Configuration;
+import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.LogSource;
+import org.apache.tapestry.ioc.MappedConfiguration;
+import org.apache.tapestry.ioc.ObjectCreator;
+import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.ServiceBuilderResources;
+import org.apache.tapestry.ioc.ServiceDecorator;
+import org.apache.tapestry.ioc.ServiceLocator;
+import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry.ioc.def.DecoratorDef;
+import org.apache.tapestry.ioc.def.ModuleDef;
+import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry.ioc.services.TypeCoercer;
+
+/** Add factory and trainer methods for the public interfaces of Tapestry IOC. */
+public class IOCTestCase extends TestBase
+{
+
+ protected final Resource newResource()
+ {
+ return newMock(Resource.class);
+ }
+
+ protected final void train_getServiceInterface(ServiceDef def, Class serviceInterface)
+ {
+ def.getServiceInterface();
+ setReturnValue(serviceInterface).atLeastOnce();
+ }
+
+ protected final void train_getServiceId(ServiceDef def, String serviceId)
+ {
+ def.getServiceId();
+ setReturnValue(serviceId).atLeastOnce();
+ }
+
+ protected final ServiceResources newServiceResources()
+ {
+ return newMock(ServiceResources.class);
+ }
+
+ protected final ServiceDef newServiceDef()
+ {
+ return newMock(ServiceDef.class);
+ }
+
+ protected final void train_getServiceLog(ServiceResources resources, Log log)
+ {
+ resources.getServiceLog();
+ setReturnValue(log).atLeastOnce();
+
+ }
+
+ protected final <T> void train_getService(ServiceLocator locator, String serviceId,
+ Class<T> serviceInterface, T service)
+ {
+ locator.getService(serviceId, serviceInterface);
+ setReturnValue(service);
+ }
+
+ protected final <T> void train_getService(ServiceLocator locator, Class<T> serviceInterface,
+ T service)
+ {
+ locator.getService(serviceInterface);
+ setReturnValue(service);
+ }
+
+ protected final void train_createObject(ObjectCreator creator, Object service)
+ {
+ creator.createObject();
+ setReturnValue(service);
+ }
+
+ protected final ObjectCreator newObjectCreator()
+ {
+ return newMock(ObjectCreator.class);
+ }
+
+ protected final void train_getServiceInterface(ServiceResources resources,
+ Class serviceInterface)
+ {
+ resources.getServiceInterface();
+ setReturnValue(serviceInterface).atLeastOnce();
+ }
+
+ protected final void train_getServiceId(ServiceResources resources, String serviceId)
+ {
+ resources.getServiceId();
+ setReturnValue(serviceId).atLeastOnce();
+ }
+
+ protected final void train_createInterceptor(ServiceDecorator decorator, Object coreObject,
+ Object interceptor)
+ {
+ decorator.createInterceptor(coreObject);
+ setReturnValue(interceptor);
+ }
+
+ protected final ServiceDecorator newServiceDecorator()
+ {
+ return newMock(ServiceDecorator.class);
+ }
+
+ protected final void train_getLog(LogSource source, String serviceId, Log log)
+ {
+ source.getLog(serviceId);
+ setReturnValue(log).atLeastOnce();
+ }
+
+ protected final Method findMethod(Class clazz, String methodName)
+ {
+ for (Method method : clazz.getMethods())
+ {
+ if (method.getName().equals(methodName))
+ return method;
+ }
+
+ throw new IllegalArgumentException(String.format(
+ "Class %s does not provide a method named '%s'.",
+ clazz.getName(),
+ methodName));
+ }
+
+ protected final Method findMethod(Object subject, String methodName)
+ {
+ return findMethod(subject.getClass(), methodName);
+ }
+
+ protected final Method findMethod(String methodName)
+ {
+ return findMethod(this, methodName);
+ }
+
+ protected final Configuration newConfiguration()
+ {
+ return newMock(Configuration.class);
+ }
+
+ protected final ServiceLocator newServiceLocator()
+ {
+ return newMock(ServiceLocator.class);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected final <T> OrderedConfiguration<T> newOrderedConfiguration()
+ {
+ return newMock(OrderedConfiguration.class);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected final <K, V> MappedConfiguration<K, V> newMappedConfiguration()
+ {
+ return newMock(MappedConfiguration.class);
+ }
+
+ protected final ContributionDef newContributionDef()
+ {
+ return newMock(ContributionDef.class);
+ }
+
+ protected final ServiceBuilderResources newServiceCreatorResources()
+ {
+ return newMock(ServiceBuilderResources.class);
+ }
+
+ protected final void train_getModuleId(ModuleDef def, String moduleId)
+ {
+ def.getModuleId();
+ setReturnValue(moduleId).atLeastOnce();
+ }
+
+ protected final ModuleDef newModuleDef()
+ {
+ return newMock(ModuleDef.class);
+ }
+
+ protected final void train_matches(DecoratorDef decoratorDef, ServiceDef serviceDef,
+ boolean matches)
+ {
+ decoratorDef.matches(serviceDef);
+ setReturnValue(matches);
+ }
+
+ protected final DecoratorDef newDecoratorDef()
+ {
+ return newMock(DecoratorDef.class);
+ }
+
+ /** Frequently used as a placeholder for an arbitrary service (but its nice and simple). */
+ protected final Runnable newRunnable()
+ {
+ return newMock(Runnable.class);
+ }
+
+ protected final Location newLocation()
+ {
+ return newMock(Location.class);
+ }
+
+ /** Combines a series of lines by forming a string with a line separator after each line. */
+ protected final String join(String... lines)
+ {
+ StringBuilder result = new StringBuilder();
+
+ for (String line : lines)
+ {
+ result.append(line);
+ result.append("\n");
+ }
+
+ return result.toString();
+ }
+
+ protected <S, T> void train_coerce(TypeCoercer coercer, S input, Class<T> expectedType,
+ T coercedValue)
+ {
+ coercer.coerce(input, expectedType);
+ setReturnValue(coercedValue);
+ }
+
+ protected final TypeCoercer newTypeCoercer()
+ {
+ return newMock(TypeCoercer.class);
+ }
+
+}
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TestBase.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java?view=diff&rev=477478&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TestBase.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TestBase.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/test/TestBase.java Mon Nov 20 18:48:14 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry.ioc.test;
import org.apache.commons.logging.Log;
import org.easymock.EasyMock;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java?view=diff&rev=477478&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java Mon Nov 20 18:48:14 2006
@@ -22,7 +22,6 @@
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -33,27 +32,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.LogSource;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.ServiceDecorator;
import org.apache.tapestry.ioc.ServiceLocator;
-import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry.ioc.test.IOCTestCase;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.model.ParameterModel;
@@ -68,12 +53,12 @@
import org.apache.tapestry.services.WebSession;
/**
- * Base test case that adds a number of convienience factory and training methods to
- * {@link org.apache.tapestry.test.TestBase}.
+ * Base test case that adds a number of convienience factory and training methods for the public
+ * interfaces of Tapestry.
*/
-
-public abstract class BaseTestCase extends TestBase
+public abstract class TapestryTestCase extends IOCTestCase
{
+
protected final void train_findFieldsWithAnnotation(ClassTransformation transformation,
Class<? extends Annotation> annotationClass, String... fieldNames)
{
@@ -171,200 +156,6 @@
return new File(rootDirPath);
}
- protected final Resource newResource()
- {
- return newMock(Resource.class);
- }
-
- protected final void train_getServiceInterface(ServiceDef def, Class serviceInterface)
- {
- def.getServiceInterface();
- setReturnValue(serviceInterface).atLeastOnce();
- }
-
- protected final void train_getServiceId(ServiceDef def, String serviceId)
- {
- def.getServiceId();
- setReturnValue(serviceId).atLeastOnce();
- }
-
- protected final ServiceResources newServiceResources()
- {
- return newMock(ServiceResources.class);
- }
-
- protected final ServiceDef newServiceDef()
- {
- return newMock(ServiceDef.class);
- }
-
- protected final void train_getServiceLog(ServiceResources resources, Log log)
- {
- resources.getServiceLog();
- setReturnValue(log).atLeastOnce();
-
- }
-
- protected final <T> void train_getService(ServiceLocator locator, String serviceId,
- Class<T> serviceInterface, T service)
- {
- locator.getService(serviceId, serviceInterface);
- setReturnValue(service);
- }
-
- protected final <T> void train_getService(ServiceLocator locator, Class<T> serviceInterface,
- T service)
- {
- locator.getService(serviceInterface);
- setReturnValue(service);
- }
-
- protected final void train_createObject(ObjectCreator creator, Object service)
- {
- creator.createObject();
- setReturnValue(service);
- }
-
- protected final ObjectCreator newObjectCreator()
- {
- return newMock(ObjectCreator.class);
- }
-
- protected final void train_getServiceInterface(ServiceResources resources,
- Class serviceInterface)
- {
- resources.getServiceInterface();
- setReturnValue(serviceInterface).atLeastOnce();
- }
-
- protected final void train_getServiceId(ServiceResources resources, String serviceId)
- {
- resources.getServiceId();
- setReturnValue(serviceId).atLeastOnce();
- }
-
- protected final void train_createInterceptor(ServiceDecorator decorator, Object coreObject,
- Object interceptor)
- {
- decorator.createInterceptor(coreObject);
- setReturnValue(interceptor);
- }
-
- protected final ServiceDecorator newServiceDecorator()
- {
- return newMock(ServiceDecorator.class);
- }
-
- protected final void train_getLog(LogSource source, String serviceId, Log log)
- {
- source.getLog(serviceId);
- setReturnValue(log).atLeastOnce();
- }
-
- protected final Method findMethod(Class clazz, String methodName)
- {
- for (Method method : clazz.getMethods())
- {
- if (method.getName().equals(methodName))
- return method;
- }
-
- throw new IllegalArgumentException(String.format(
- "Class %s does not provide a method named '%s'.",
- clazz.getName(),
- methodName));
- }
-
- protected final Method findMethod(Object subject, String methodName)
- {
- return findMethod(subject.getClass(), methodName);
- }
-
- protected final Method findMethod(String methodName)
- {
- return findMethod(this, methodName);
- }
-
- protected final Configuration newConfiguration()
- {
- return newMock(Configuration.class);
- }
-
- protected final ServiceLocator newServiceLocator()
- {
- return newMock(ServiceLocator.class);
- }
-
- @SuppressWarnings("unchecked")
- protected final <T> OrderedConfiguration<T> newOrderedConfiguration()
- {
- return newMock(OrderedConfiguration.class);
- }
-
- @SuppressWarnings("unchecked")
- protected final <K, V> MappedConfiguration<K, V> newMappedConfiguration()
- {
- return newMock(MappedConfiguration.class);
- }
-
- protected final ContributionDef newContributionDef()
- {
- return newMock(ContributionDef.class);
- }
-
- protected final ServiceBuilderResources newServiceCreatorResources()
- {
- return newMock(ServiceBuilderResources.class);
- }
-
- protected final void train_getModuleId(ModuleDef def, String moduleId)
- {
- def.getModuleId();
- setReturnValue(moduleId).atLeastOnce();
- }
-
- protected final ModuleDef newModuleDef()
- {
- return newMock(ModuleDef.class);
- }
-
- protected final void train_matches(DecoratorDef decoratorDef, ServiceDef serviceDef,
- boolean matches)
- {
- decoratorDef.matches(serviceDef);
- setReturnValue(matches);
- }
-
- protected final DecoratorDef newDecoratorDef()
- {
- return newMock(DecoratorDef.class);
- }
-
- /** Frequently used as a placeholder for an arbitrary service (but its nice and simple). */
- protected final Runnable newRunnable()
- {
- return newMock(Runnable.class);
- }
-
- protected final Location newLocation()
- {
- return newMock(Location.class);
- }
-
- /** Combines a series of lines by forming a string with a line separator after each line. */
- protected final String join(String... lines)
- {
- StringBuilder result = new StringBuilder();
-
- for (String line : lines)
- {
- result.append(line);
- result.append("\n");
- }
-
- return result.toString();
- }
-
protected final ComponentClassResolver newComponentClassResolver()
{
return newMock(ComponentClassResolver.class);
@@ -498,18 +289,6 @@
{
model.getParameterNames();
setReturnValue(Arrays.asList(names));
- }
-
- protected <S, T> void train_coerce(TypeCoercer coercer, S input, Class<T> expectedType,
- T coercedValue)
- {
- coercer.coerce(input, expectedType);
- setReturnValue(coercedValue);
- }
-
- protected final TypeCoercer newTypeCoercer()
- {
- return newMock(TypeCoercer.class);
}
protected final void train_isInvariant(Binding binding, boolean isInvariant)
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/BaseLocatableTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/BaseLocatableTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/BaseLocatableTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/BaseLocatableTest.java Mon Nov 20 18:48:14 2006
@@ -17,13 +17,13 @@
import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class BaseLocatableTest extends BaseTestCase
+public class BaseLocatableTest extends TapestryTestCase
{
static class LocatableFixture extends BaseLocatable
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java Mon Nov 20 18:48:14 2006
@@ -20,13 +20,13 @@
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class LocationImplTest extends BaseTestCase
+public class LocationImplTest extends TapestryTestCase
{
private final Random _random = new Random();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessagesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessagesImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessagesImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessagesImplTest.java Mon Nov 20 18:48:14 2006
@@ -16,13 +16,13 @@
import org.apache.tapestry.ioc.MessageFormatter;
import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class MessagesImplTest extends BaseTestCase
+public class MessagesImplTest extends TapestryTestCase
{
private final Messages _messages = MessagesImpl.forClass(TargetMessages.class);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java Mon Nov 20 18:48:14 2006
@@ -26,13 +26,13 @@
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.MethodSignature;
import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class ComponentLifecycleMethodWorkerTest extends BaseTestCase
+public class ComponentLifecycleMethodWorkerTest extends TapestryTestCase
{
@Test
public void no_methods_with_annotation()
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java Mon Nov 20 18:48:14 2006
@@ -20,10 +20,10 @@
import java.util.Locale;
import org.apache.tapestry.events.InvalidationListener;
-import org.apache.tapestry.internal.ClasspathResource;
import org.apache.tapestry.internal.parser.ComponentTemplate;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java Mon Nov 20 18:48:14 2006
@@ -18,13 +18,13 @@
import java.util.NoSuchElementException;
import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class EnvironmentImplTest extends BaseTestCase
+public class EnvironmentImplTest extends TapestryTestCase
{
@Test
public void peek_when_empty_returns_null()
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java Mon Nov 20 18:48:14 2006
@@ -22,7 +22,6 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.ClasspathResource;
import org.apache.tapestry.internal.TapestryException;
import org.apache.tapestry.internal.parser.AttributeToken;
import org.apache.tapestry.internal.parser.BodyToken;
@@ -38,7 +37,8 @@
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
@@ -47,7 +47,7 @@
* <p>
* The tests are run sequentially, as they all share a single template parser.
*/
-public class TemplateParserImplTest extends BaseTestCase
+public class TemplateParserImplTest extends TapestryTestCase
{
private TemplateParser newParser(Log log)
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java Mon Nov 20 18:48:14 2006
@@ -16,7 +16,7 @@
import org.apache.tapestry.events.UpdateListener;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InheritanceSearchTest.java Mon Nov 20 18:48:14 2006
@@ -17,7 +17,7 @@
import java.io.Serializable;
import java.util.List;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java Mon Nov 20 18:48:14 2006
@@ -19,7 +19,7 @@
import java.io.OutputStream;
import java.net.URL;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
/** */
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java Mon Nov 20 18:48:14 2006
@@ -29,7 +29,7 @@
import org.apache.tapestry.ioc.internal.DefaultModuleDefImpl;
import org.apache.tapestry.ioc.internal.IOCMessages;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java Mon Nov 20 18:48:14 2006
@@ -29,13 +29,13 @@
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.MethodSignature;
import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class ClassFabImplTest extends BaseTestCase
+public class ClassFabImplTest extends TapestryTestCase
{
private final CtClassSource _source;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java Mon Nov 20 18:48:14 2006
@@ -20,13 +20,13 @@
import org.apache.tapestry.ioc.services.ClassFabUtils;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class ClassFactoryImplTest extends BaseTestCase
+public class ClassFactoryImplTest extends TapestryTestCase
{
public static class BaseClass
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java Mon Nov 20 18:48:14 2006
@@ -16,7 +16,7 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.services.LoggingDecorator;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.xml.sax.SAXParseException;
@@ -28,7 +28,7 @@
*
*
*/
-public class LoggingDecoratorImplTest extends BaseTestCase
+public class LoggingDecoratorImplTest extends TapestryTestCase
{
public interface UpcaseService
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java Mon Nov 20 18:48:14 2006
@@ -18,13 +18,13 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.services.ExceptionTracker;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class ServiceLoggerTest extends BaseTestCase
+public class ServiceLoggerTest extends TapestryTestCase
{
private void try_entry(String methodName, String expected, Object... arguments)
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java Mon Nov 20 18:48:14 2006
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java Mon Nov 20 18:48:14 2006
@@ -17,10 +17,10 @@
import java.util.Locale;
import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
-public class LocalizedNameGeneratorTest extends BaseTestCase
+public class LocalizedNameGeneratorTest extends TapestryTestCase
{
private void run(String path, Locale locale, String... expected)
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java Mon Nov 20 18:48:14 2006
@@ -14,10 +14,10 @@
package org.apache.tapestry.ioc.internal.util;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
-public class OneShotLockTest extends BaseTestCase
+public class OneShotLockTest extends TapestryTestCase
{
private static final String CLASS_NAME = OneShotLockSubject.class.getName();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java Mon Nov 20 18:48:14 2006
@@ -14,14 +14,14 @@
package org.apache.tapestry.ioc.services;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
/**
*
*/
-public class ClassFabUtilsTest extends BaseTestCase
+public class ClassFabUtilsTest extends TapestryTestCase
{
@Test(dataProvider = "provider")
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodIteratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodIteratorTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodIteratorTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodIteratorTest.java Mon Nov 20 18:48:14 2006
@@ -17,13 +17,13 @@
import java.io.IOException;
import java.util.NoSuchElementException;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class MethodIteratorTest extends BaseTestCase
+public class MethodIteratorTest extends TapestryTestCase
{
static interface Play extends Runnable
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodSignatureTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodSignatureTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodSignatureTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/services/MethodSignatureTest.java Mon Nov 20 18:48:14 2006
@@ -20,13 +20,13 @@
import java.lang.reflect.Method;
import java.sql.SQLException;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class MethodSignatureTest extends BaseTestCase
+public class MethodSignatureTest extends TapestryTestCase
{
private MethodSignature find(Class sourceClass, String methodName)
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/InfrastructureContributionTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/InfrastructureContributionTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/InfrastructureContributionTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/InfrastructureContributionTest.java Mon Nov 20 18:48:14 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/BodyBuilderTest.java Mon Nov 20 18:48:14 2006
@@ -14,13 +14,13 @@
package org.apache.tapestry.util;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class BodyBuilderTest extends BaseTestCase
+public class BodyBuilderTest extends TapestryTestCase
{
@Test
public void simple_nesting_and_indentation()
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java Mon Nov 20 18:48:14 2006
@@ -18,7 +18,7 @@
import static org.apache.tapestry.util.Defense.notBlank;
import static org.apache.tapestry.util.Defense.notNull;
-import org.apache.tapestry.test.TestBase;
+import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IntegerRangeTest.java Mon Nov 20 18:48:14 2006
@@ -16,11 +16,11 @@
import java.util.Iterator;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.apache.tapestry.util.IntegerRange;
import org.testng.annotations.Test;
-public class IntegerRangeTest extends BaseTestCase
+public class IntegerRangeTest extends TapestryTestCase
{
@Test
public void start_less_than_finish()
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java?view=diff&rev=477478&r1=477477&r2=477478
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/MethodInvocationBuilderTest.java Mon Nov 20 18:48:14 2006
@@ -19,13 +19,13 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.MethodSignature;
-import org.apache.tapestry.test.BaseTestCase;
+import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
*
*/
-public class MethodInvocationBuilderTest extends BaseTestCase
+public class MethodInvocationBuilderTest extends TapestryTestCase
{
private static final String LOCALE_CLASS_NAME = "java.util.Locale";