Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

follow redirect as previous testing tool did 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1555675 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2014-01-06 05:32:07 +00:00
parent 69c9ae20de
commit 91af8c3d5a
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
View File

@ -135,7 +135,6 @@ public abstract class AbstractRepositoryServletTestCase
} }
FileUtils.copyFile( testConf, testConfDest ); FileUtils.copyFile( testConf, testConfDest );
repoRootInternal = new File( appserverBase, "data/repositories/internal" ); repoRootInternal = new File( appserverBase, "data/repositories/internal" );
repoRootLegacy = new File( appserverBase, "data/repositories/legacy" ); repoRootLegacy = new File( appserverBase, "data/repositories/legacy" );
Configuration config = archivaConfiguration.getConfiguration(); Configuration config = archivaConfiguration.getConfiguration();
@ -508,10 +507,10 @@ public abstract class AbstractRepositoryServletTestCase
protected WebResponse getWebResponse( String path ) protected WebResponse getWebResponse( String path )
throws Exception throws Exception
{ {
return getWebResponse( new GetMethodWebRequest( "http://localhost" + path ) ); return getWebResponse( new GetMethodWebRequest( "http://localhost" + path ) );//, false );
} }
protected WebResponse getWebResponse( WebRequest webRequest ) protected WebResponse getWebResponse( WebRequest webRequest ) //, boolean followRedirect )
throws Exception throws Exception
{ {
@ -527,6 +526,14 @@ public abstract class AbstractRepositoryServletTestCase
final MockHttpServletResponse response = execute( request ); final MockHttpServletResponse response = execute( request );
if ( response.getStatus() == HttpServletResponse.SC_MOVED_PERMANENTLY
|| response.getStatus() == HttpServletResponse.SC_MOVED_TEMPORARILY )
{
String location = response.getHeader( "Location" );
log.debug("follow redirect to {}", location);
return getWebResponse( new GetMethodWebRequest( location ) );
}
return new WebResponse( null, null, 1 ) return new WebResponse( null, null, 1 )
{ {
@Override @Override
@ -608,7 +615,14 @@ public abstract class AbstractRepositoryServletTestCase
public WebResponse getResponse( WebRequest request ) public WebResponse getResponse( WebRequest request )
throws Exception throws Exception
{ {
return abstractRepositoryServletTestCase.getWebResponse( request ); return getResponse( request, false );
}
public WebResponse getResponse( WebRequest request, boolean followRedirect )
throws Exception
{
// alwasy following redirect as it's normal
return abstractRepositoryServletTestCase.getWebResponse( request );//, followRedirect );
} }
public WebResponse getResource( WebRequest request ) public WebResponse getResource( WebRequest request )

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
View File

@ -99,7 +99,7 @@ public class RepositoryServletBrowseTest
WebRequest request = WebRequest request =
new GetMethodWebRequest( "http://machine.com/repository/internal/org/apache/archiva/artifactId" ); new GetMethodWebRequest( "http://machine.com/repository/internal/org/apache/archiva/artifactId" );
WebResponse response = getServletUnitClient().getResponse( request ); WebResponse response = getServletUnitClient().getResponse( request, true );
assertEquals( "1st Response", HttpServletResponse.SC_OK, response.getStatusCode() ); assertEquals( "1st Response", HttpServletResponse.SC_OK, response.getStatusCode() );
request = new GetMethodWebRequest( "http://machine.com/repository/internal/org/apache/archiva/artifactId/" ); request = new GetMethodWebRequest( "http://machine.com/repository/internal/org/apache/archiva/artifactId/" );