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 2007/04/29 22:37:56 UTC

svn commit: r533557 - in /tapestry/tapestry4/trunk: ./ src/site/ src/site/apt/developmentguide/ tapestry-annotations/ tapestry-contrib/ tapestry-contrib/src/test/org/apache/tapestry/contrib/services/ tapestry-examples/TimeTracker/src/java/org/apache/ta...

Author: jkuhnert
Date: Sun Apr 29 13:37:55 2007
New Revision: 533557

URL: http://svn.apache.org/viewvc?view=rev&rev=533557
Log:
-) Updated testng dependencies to use 5.5.

-) Included new page referencing the new tapestry-test site/library.

-) Updated test classes to use new TestBase / test classes provided by tapestry-test.

Added:
    tapestry/tapestry4/trunk/src/site/apt/developmentguide/testing.apt
Modified:
    tapestry/tapestry4/trunk/pom.xml
    tapestry/tapestry4/trunk/src/site/site.xml
    tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
    tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
    tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/services/TestRoundedCornerService.java
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
    tapestry/tapestry4/trunk/tapestry-framework/pom.xml
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/ClientIdPropertyWorker.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/PathEncoderTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/MethodSignatureTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestUploadPart.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/RegexpMatcherTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/SerializableAdaptorTest.java
    tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/TestGzipUtil.java
    tapestry/tapestry4/trunk/tapestry-portlet/pom.xml

Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sun Apr 29 13:37:55 2007
@@ -152,7 +152,7 @@
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymockclassextension</artifactId>
-                <version>2.2</version>
+                <version>2.2.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -206,30 +206,10 @@
             <dependency>
                 <groupId>org.apache.tapestry</groupId>
                 <artifactId>tapestry-test</artifactId>
-                <version>4.1.1-SNAPSHOT</version>
+                <version>4.1.2-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>com.javaforge.tapestry</groupId>
-                <artifactId>tapestry-testng</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-                <scope>provided</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>tapestry</groupId>
-                        <artifactId>tapestry</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.testng</groupId>
-                        <artifactId>testng</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jwebunit</groupId>
-                        <artifactId>jwebunit</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
                 <version>2.2</version>
@@ -237,13 +217,13 @@
             <dependency>
                 <groupId>org.openqa.selenium.client-drivers</groupId>
                 <artifactId>selenium-java-client-driver</artifactId>
-                <version>0.9.1-SNAPSHOT</version>
+                <version>0.9.2-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.openqa.selenium.server</groupId>
                 <artifactId>selenium-server</artifactId>
-                <version>0.9.1-SNAPSHOT</version>
+                <version>0.9.2-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>

Added: tapestry/tapestry4/trunk/src/site/apt/developmentguide/testing.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/apt/developmentguide/testing.apt?view=auto&rev=533557
==============================================================================
--- tapestry/tapestry4/trunk/src/site/apt/developmentguide/testing.apt (added)
+++ tapestry/tapestry4/trunk/src/site/apt/developmentguide/testing.apt Sun Apr 29 13:37:55 2007
@@ -0,0 +1,15 @@
+ ------
+Development Guide - Testing
+ ------
+Jesse Kuhnert
+ ------
+29 Apr 2007
+ ------
+
+Testing Tapestry Components and Pages
+
+  There is a new library available - along with comprehensive documention - covering most of the core testing logic that Tapestry itself uses to test components
+  and pages. Please see that site for more information.
+
+  <<tapestry-test:>> {{http://tapestry.apache.org/tapestry4.1/tapestry-test/index.html}}
+  
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/site.xml?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/src/site/site.xml (original)
+++ tapestry/tapestry4/trunk/src/site/site.xml Sun Apr 29 13:37:55 2007
@@ -78,6 +78,7 @@
             
             <item name="Development Guide" href="/developmentguide/index.html" collapse="true">
                 <item name="Exception Pages" href="/developmentguide/exceptionpages.html" />
+                <item name="Testing" href="/developmentguide/testing.html" />
             </item>
             
             <item name="XHR/DHTML Guide" href="/ajax/index.html" collapse="true">

Modified: tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/pom.xml?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/pom.xml Sun Apr 29 13:37:55 2007
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.1</version>
+            <version>5.5</version>
             <classifier>jdk15</classifier>
             <scope>provided</scope>
         </dependency>

Modified: tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/pom.xml?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/pom.xml Sun Apr 29 13:37:55 2007
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.1</version>
+            <version>5.5</version>
             <classifier>jdk15</classifier>
             <scope>test</scope>
         </dependency>

Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/services/TestRoundedCornerService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/services/TestRoundedCornerService.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/services/TestRoundedCornerService.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/services/TestRoundedCornerService.java Sun Apr 29 13:37:55 2007
@@ -1,6 +1,6 @@
 package org.apache.tapestry.contrib.services;
 
-import com.javaforge.tapestry.testng.TestBase;
+import org.apache.tapestry.TestBase;
 import org.apache.tapestry.contrib.services.impl.RoundedCornerGenerator;
 import org.testng.annotations.Test;
 

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java Sun Apr 29 13:37:55 2007
@@ -87,7 +87,7 @@
     public abstract TaskDao getTaskDao();
     
     public abstract ResponseBuilder getBuilder();
-    
+
     /**
      * Selection model for projects.
      * 

Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Sun Apr 29 13:37:55 2007
@@ -110,24 +110,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.javaforge.tapestry</groupId>
-            <artifactId>tapestry-testng</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tapestry</groupId>
-                    <artifactId>tapestry</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.testng</groupId>
-                    <artifactId>testng</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jwebunit</groupId>
-                    <artifactId>jwebunit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.apache.tapestry</groupId>
             <artifactId>tapestry-test</artifactId>
             <exclusions>

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/ClientIdPropertyWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/ClientIdPropertyWorker.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/ClientIdPropertyWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/ClientIdPropertyWorker.java Sun Apr 29 13:37:55 2007
@@ -13,9 +13,6 @@
 // limitations under the License.
 package org.apache.tapestry.enhance;
 
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
-
 import org.apache.hivemind.ErrorLog;
 import org.apache.hivemind.Location;
 import org.apache.hivemind.service.MethodSignature;
@@ -23,6 +20,9 @@
 import org.apache.tapestry.event.PageDetachListener;
 import org.apache.tapestry.spec.IComponentSpecification;
 
+import java.lang.reflect.Modifier;
+import java.util.Iterator;
+
 
 /**
  * Enhances the {@link org.apache.tapestry.IComponent#getClientId()} property.
@@ -74,8 +74,6 @@
         op.addField(fieldName, propertyType);
         op.addField(defaultFieldName, propertyType);
         
-        // EnhanceUtils.createSimpleAccessor(op, fieldName, name, propertyType, location);
-        
         String methodName = op.getAccessorMethodName(name);
         
         // Build special getter logic 
@@ -93,7 +91,6 @@
         // else return the existing clientId
         
         str.append("return ").append(fieldName).append(";");
-        
         str.append("}");
         
         op.addMethod(

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java Sun Apr 29 13:37:55 2007
@@ -13,19 +13,17 @@
 // limitations under the License.
 package org.apache.tapestry.asset;
 
-import static org.easymock.EasyMock.*;
-
-import java.net.URLConnection;
-import java.text.DateFormat;
-
 import org.apache.commons.logging.LogFactory;
+import org.apache.tapestry.TestBase;
 import org.apache.tapestry.web.WebRequest;
 import org.apache.tapestry.web.WebResponse;
+import static org.easymock.EasyMock.checkOrder;
+import static org.easymock.EasyMock.expect;
 import org.testng.annotations.Test;
 
-import com.javaforge.tapestry.testng.TestBase;
-
 import javax.servlet.http.HttpServletResponse;
+import java.net.URLConnection;
+import java.text.DateFormat;
 
 
 /**
@@ -34,8 +32,7 @@
  * @author jkuhnert
  */
 @Test(sequential=true)
-public class TestAssetService extends TestBase
-{   
+public class TestAssetService extends TestBase {
     
     public void test_Cached_Resource_Null_Modified()
     {

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java Sun Apr 29 13:37:55 2007
@@ -14,16 +14,14 @@
 
 package org.apache.tapestry.engine.encoders;
 
-import static org.easymock.EasyMock.expect;
-
 import org.apache.tapestry.Tapestry;
+import org.apache.tapestry.TestBase;
 import org.apache.tapestry.asset.AssetService;
 import org.apache.tapestry.engine.ServiceEncoding;
 import org.apache.tapestry.services.ServiceConstants;
+import static org.easymock.EasyMock.expect;
 import org.testng.annotations.Test;
 
-import com.javaforge.tapestry.testng.TestBase;
-
 /**
  * Tests for {@link org.apache.tapestry.engine.encoders.AssetEncoder}.
  * 
@@ -31,8 +29,7 @@
  * @since 4.0
  */
 @Test
-public class AssetEncoderTest extends TestBase
-{
+public class AssetEncoderTest extends TestBase {
     public void test_Wrong_Service()
     {
         ServiceEncoding encoding = newEncoding();

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/PathEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/PathEncoderTest.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/PathEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/encoders/PathEncoderTest.java Sun Apr 29 13:37:55 2007
@@ -1,6 +1,6 @@
 package org.apache.tapestry.engine.encoders;
 
-import com.javaforge.tapestry.testng.TestBase;
+import org.apache.tapestry.TestBase;
 import org.apache.tapestry.engine.ServiceEncoding;
 import org.apache.tapestry.services.ServiceConstants;
 import static org.easymock.EasyMock.expect;

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/MethodSignatureTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/MethodSignatureTest.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/MethodSignatureTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/enhance/MethodSignatureTest.java Sun Apr 29 13:37:55 2007
@@ -13,8 +13,8 @@
 // limitations under the License.
 package org.apache.tapestry.enhance;
 
-import com.javaforge.tapestry.testng.TestBase;
 import org.apache.tapestry.IPage;
+import org.apache.tapestry.TestBase;
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
@@ -25,8 +25,7 @@
  * Tests functionality of {@link MethodSignature} implementations.
  */
 @Test
-public class MethodSignatureTest extends TestBase
-{
+public class MethodSignatureTest extends TestBase {
     // used for non generic tests
     class Simple {
         

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/internal/event/ComponentEventPropertyTest.java Sun Apr 29 13:37:55 2007
@@ -13,7 +13,7 @@
 // limitations under the License.
 package org.apache.tapestry.internal.event;
 
-import com.javaforge.tapestry.testng.TestBase;
+import org.apache.tapestry.TestBase;
 import org.apache.tapestry.event.BrowserEvent;
 import org.testng.annotations.Test;
 
@@ -28,8 +28,7 @@
  * @author jkuhnert
  */
 @Test
-public class ComponentEventPropertyTest extends TestBase
-{
+public class ComponentEventPropertyTest extends TestBase {
 
     public void test_Add_Event_Listener()
     {

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestUploadPart.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestUploadPart.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestUploadPart.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/multipart/TestUploadPart.java Sun Apr 29 13:37:55 2007
@@ -13,20 +13,16 @@
 // limitations under the License.
 package org.apache.tapestry.multipart;
 
-import static org.easymock.EasyMock.*;
-
 import org.apache.commons.fileupload.FileItem;
+import org.apache.tapestry.TestBase;
+import static org.easymock.EasyMock.expect;
 import org.testng.annotations.Test;
 
-import com.javaforge.tapestry.testng.TestBase;
-
-
 /**
  *  Tests functionality of {@link UploadPart}.
  */
 @Test
-public class TestUploadPart extends TestBase
-{
+public class TestUploadPart extends TestBase {
 
     public void test_Windows_File_Name()
     {

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/RegexpMatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/RegexpMatcherTest.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/RegexpMatcherTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/RegexpMatcherTest.java Sun Apr 29 13:37:55 2007
@@ -13,7 +13,7 @@
 // limitations under the License.
 package org.apache.tapestry.util;
 
-import com.javaforge.tapestry.testng.TestBase;
+import org.apache.tapestry.TestBase;
 import org.testng.annotations.Test;
 
 
@@ -21,8 +21,8 @@
  * Tests functionality of {@link RegexpMatcher}.
  */
 @Test
-public class RegexpMatcherTest extends TestBase
-{
+public class RegexpMatcherTest extends TestBase {
+    
     RegexpMatcher _matcher = new RegexpMatcher();
 
     public void test_Basic_Match()

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/SerializableAdaptorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/SerializableAdaptorTest.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/SerializableAdaptorTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/SerializableAdaptorTest.java Sun Apr 29 13:37:55 2007
@@ -1,6 +1,6 @@
 package org.apache.tapestry.util.io;
 
-import com.javaforge.tapestry.testng.TestBase;
+import org.apache.tapestry.TestBase;
 import org.testng.annotations.Test;
 
 import java.util.Locale;

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/TestGzipUtil.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/TestGzipUtil.java?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/TestGzipUtil.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/io/TestGzipUtil.java Sun Apr 29 13:37:55 2007
@@ -13,23 +13,19 @@
 // limitations under the License.
 package org.apache.tapestry.util.io;
 
+import org.apache.tapestry.TestBase;
+import org.apache.tapestry.web.WebRequest;
 import static org.easymock.EasyMock.checkOrder;
 import static org.easymock.EasyMock.expect;
-
-import org.apache.tapestry.web.WebRequest;
 import org.testng.annotations.Test;
 
-import com.javaforge.tapestry.testng.TestBase;
-
-
 /**
  * Tests functionality of {@link GzipUtil} .
  *
  * @author jkuhnert
  */
 @Test
-public class TestGzipUtil extends TestBase
-{
+public class TestGzipUtil extends TestBase {
     
     // for more see http://en.wikipedia.org/wiki/User_agent
     static final String MSIE_5_SUNOS = "Mozilla/4.0 (compatible; MSIE 5.0; SunOS 5.9 sun4u; X11)";

Modified: tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/pom.xml?view=diff&rev=533557&r1=533556&r2=533557
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/pom.xml Sun Apr 29 13:37:55 2007
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.1</version>
+            <version>5.5</version>
             <classifier>jdk15</classifier>
             <scope>test</scope>
         </dependency>