mirror of
https://github.com/apache/maven.git
synced 2025-02-08 19:15:12 +00:00
enhance it for additionnal http headers in settings
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@1213217 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
184828548d
commit
c0cfff9e60
@ -47,6 +47,8 @@ public class MavenITmng3652UserAgentHeaderTest
|
|||||||
private int port;
|
private int port;
|
||||||
|
|
||||||
private String userAgent;
|
private String userAgent;
|
||||||
|
|
||||||
|
private String customHeader;
|
||||||
|
|
||||||
public MavenITmng3652UserAgentHeaderTest()
|
public MavenITmng3652UserAgentHeaderTest()
|
||||||
{
|
{
|
||||||
@ -65,6 +67,8 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
|
|||||||
|
|
||||||
userAgent = request.getHeader( "User-Agent" );
|
userAgent = request.getHeader( "User-Agent" );
|
||||||
|
|
||||||
|
customHeader = request.getHeader( "Custom-Header" );
|
||||||
|
|
||||||
System.out.println( "Got User-Agent: '" + userAgent + "'" );
|
System.out.println( "Got User-Agent: '" + userAgent + "'" );
|
||||||
|
|
||||||
response.setContentType( "text/plain" );
|
response.setContentType( "text/plain" );
|
||||||
@ -258,7 +262,8 @@ public void testmng3652_UserAgentConfiguredInSettings()
|
|||||||
throws Exception
|
throws Exception
|
||||||
{
|
{
|
||||||
// customizing version not supported in Maven 3
|
// 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 testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3652" );
|
||||||
File pluginDir = new File( testDir, "test-plugin" );
|
File pluginDir = new File( testDir, "test-plugin" );
|
||||||
@ -287,6 +292,43 @@ public void testmng3652_UserAgentConfiguredInSettings()
|
|||||||
assertNotNull( userAgent );
|
assertNotNull( userAgent );
|
||||||
|
|
||||||
assertEquals( "Maven Fu", 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" );
|
||||||
|
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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getMavenUAVersion( String mavenVersion )
|
private String getMavenUAVersion( String mavenVersion )
|
||||||
|
@ -8,6 +8,10 @@
|
|||||||
<name>User-Agent</name>
|
<name>User-Agent</name>
|
||||||
<value>Maven Fu</value>
|
<value>Maven Fu</value>
|
||||||
</property>
|
</property>
|
||||||
|
<property>
|
||||||
|
<name>Custom-Header</name>
|
||||||
|
<value>My wonderful header</value>
|
||||||
|
</property>
|
||||||
</httpHeaders>
|
</httpHeaders>
|
||||||
</configuration>
|
</configuration>
|
||||||
</server>
|
</server>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user