Author: brett
Date: Tue Oct 5 10:58:51 2010
New Revision: 1004610
URL: http://svn.apache.org/viewvc?rev=1004610&view=rev
Log:
simplify as recommended by Benjamin
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java?rev=1004610&r1=1004609&r2=1004610&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
Tue Oct 5 10:58:51 2010
@@ -118,13 +118,14 @@ public class MyMojo
throw new MojoExecutionException( e.getMessage(), e );
}
+ // consistency check to see that we actually spoke to the test server,
helpful for debugging if
+ // the test fails
try
{
- String LS = System.getProperty( "line.separator" );
- String content = FileUtils.fileRead( artifact.getFile() );
- if ( !content.equals( "some content" + LS + LS ) )
+ String content = FileUtils.fileRead( artifact.getFile() ).trim();
+ if ( !content.equals( "some content" ) )
{
- throw new MojoExecutionException( "Expected 'some content\n\n'
but was '" + content + "'" );
+ throw new MojoExecutionException( "Expected 'some content' but
was '" + content + "'" );
}
}
catch ( IOException e )
