You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/23 19:01:07 UTC
svn commit: r679131 -
/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
Author: jdcasey
Date: Wed Jul 23 10:01:07 2008
New Revision: 679131
URL: http://svn.apache.org/viewvc?rev=679131&view=rev
Log:
adjusting User-Agent formatting.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java?rev=679131&r1=679130&r2=679131&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Wed Jul 23 10:01:07 2008
@@ -72,12 +72,12 @@
// NOTE: system property for maven.version may not exist if you use -Dtest
// surefire parameter to run this single test. Therefore, the plugin writes
// the maven version into the check file.
- String mavenVersion = (String) lines.get( 0 );
+ String mavenVersion = ((String) lines.get( 0 )).substring( 0, 3 );
String javaVersion = (String) lines.get( 1 );
String os = (String) lines.get( 2 ) + " " + (String) lines.get( 3 );
String artifactVersion = (String) lines.get( 4 );
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " maven-artifact/" + artifactVersion + " (Java " + javaVersion + "; " + os + ")", userAgent );
+ assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java " + javaVersion + "; " + os + ")" + " maven-artifact/" + artifactVersion, userAgent );
// test webdav
cliOptions = new ArrayList();
@@ -91,7 +91,7 @@
userAgent = s.userAgent;
assertNotNull( userAgent );
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " maven-artifact/" + artifactVersion + " (Java " + javaVersion + "; " + os + ")", userAgent );
+ assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java " + javaVersion + "; " + os + ")" + " maven-artifact/" + artifactVersion, userAgent );
// test settings with no config
@@ -107,7 +107,7 @@
userAgent = s.userAgent;
assertNotNull( userAgent );
- assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " maven-artifact/" + artifactVersion + " (Java " + javaVersion + "; " + os + ")", userAgent );
+ assertEquals( "Comparing User-Agent '" + userAgent + "'", "Apache-Maven/" + mavenVersion + " (Java " + javaVersion + "; " + os + ")" + " maven-artifact/" + artifactVersion, userAgent );
// test settings with config
@@ -181,11 +181,7 @@
Logger.getLogger( Server.class.getName() ).fine( line );
if ( line.startsWith( "User-Agent:" ) )
{
- userAgent = line.substring( "User-Agent: ".length() );
- while( userAgent.startsWith( " " ) )
- {
- userAgent = userAgent.substring( 1 );
- }
+ userAgent = line.replaceAll( "User-Agent:\\s+", "" );
break;
}