Author: hlship
Date: Tue Jun 6 14:46:48 2006
New Revision: 412221
URL: http://svn.apache.org/viewvc?rev=412221&view=rev
Log:
Update tests to work under Maven Surefire (using version 2.2 of the plugin).
Modified:
tapestry/tapestry5/tapestry-core/trunk/pom.xml
tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
Modified: tapestry/tapestry5/tapestry-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/pom.xml?rev=412221&r1=412220&r2=412221&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/pom.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/pom.xml Tue Jun 6 14:46:48 2006
@@ -66,6 +66,16 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj?rev=412221&r1=412220&r2=412221&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj
Tue Jun 6 14:46:48 2006
@@ -45,7 +45,7 @@
{
private final ReadWriteLock _lock = new ReentrantReadWriteLock();
- private static class ThreadBoolean extends ThreadLocal<Boolean>
+ public static class ThreadBoolean extends ThreadLocal<Boolean>
{
@Override
protected Boolean initialValue()
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java?rev=412221&r1=412220&r2=412221&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java
Tue Jun 6 14:46:48 2006
@@ -229,7 +229,8 @@
assertEquals(tokens.size(), 9);
- Location l = get(tokens, 2).getLocation();
+ TemplateToken templateToken = get(tokens, 2);
+ Location l = templateToken.getLocation();
AttributeToken t1 = get(tokens, 3);
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java?rev=412221&r1=412220&r2=412221&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java
Tue Jun 6 14:46:48 2006
@@ -31,6 +31,7 @@
import javassist.CtClass;
import javassist.CtMethod;
import javassist.CtNewMethod;
+import javassist.LoaderClassPath;
import javassist.NotFoundException;
import org.apache.hivemind.ClassResolver;
@@ -174,7 +175,10 @@
private void createSynthComponentClass(String name) throws
CannotCompileException,
NotFoundException, IOException
{
- ClassPool pool = new ClassPool(true);
+ ClassPool pool = new ClassPool();
+ // Inside Maven Surefire, the system classpath is not sufficient to
find all
+ // the necessary files.
+ pool.appendClassPath(new
LoaderClassPath(currentThread().getContextClassLoader()));
CtClass ctClass = pool.makeClass(SYNTH_COMPONENT_CLASSNAME);
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java?rev=412221&r1=412220&r2=412221&view=diff
==============================================================================
---
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
(original)
+++
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java
Tue Jun 6 14:46:48 2006
@@ -24,6 +24,7 @@
import javassist.CtClass;
import javassist.CtMethod;
import javassist.Loader;
+import javassist.LoaderClassPath;
import javassist.NotFoundException;
import org.apache.tapestry.annotations.ComponentClass;
@@ -68,7 +69,9 @@
public void setupClassPool()
{
_classPool = new ClassPool();
- _classPool.appendSystemPath();
+ // Inside Maven Surefire, the system classpath is not sufficient to
find all
+ // the necessary files.
+ _classPool.appendClassPath(new
LoaderClassPath(currentThread().getContextClassLoader()));
}
private CtClass findCtClass(Class targetClass) throws NotFoundException
