svn commit: r1137376 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav: AbstractRepositoryServletTestCase.java RepositoryServletBrowseTest.java

[olamy]

Author: olamy
Date: Sun Jun 19 15:07:34 2011
New Revision: 1137376

URL: http://svn.apache.org/viewvc?rev=1137376&view=rev
Log:
ensure starting unit tests with clean configuration to prevent sporadic failure

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=1137376&r1=1137375&r2=1137376&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java
 Sun Jun 19 15:07:34 2011
@@ -100,25 +100,24 @@ public abstract class AbstractRepository
         }
         FileUtils.copyFile( testConf, testConfDest );
 
-
         archivaConfiguration = applicationContext.getBean( 
ArchivaConfiguration.class );
 
-
         //archivaConfiguration = (ArchivaConfiguration) lookup( 
ArchivaConfiguration.class );
         repoRootInternal = new File( appserverBase, 
"data/repositories/internal" );
         repoRootLegacy = new File( appserverBase, "data/repositories/legacy" );
         Configuration config = archivaConfiguration.getConfiguration();
 
-        if ( !config.getManagedRepositoriesAsMap().containsKey( 
REPOID_INTERNAL ) )
-        {
-            config.addManagedRepository(
-                createManagedRepository( REPOID_INTERNAL, "Internal Test 
Repo", repoRootInternal, true ) );
-        }
-        if ( !config.getManagedRepositoriesAsMap().containsKey( REPOID_LEGACY 
) )
-        {
-            config.addManagedRepository(
-                createManagedRepository( REPOID_LEGACY, "Legacy Format Test 
Repo", repoRootLegacy, "legacy", true ) );
-        }
+        config.getManagedRepositories().clear();
+
+        config.addManagedRepository(
+            createManagedRepository( REPOID_INTERNAL, "Internal Test Repo", 
repoRootInternal, true ) );
+
+        config.addManagedRepository(
+            createManagedRepository( REPOID_LEGACY, "Legacy Format Test Repo", 
repoRootLegacy, "legacy", true ) );
+
+        config.getProxyConnectors().clear();
+
+        config.getRemoteRepositories().clear();
 
         saveConfiguration( archivaConfiguration );
 
@@ -161,7 +160,6 @@ public abstract class AbstractRepository
     }
 
 
-
     protected void assertFileContents( String expectedContents, File repoRoot, 
String path )
         throws IOException
     {

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java?rev=1137376&r1=1137375&r2=1137376&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java
 Sun Jun 19 15:07:34 2011
@@ -86,19 +86,19 @@ public class RepositoryServletBrowseTest
 
         WebRequest request = new GetMethodWebRequest( 
"http://machine.com/repository/internal/org/apache/archiva/artifactId"; );
         WebResponse response = sc.getResponse( request );
-        assertEquals( "Response", HttpServletResponse.SC_OK, 
response.getResponseCode() );
+        assertEquals( "1st Response", HttpServletResponse.SC_OK, 
response.getResponseCode() );
 
         request = new GetMethodWebRequest( 
"http://machine.com/repository/internal/org/apache/archiva/artifactId/"; );
         response = sc.getResponse( request );
-        assertEquals( "Response", HttpServletResponse.SC_OK, 
response.getResponseCode() );
+        assertEquals( "2nd Response", HttpServletResponse.SC_OK, 
response.getResponseCode() );
         
         request = new GetMethodWebRequest( 
"http://machine.com/repository/internal/org/apache/archiva/artifactId/1.0/artifactId-1.0.jar";
 );
         response = sc.getResponse( request );
-        assertEquals( "Response", HttpServletResponse.SC_OK, 
response.getResponseCode() );
+        assertEquals( "3rd Response", HttpServletResponse.SC_OK, 
response.getResponseCode() );
         
         request = new GetMethodWebRequest( 
"http://machine.com/repository/internal/org/apache/archiva/artifactId/1.0/artifactId-1.0.jar/";
 );
         response = sc.getResponse( request );
-        assertEquals( "Response", HttpServletResponse.SC_NOT_FOUND, 
response.getResponseCode() );
+        assertEquals( "4th Response", HttpServletResponse.SC_NOT_FOUND, 
response.getResponseCode() );
     }