svn commit: r1555671 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav: AbstractRepositoryServletProxiedTestCase.java RepositoryServletProxiedTimestampedSnapshotPolicyTest.java

[olamy]

Author: olamy
Date: Mon Jan  6 05:31:33 2014
New Revision: 1555671

URL: http://svn.apache.org/r1555671
Log:
fix unit test

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java?rev=1555671&r1=1555670&r2=1555671&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
 Mon Jan  6 05:31:33 2014
@@ -20,8 +20,10 @@ package org.apache.archiva.webdav;
  */
 
 
+import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.WebResponse;
+import com.google.common.io.Files;
 import org.apache.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.archiva.policies.CachedFailuresPolicy;
@@ -34,9 +36,11 @@ import org.eclipse.jetty.server.handler.
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.fest.assertions.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.nio.charset.Charset;
 
@@ -117,7 +121,7 @@ public abstract class AbstractRepository
         RemoteRepoInfo repo = new RemoteRepoInfo();
         repo.id = id;
         repo.context = "/" + id;
-        repo.root = new File( "target/remote-repos/" + id + "/" );
+        repo.root = Files.createTempDir();// new File( System.getProperty( 
"basedir" ) + "target/remote-repos/" + id + "/" );
 
         // Remove exising root contents.
         if ( repo.root.exists() )
@@ -160,10 +164,11 @@ public abstract class AbstractRepository
     protected void assertServerSetupCorrectly( RemoteRepoInfo remoteRepo )
         throws Exception
     {
-        //WebConversation wc = new WebConversation();
-        WebRequest request = new GetMethodWebRequest( remoteRepo.url );
-        WebResponse response = getServletUnitClient().getResponse( request );
-        assertResponseOK( response );
+
+        WebClient client = newClient();
+        int status = client.getPage( remoteRepo.url 
).getWebResponse().getStatusCode();
+        Assertions.assertThat( status ).isEqualTo( HttpServletResponse.SC_OK );
+
     }
 
     private void setupConnector( String repoId, RemoteRepoInfo remoteRepo, 
String releasesPolicy,
@@ -255,6 +260,7 @@ public abstract class AbstractRepository
     {
         remoteSnapshots = createServer( "snapshots" );
 
+
         assertServerSetupCorrectly( remoteSnapshots );
         RemoteRepositoryConfiguration remoteRepositoryConfiguration =
             
archivaConfiguration.getConfiguration().getRemoteRepositoriesAsMap().get( 
remoteSnapshots.id );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java?rev=1555671&r1=1555670&r2=1555671&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
 Mon Jan  6 05:31:33 2014
@@ -43,8 +43,8 @@ public class RepositoryServletProxiedTim
     public void setup()
         throws Exception
     {
-        archivaConfiguration.getConfiguration().setProxyConnectors( new 
ArrayList<ProxyConnectorConfiguration>() );
         super.setUp();
+        archivaConfiguration.getConfiguration().setProxyConnectors( new 
ArrayList<ProxyConnectorConfiguration>() );
     }
 
     @After