svn commit: r650071 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository: AbstractRepositoryServletTestCase.java RepositoryServletTest.java

[brett]

Author: brett
Date: Mon Apr 21 03:00:35 2008
New Revision: 650071

URL: http://svn.apache.org/viewvc?rev=650071&view=rev
Log:
fix the tests to operate consistently on all platforms

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java?rev=650071&r1=650070&r2=650071&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
 Mon Apr 21 03:00:35 2008
@@ -20,6 +20,7 @@
  */
 
 import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.servletunit.ServletRunner;
 import com.meterware.servletunit.ServletUnitClient;
 import net.sf.ehcache.CacheManager;
@@ -161,6 +162,8 @@
         saveConfiguration( archivaConfiguration );
 
         CacheManager.getInstance().removeCache( "url-failures-cache" );
+
+        HttpUnitOptions.setExceptionsThrownOnErrorStatus( false );             
   
 
         sr = new ServletRunner( getTestFile( "src/test/webapp/WEB-INF/web.xml" 
) );
         sr.registerServlet( "/repository/*", 
UnauthenticatedRepositoryServlet.class.getName() );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java?rev=650071&r1=650070&r2=650071&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
 Mon Apr 21 03:00:35 2008
@@ -117,14 +117,8 @@
         String path = REQUEST_PATH + ".index/filecontent/foo.bar";
 
         WebRequest request = new GetMethodWebRequest( path );
-        try
-        {
-            sc.getResponse( request );
-            fail( "should have been not found" );
-        }
-        catch ( HttpNotFoundException e )
-        {
-            assertEquals( "Error on HTTP request: 404 Invalid path to 
Artifact: legacy paths should have an expected type ending in [s] in the second 
part of the path. 
[http://machine.com/repository/internal/.index/filecontent/foo.bar]";, 
e.getMessage() );
-        }
+        WebResponse response = sc.getResponse( request );
+        assertResponseNotFound( response );
+        assertEquals( "Invalid path to Artifact: legacy paths should have an 
expected type ending in [s] in the second part of the path.", 
response.getResponseMessage() );
     }
 }