You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/01/06 06:31:47 UTC
svn commit: r1555673 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
Author: olamy
Date: Mon Jan 6 05:31:47 2014
New Revision: 1555673
URL: http://svn.apache.org/r1555673
Log:
take care of http method
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=1555673&r1=1555672&r2=1555673&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java Mon Jan 6 05:31:47 2014
@@ -539,15 +539,29 @@ public abstract class AbstractRepository
protected WebResponse getWebResponse( String path )
throws Exception
{
+ return getWebResponse( new GetMethodWebRequest( "http://localhost" + path ) );
+ }
+
+ protected WebResponse getWebResponse( WebRequest webRequest )
+ throws Exception
+ {
//WebClient client = newClient();
//client.getPage( "http://localhost:" + port + "/reinit/reload" );
//return client.getPage( "http://localhost:" + port + path ).getWebResponse();
MockHttpServletRequest request = new MockHttpServletRequest();
- request.setRequestURI( path );
+ request.setRequestURI( webRequest.getUrl().getPath() );
request.addHeader( "User-Agent", "Apache Archiva unit test" );
- request.setMethod( "GET" );
+
+ request.setMethod( webRequest.getHttpMethod().name() );
+
+ /*
+ if (webRequest.getHttpMethod() == HttpMethod.PUT)
+ {
+ request.set
+ } */
+
final MockHttpServletResponse response = execute( request );
return new WebResponse( null, null, 1 )
{
@@ -580,8 +594,8 @@ public abstract class AbstractRepository
public String getContentAsString()
throws UnsupportedEncodingException
{
- String errorMessage = getErrorMessage();
- return ( errorMessage != null ) ? errorMessage: super.getContentAsString();
+ String errorMessage = getErrorMessage();
+ return ( errorMessage != null ) ? errorMessage : super.getContentAsString();
}
};
this.unauthenticatedRepositoryServlet.service( request, response );
@@ -612,7 +626,6 @@ public abstract class AbstractRepository
{
super( new URL( url ), HttpMethod.PUT );
this.url = url;
-
}
@@ -631,7 +644,7 @@ public abstract class AbstractRepository
public WebResponse getResponse( WebRequest request )
throws Exception
{
- return abstractRepositoryServletTestCase.getWebResponse( request.getUrl().getPath() );
+ return abstractRepositoryServletTestCase.getWebResponse( request );
}
public WebResponse getResource( WebRequest request )