You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/07/14 09:57:30 UTC
svn commit: r1146586 - in
/maven/plugins/branches/maven-site-plugin-3.x/src/it: MSITE-265/verify.bsh
MSITE-354/verify.bsh full-reporting/verify.groovy site-deploy/verify.bsh
site-inheritance/verify.bsh site-jar/verify.bsh
Author: ltheussl
Date: Thu Jul 14 07:57:30 2011
New Revision: 1146586
URL: http://svn.apache.org/viewvc?rev=1146586&view=rev
Log:
formatting to sync with trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh?rev=1146586&r1=1146585&r2=1146586&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh Thu Jul 14 07:57:30 2011
@@ -66,17 +66,17 @@ try
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
int indexOf = downloadContent.indexOf( "Download Maven 2.0.7" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "download.html doesn't contain Download Maven 2.0.7" );
return false;
}
- if ( downloadContent.indexOf( "charset=UTF-8" ) < 0)
+ if ( downloadContent.indexOf( "charset=UTF-8" ) < 0 )
{
System.err.println( "download.html doesn't contain 'charset=UTF-8' directive" );
return false;
}
- if ( downloadContent.indexOf( "demo character: € (euro)" ) < 0)
+ if ( downloadContent.indexOf( "demo character: € (euro)" ) < 0 )
{
System.err.println( "download.html doesn't contain euro symbol" );
return false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh?rev=1146586&r1=1146585&r2=1146586&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh Thu Jul 14 07:57:30 2011
@@ -45,7 +45,7 @@ try
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy?rev=1146586&r1=1146585&r2=1146586&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy Thu Jul 14 07:57:30 2011
@@ -19,7 +19,7 @@
*/
assert new File( basedir, 'target/surefire-reports' ).exists();
assert new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).exists();
-content = new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
+content = new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).text;
assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
@@ -39,7 +39,7 @@ assert new File( basedir, 'target/site/t
assert new File( basedir, 'target/site/team-list.html' ).exists();
assert new File( basedir, 'target/site/dependencies.html' ).exists();
-content = new File( basedir, 'target/site/dependencies.html').text;
+content = new File( basedir, 'target/site/dependencies.html' ).text;
assert content.contains( 'junit:junit:jar:3.8.2' );
return true;
\ No newline at end of file
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh?rev=1146586&r1=1146585&r2=1146586&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh Thu Jul 14 07:57:30 2011
@@ -66,13 +66,11 @@ try
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
int indexOf = downloadContent.indexOf( "Download Maven 2.0.7" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "download.html doesn't contain Download Maven 2.0.7" );
return false;
}
-
-
}
catch ( IOException e )
{
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh?rev=1146586&r1=1146585&r2=1146586&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh Thu Jul 14 07:57:30 2011
@@ -60,7 +60,7 @@ try
String content = FileUtils.fileRead( index, "UTF-8" );
int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "deployed junk index.html is missing module link!" );
result = false;
@@ -238,7 +238,7 @@ try
content = FileUtils.fileRead( index, "UTF-8" );
int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "staged junk index.html is missing module link!" );
result = false;
@@ -415,7 +415,7 @@ try
content = FileUtils.fileRead( index, "UTF-8" );
int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "stage-deployed junk index.html is missing module link!" );
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh?rev=1146586&r1=1146585&r2=1146586&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh Thu Jul 14 07:57:30 2011
@@ -42,7 +42,7 @@ try
}
String[] fileNames = new String[] { "images/h3.jpg", "download.html", "index.html", "releases/release1.6.html" };
-
+
Set contents = new HashSet();
JarFile jar = new JarFile( siteJar );
@@ -66,7 +66,6 @@ try
return false;
}
}
-
}
catch ( IOException e )
{