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/12/22 00:41:36 UTC
svn commit: r489506 - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/test/
test/java/org/apache/tapestry/internal/services/
Author: hlship
Date: Thu Dec 21 15:41:36 2006
New Revision: 489506
URL: http://svn.apache.org/viewvc?view=rev&rev=489506
Log:
Push down some method in TapestryTestCase that belong in specific test cases instead.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.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=489506&r1=489505&r2=489506
==============================================================================
--- 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 Dec 21 15:41:36 2006
@@ -24,13 +24,10 @@
import java.io.IOException;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
-import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -47,7 +44,6 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.ServiceLocator;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.apache.tapestry.model.ComponentModel;
@@ -60,14 +56,14 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry.services.Context;
import org.apache.tapestry.services.FieldValidatorSource;
import org.apache.tapestry.services.InjectionProvider;
import org.apache.tapestry.services.MethodFilter;
import org.apache.tapestry.services.MethodSignature;
-import org.apache.tapestry.services.ResourceDigestGenerator;
-import org.apache.tapestry.services.Context;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.RequestHandler;
+import org.apache.tapestry.services.ResourceDigestGenerator;
import org.apache.tapestry.services.Response;
import org.apache.tapestry.services.Session;
import org.apache.tapestry.services.ValidationMessagesSource;
@@ -81,9 +77,6 @@
public abstract class TapestryTestCase extends IOCTestCase
{
- protected final Resource _simpleComponentResource = new ClasspathResource(
- "org/apache/tapestry/internal/services/SimpleComponent.class");
-
protected final void train_findFieldsWithAnnotation(ClassTransformation transformation,
Class<? extends Annotation> annotationClass, String... fieldNames)
{
@@ -145,36 +138,6 @@
sleep(50);
}
- }
-
- /**
- * Creates a new class loader, whose parent is the thread's context class loader, but adds a
- * single classpath root from the filesystem.
- *
- * @see #createClasspathRoot()
- */
- protected final URLClassLoader newLoaderWithClasspathRoot(File rootDir)
- throws MalformedURLException
- {
- String urlPath = rootDir.toURL().toString();
- // URLs for folders must end with a slash to make URLClassLoader happy.
- URL url = new URL(urlPath + "/");
-
- return new URLClassLoader(new URL[]
- { url }, Thread.currentThread().getContextClassLoader());
- }
-
- /**
- * Creates a new temporary directory which can act as a classpath root.
- *
- * @see #newLoaderWithClasspathRoot(File)
- */
- protected final File createClasspathRoot()
- {
- String temp = System.getProperty("java.io.tmpdir");
- String rootDirPath = temp + "/" + UUID.randomUUID().toString();
-
- return new File(rootDirPath);
}
protected final ComponentClassResolver newComponentClassResolver()
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java?view=diff&rev=489506&r1=489505&r2=489506
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java Thu Dec 21 15:41:36 2006
@@ -19,6 +19,7 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.internal.util.URLChangeTracker;
import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
import org.apache.tapestry.model.ComponentModel;
import org.testng.annotations.Test;
@@ -37,6 +38,9 @@
private final URLChangeTracker _tracker = new URLChangeTracker();
private final ComponentMessagesSourceImpl _source = new ComponentMessagesSourceImpl(_tracker);
+
+ private final Resource _simpleComponentResource = new ClasspathResource(
+ "org/apache/tapestry/internal/services/SimpleComponent.class");
@Test
public void simple_component()
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=489506&r1=489505&r2=489506
==============================================================================
--- 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 Thu Dec 21 15:41:36 2006
@@ -15,8 +15,11 @@
package org.apache.tapestry.internal.services;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
+import java.util.UUID;
import org.apache.tapestry.events.InvalidationListener;
import org.apache.tapestry.internal.parser.ComponentTemplate;
@@ -36,6 +39,36 @@
static public final String PATH = "org/apache/tapestry/internal/pageload";
private final ClassLoader _loader = Thread.currentThread().getContextClassLoader();
+
+ /**
+ * Creates a new class loader, whose parent is the thread's context class loader, but adds a
+ * single classpath root from the filesystem.
+ *
+ * @see #createClasspathRoot()
+ */
+ protected final URLClassLoader newLoaderWithClasspathRoot(File rootDir)
+ throws MalformedURLException
+ {
+ String urlPath = rootDir.toURL().toString();
+ // URLs for folders must end with a slash to make URLClassLoader happy.
+ URL url = new URL(urlPath + "/");
+
+ return new URLClassLoader(new URL[]
+ { url }, _loader);
+ }
+
+ /**
+ * Creates a new temporary directory which can act as a classpath root.
+ *
+ * @see #newLoaderWithClasspathRoot(File)
+ */
+ protected final File createClasspathRoot()
+ {
+ String temp = System.getProperty("java.io.tmpdir");
+ String rootDirPath = temp + "/" + UUID.randomUUID().toString();
+
+ return new File(rootDirPath);
+ }
@Test
public void caching()