You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/02/04 20:05:27 UTC
svn commit: r740829 - in /maven/mercury/trunk/mercury-it/src/test:
java/org/apache/maven/mercury/repository/tests/
resources/org/apache/maven/mercury/repository/tests/
Author: ogusakov
Date: Wed Feb 4 19:05:27 2009
New Revision: 740829
URL: http://svn.apache.org/viewvc?rev=740829&view=rev
Log:
[MERCURY-77] - started a comprehensive repo test, modified WebDav init procedure
Added:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java (contents, props changed)
- copied, changed from r740646, maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.java
maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.xml (props changed)
- copied unchanged from r740647, maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.xml
Removed:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.java
maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.xml
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java
Copied: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java (from r740646, maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java?p2=maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java&p1=maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.java&r1=740646&r2=740829&rev=740829&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComplexRepositoryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java Wed Feb 4 19:05:27 2009
@@ -36,17 +36,15 @@
import org.apache.maven.mercury.util.FileUtil;
import org.codehaus.plexus.PlexusTestCase;
-import junit.framework.TestCase;
-
/**
- * This set of UTs covers a complex use case,
+ * This set of UTs covers a comprehensive use case,
* involving majority of Mercury repository functionality
*
* @author Oleg Gusakov
* @version $Id$
*
*/
-public class ComplexRepositoryTest
+public class ComprehensiveRepositoryTest
extends PlexusTestCase
{
WebDavServer _server1;
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java?rev=740829&r1=740828&r2=740829&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java Wed Feb 4 19:05:27 2009
@@ -20,6 +20,10 @@
package org.apache.maven.mercury.repository.tests;
import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Servlet;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -71,12 +75,22 @@
ContextHandlerCollection contexts = new ContextHandlerCollection();
setHandler(contexts);
- Context context = new Context(contexts, remotePathFragment, Context.SESSIONS);
+
+ Context context = new Context( contexts, remotePathFragment, Context.SESSIONS );
context.addServlet(new ServletHolder( new WebdavServlet() ), "/*");
- context.setResourceBase( base.getCanonicalPath() );
context.setAttribute( PlexusConstants.PLEXUS_KEY, container );
+ context.setResourceBase( base.getCanonicalPath() );
+
context.setAttribute( "resourceCollectionHint", fileCollectionHint );
- context.setAttribute( "debug", debugLevel );
+ context.setAttribute( "debug", debugLevel+"" );
+
+// Map<String,String> initParams = new HashMap<String, String>(8);
+//
+// initParams.put( "resourceCollectionHint", fileCollectionHint );
+// initParams.put( "debug", debugLevel+"" );
+//
+// context.setInitParams( initParams );
+
}
public int getPort()
Propchange: maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/mercury/trunk/mercury-it/src/test/resources/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.xml
------------------------------------------------------------------------------
svn:mergeinfo =