You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/05/01 10:20:24 UTC
svn commit: r1098228 -
/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
Author: hboutemy
Date: Sun May 1 08:20:24 2011
New Revision: 1098228
URL: http://svn.apache.org/viewvc?rev=1098228&view=rev
Log:
improved test output in case of failure to understand what's happening on Apache's Jenkins
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh?rev=1098228&r1=1098227&r2=1098228&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Sun May 1 08:20:24 2011
@@ -45,19 +45,20 @@ try
System.err.println( "index.jsp file is missing or a directory." );
return false;
}
- FileInputStream fis = new FileInputStream ( param );
- String paramContent = IOUtil.toString ( fis );
+ String paramContent = FileUtils.fileRead( param );
- String javaVersion = System.getProperty("java.version");
+ String javaVersion = System.getProperty( "java.version" );
int indexOf = paramContent.indexOf( "<td>java version : " + javaVersion + "</td>" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
- System.err.println( "index.jsp not contains <td>java version : " + javaVersion + "</td>" );
+ paramContent = paramContent.substring( paramContent.indexOf( "<td>java version : " ) );
+ System.err.println( "index.jsp not contains <td>java version : " + javaVersion + "</td> but "
+ + paramContent.substring( 0, paramContent.indexOf( "</td>" ) + 5 ) );
return false;
}
- indexOf = paramContent.indexOf("<td>okitworks</td>");
- if ( indexOf < 0)
+ indexOf = paramContent.indexOf("<td>okitworks</td>" );
+ if ( indexOf < 0 )
{
System.err.println( "index.jsp not contains <td>okitworks</td>" );
return false;