You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/28 17:01:36 UTC
svn commit: r417777 - in /tapestry/tapestry4/trunk: ./ framework/
framework/src/test/org/apache/tapestry/
framework/src/test/org/apache/tapestry/enhance/
framework/src/test/org/apache/tapestry/test/mock/
Author: jkuhnert
Date: Wed Jun 28 08:01:35 2006
New Revision: 417777
URL: http://svn.apache.org/viewvc?rev=417777&view=rev
Log:
Hooray! TestNG tests working with annotations now. (only with my own special maven-surefire-plugin installation though :( )
Modified:
tapestry/tapestry4/trunk/framework/pom.xml
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/mock/MockContext.java
tapestry/tapestry4/trunk/pom.xml
Modified: tapestry/tapestry4/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/pom.xml?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/framework/pom.xml Wed Jun 28 08:01:35 2006
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -157,8 +156,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
<configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <fork>true</fork>
+ <verbose>true</verbose>
</configuration>
</plugin>
<plugin>
@@ -256,11 +264,11 @@
</plugins>
</reporting>
- <repositories>
- <repository>
+ <pluginRepositories>
+ <pluginRepository>
<id>apache.snapshots</id>
- <url>http://apache.org/maven-snapshot-repository</url>
- </repository>
- </repositories>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Wed Jun 28 08:01:35 2006
@@ -54,7 +54,6 @@
import org.apache.tapestry.spec.IParameterSpecification;
import org.apache.tapestry.test.Creator;
import org.apache.tapestry.web.WebRequest;
-import org.testng.annotations.Test;
import com.javaforge.tapestry.testng.TestBase;
@@ -67,8 +66,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-@Test
-public abstract class BaseComponentTestCase extends TestBase
+public class BaseComponentTestCase extends TestBase
{
private Creator _creator;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java Wed Jun 28 08:01:35 2006
@@ -27,7 +27,7 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public abstract class BaseEnhancementTestCase extends BaseComponentTestCase
+public class BaseEnhancementTestCase extends BaseComponentTestCase
{
public IComponentSpecification newSpec(Location location)
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestAutowireWorker.java Wed Jun 28 08:01:35 2006
@@ -36,7 +36,7 @@
private static final String HELLO_SERVICE_PROPERTY = "helloService";
- @Test
+ @Test(alwaysRun = true)
public void testWithNoService() throws Exception
{
assertNotAutowired( RegistryBuilder.constructDefaultRegistry() );
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMetaWorker.java Wed Jun 28 08:01:35 2006
@@ -53,6 +53,7 @@
return newMock(ComponentPropertySource.class);
}
+ @Test
public void testPrimitive()
{
Location l = newLocation();
@@ -92,6 +93,7 @@
verify();
}
+ @Test
public void testCharacter()
{
Location l = newLocation();
@@ -131,6 +133,7 @@
verify();
}
+ @Test
public void testObject()
{
Location l = newLocation();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/mock/MockContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/mock/MockContext.java?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/mock/MockContext.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/test/mock/MockContext.java Wed Jun 28 08:01:35 2006
@@ -189,6 +189,11 @@
return null;
}
+ public String getContextPath()
+ {
+ return null;
+ }
+
public String getServerInfo()
{
return "Tapestry Mock Objects";
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=417777&r1=417776&r2=417777&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Wed Jun 28 08:01:35 2006
@@ -177,6 +177,12 @@
<artifactId>tapestry-testng</artifactId>
<version>0.0.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>tapestry</groupId>
+ <artifactId>tapestry</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
@@ -233,7 +239,7 @@
<repositories>
<repository>
<id>apache.snapshots</id>
- <url>http://apache.org/maven-snapshot-repository</url>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
</repository>
<repository>
<id>tapestry.javaforge</id>