You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/08/04 17:33:21 UTC
svn commit: r428756 - in /tapestry/tapestry-test/trunk: pom.xml
src/java/org/apache/tapestry/BaseComponentTestCase.java
Author: jkuhnert
Date: Fri Aug 4 08:33:20 2006
New Revision: 428756
URL: http://svn.apache.org/viewvc?rev=428756&view=rev
Log:
Updated to 4.1.1-SNAPSHOT version, upgraded testng version to 5.0.2
Modified:
tapestry/tapestry-test/trunk/pom.xml
tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java
Modified: tapestry/tapestry-test/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry-test/trunk/pom.xml?rev=428756&r1=428755&r2=428756&view=diff
==============================================================================
--- tapestry/tapestry-test/trunk/pom.xml (original)
+++ tapestry/tapestry-test/trunk/pom.xml Fri Aug 4 08:33:20 2006
@@ -5,7 +5,7 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
<packaging>jar</packaging>
- <version>4.1</version>
+ <version>4.1.1-SNAPSHOT</version>
<description>Tapestry Test Utilities</description>
<name>Tapestry Test</name>
<inceptionYear>2006</inceptionYear>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
- <version>4.1</version>
+ <version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>4.7</version>
+ <version>5.0.2</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
@@ -176,6 +176,10 @@
<groupId>tapestry</groupId>
<artifactId>tapestry</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -195,6 +199,11 @@
</resources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.8-SNAPSHOT</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified: tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java?rev=428756&r1=428755&r2=428756&view=diff
==============================================================================
--- tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ tapestry/tapestry-test/trunk/src/java/org/apache/tapestry/BaseComponentTestCase.java Fri Aug 4 08:33:20 2006
@@ -1,19 +1,7 @@
package org.apache.tapestry;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.checkOrder;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import static org.easymock.EasyMock.*;
+import static org.testng.AssertJUnit.*;
import org.apache.commons.logging.Log;
import org.apache.hivemind.ClassResolver;
@@ -43,6 +31,14 @@
import org.apache.tapestry.test.Creator;
import org.apache.tapestry.web.WebRequest;
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
import com.javaforge.tapestry.testng.TestBase;
/**
@@ -624,4 +620,4 @@
throw new AssertionError("Parameters don't match, expected: <"
+ expected + "> actual: <" + actual + ">");
}
-}
\ No newline at end of file
+}