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:32:27 UTC
svn commit: r1555677 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav:
AbstractRepositoryServletTestCase.java httpunit/MkColMethodWebRequest.java
Author: olamy
Date: Mon Jan 6 05:32:27 2014
New Revision: 1555677
URL: http://svn.apache.org/r1555677
Log:
fix deployment and mkcol unit test
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.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=1555677&r1=1555676&r2=1555677&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:32:27 2014
@@ -34,10 +34,12 @@ import org.apache.archiva.configuration.
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.apache.archiva.webdav.httpunit.MkColMethodWebRequest;
import org.apache.archiva.webdav.util.MavenIndexerCleaner;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
@@ -520,6 +522,18 @@ public abstract class AbstractRepository
request.setMethod( webRequest.getHttpMethod().name() );
+ if (webRequest.getHttpMethod() == HttpMethod.PUT )
+ {
+ PutMethodWebRequest putRequest = PutMethodWebRequest.class.cast( webRequest );
+ request.setContentType( putRequest.contentType );
+ request.setContent( IOUtils.toByteArray( putRequest.inputStream ) );
+ }
+
+ if ( webRequest instanceof MkColMethodWebRequest )
+ {
+ request.setMethod( "MKCOL" );
+ }
+
final MockHttpServletResponse response = execute( request );
if ( response.getStatus() == HttpServletResponse.SC_MOVED_PERMANENTLY
@@ -594,11 +608,17 @@ public abstract class AbstractRepository
{
String url;
+ InputStream inputStream;
+
+ String contentType;
+
public PutMethodWebRequest( String url, InputStream inputStream, String contentType )
throws Exception
{
super( new URL( url ), HttpMethod.PUT );
this.url = url;
+ this.inputStream = inputStream;
+ this.contentType = contentType;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.java?rev=1555677&r1=1555676&r2=1555677&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.java Mon Jan 6 05:32:27 2014
@@ -20,6 +20,7 @@ package org.apache.archiva.webdav.httpun
*/
+import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.WebRequest;
import java.net.URL;
@@ -37,8 +38,5 @@ public class MkColMethodWebRequest
super( new URL( urlString ) );
}
- public String getMethod()
- {
- return "MKCOL";
- }
+
}