Author: olamy
Date: Mon Dec 12 12:44:24 2011
New Revision: 1213217
URL: http://svn.apache.org/viewvc?rev=1213217&view=rev
Log:
enhance it for additionnal http headers in settings
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java?rev=1213217&r1=1213216&r2=1213217&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
Mon Dec 12 12:44:24 2011
@@ -47,6 +47,8 @@ public class MavenITmng3652UserAgentHead
private int port;
private String userAgent;
+
+ private String customHeader;
public MavenITmng3652UserAgentHeaderTest()
{
@@ -65,6 +67,8 @@ public class MavenITmng3652UserAgentHead
userAgent = request.getHeader( "User-Agent" );
+ customHeader = request.getHeader( "Custom-Header" );
+
System.out.println( "Got User-Agent: '" + userAgent + "'" );
response.setContentType( "text/plain" );
@@ -258,7 +262,44 @@ public class MavenITmng3652UserAgentHead
throws Exception
{
// customizing version not supported in Maven 3
- requiresMavenVersion( "(,3.0-beta-3)" );
+ //requiresMavenVersion( "(,3.0-beta-3)" );
+ requiresMavenVersion("[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,)");
+
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3652" );
+ File pluginDir = new File( testDir, "test-plugin" );
+ File projectDir = new File( testDir, "test-project" );
+
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote"
);
+ verifier.executeGoal( "install" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
+
+ // test settings with config
+
+ verifier.getCliOptions().add( "-DtestPort=" + port );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.getCliOptions().add( "-X" );
+
+ verifier.setLogFileName( "log-configWithUserAgent.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ String userAgent = this.userAgent;
+ assertNotNull( userAgent );
+
+ assertEquals( "Maven Fu", userAgent );
+ assertEquals( "My wonderful header", customHeader );
+ }
+
+ public void testmng3652_AddutionnalHttpHeaderConfiguredInSettings()
+ throws Exception
+ {
+ // customizing version not supported in Maven 3
+ requiresMavenVersion("[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,)");
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3652" );
File pluginDir = new File( testDir, "test-plugin" );
@@ -287,6 +328,7 @@ public class MavenITmng3652UserAgentHead
assertNotNull( userAgent );
assertEquals( "Maven Fu", userAgent );
+ assertEquals( "My wonderful header", customHeader );
}
private String getMavenUAVersion( String mavenVersion )
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml?rev=1213217&r1=1213216&r2=1213217&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
Mon Dec 12 12:44:24 2011
@@ -8,6 +8,10 @@
<name>User-Agent</name>
<value>Maven Fu</value>
</property>
+ <property>
+ <name>Custom-Header</name>
+ <value>My wonderful header</value>
+ </property>
</httpHeaders>
</configuration>
</server>
