From: Olivier Lamy <olamy@apache.org>
Date: Mon, 6 Jan 2014 05:31:47 +0000 (+0000)
Subject: take care of http method
X-Git-Tag: archiva-2.0.0-RC1~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d0bd0ec1189e8f1819059034f5725e2bc6708912;p=archiva.git

take care of http method

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1555673 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
index 8ac5e6bf8..15ac54326 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
@@ -539,15 +539,29 @@ public abstract class AbstractRepositoryServletTestCase
     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 AbstractRepositoryServletTestCase
             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 AbstractRepositoryServletTestCase
         {
             super( new URL( url ), HttpMethod.PUT );
             this.url = url;
-
         }
 
 
@@ -631,7 +644,7 @@ public abstract class AbstractRepositoryServletTestCase
         public WebResponse getResponse( WebRequest request )
             throws Exception
         {
-            return abstractRepositoryServletTestCase.getWebResponse( request.getUrl().getPath() );
+            return abstractRepositoryServletTestCase.getWebResponse( request );
         }
 
         public WebResponse getResource( WebRequest request )