Author: jdcasey
Date: Wed Jul 30 14:36:43 2008
New Revision: 681211
URL: http://svn.apache.org/viewvc?rev=681211&view=rev
Log:
Splitting into two tests for clarity.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java?rev=681211&r1=681210&r2=681211&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
Wed Jul 30 14:36:43 2008
@@ -9,11 +9,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.StringUtils;
import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.util.StringUtils;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.Server;
@@ -30,7 +29,7 @@
throws Exception
{
Handler handler = new AbstractHandler()
- {
+ {
public void handle( String target, HttpServletRequest request,
HttpServletResponse response, int dispatch )
throws IOException, ServletException
{
@@ -45,7 +44,7 @@
{
response.setStatus( HttpServletResponse.SC_NOT_FOUND );
}
-
+
( (Request) request ).setHandled( true );
}
};
@@ -65,10 +64,7 @@
server.stop();
}
- /**
- * Test that HTTP proxy is used for HTTP and for WebDAV.
- */
- public void testmng3599useHttpProxyForWebDAV()
+ public void testmng3599useHttpProxyForHttp()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3599-useHttpProxyForWebDAV" );
@@ -90,13 +86,34 @@
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar" );
- verifier.assertArtifactContents( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar", "some content\n" );
+ verifier.assertArtifactContents( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar",
+ "some content\n" );
+ }
+ /**
+ * Test that HTTP proxy is used for HTTP and for WebDAV.
+ */
+ public void testmng3599useHttpProxyForWebDAV()
+ throws Exception
+ {
// Doesn't work until 2.0.11+
// TODO: reinstate for 2.1 when WebDAV works
if ( matchesVersionRange( "(2.0.10,2.0.99)" ) )
{
- newSettings = StringUtils.replace( settings, "@protocol@", "dav" );
+ File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-3599-useHttpProxyForWebDAV" );
+
+ String settings = FileUtils.fileRead( new File( testDir,
"settings.xml.template" ) );
+ settings = StringUtils.replace( settings, "@port@",
Integer.toString( port ) );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ List cliOptions = new ArrayList();
+ cliOptions.add( "--settings" );
+ cliOptions.add( "settings.xml" );
+
+ verifier.setCliOptions( cliOptions );
+
+ String newSettings = StringUtils.replace( settings, "@protocol@",
"dav" );
FileUtils.fileWrite( new File( testDir, "settings.xml"
).getAbsolutePath(), newSettings );
verifier.deleteArtifact( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar" );
@@ -105,12 +122,12 @@
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar" );
- verifier.assertArtifactContents( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar", "some content\n" );
+ verifier.assertArtifactContents( "org.apache.maven.its.mng3599",
"test-dependency", "1.0", "jar",
+ "some content\n" );
}
else
{
- System.out.print( " [skipping DAV test for < 2.0.10 / 2.1 alpha]"
);
+ System.out.print( " [skipping DAV test for Maven versions < 2.0.10
/ 2.1 alpha]" );
}
}
}
-
