Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff ============================================================================== --- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/verify.bsh (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/verify.bsh Wed Jul 13 20:29:52 2011 @@ -25,7 +25,7 @@ boolean result = true; try { - final File deployDirectory = new File ( basedir, "deploy" ); + final File deployDirectory = new File( basedir, "deploy" ); if ( !deployDirectory.exists() || !deployDirectory.isDirectory() ) { System.err.println( "deployDirectory is missing or not a directory." ); @@ -33,7 +33,7 @@ try } // junk directory (aggregator) - File junkDirectory = new File ( deployDirectory, "junk" ); + File junkDirectory = new File( deployDirectory, "junk" ); if ( !junkDirectory.exists() || !junkDirectory.isDirectory() ) { System.err.println( "junkDirectory is missing or not a directory." ); @@ -41,7 +41,7 @@ try } // plugins directory - File pluginsDirectory = new File ( deployDirectory, "plugins" ); + File pluginsDirectory = new File( deployDirectory, "plugins" ); if ( !pluginsDirectory.exists() || !pluginsDirectory.isDirectory() ) { System.err.println( "deploy pluginsDirectory is missing or not a directory." ); @@ -49,7 +49,7 @@ try } // plugin - File mavenRocksDirectory = new File ( pluginsDirectory, "maven-rocks-plugin" ); + File mavenRocksDirectory = new File( pluginsDirectory, "maven-rocks-plugin" ); if ( !mavenRocksDirectory.exists() || !mavenRocksDirectory.isDirectory() ) { System.err.println( "deploy mavenRocksDirectory is missing or not a directory." ); @@ -58,7 +58,7 @@ try // STAGING - final File stageDirectory = new File ( basedir, "target/staging" ); + final File stageDirectory = new File( basedir, "target/staging" ); if ( !stageDirectory.exists() || !stageDirectory.isDirectory() ) { System.err.println( "stageDirectory is missing or not a directory." ); @@ -66,7 +66,7 @@ try } // plugins directory - pluginsDirectory = new File ( stageDirectory, "plugins" ); + pluginsDirectory = new File( stageDirectory, "plugins" ); if ( !pluginsDirectory.exists() || !pluginsDirectory.isDirectory() ) { System.err.println( "staging pluginsDirectory is missing or not a directory." ); @@ -74,7 +74,7 @@ try } // plugin - mavenRocksDirectory = new File ( pluginsDirectory, "maven-rocks-plugin" ); + mavenRocksDirectory = new File( pluginsDirectory, "maven-rocks-plugin" ); if ( !mavenRocksDirectory.exists() || !mavenRocksDirectory.isDirectory() ) { System.err.println( "staging mavenRocksDirectory is missing or not a directory." ); @@ -83,7 +83,7 @@ try // STAGE DEPLOY - final File stageDeployDirectory = new File ( basedir, "deploy/staging" ); + final File stageDeployDirectory = new File( basedir, "deploy/staging" ); if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() ) { System.err.println( "stageDeployDirectory is missing or not a directory." ); @@ -91,7 +91,7 @@ try } // plugins directory - pluginsDirectory = new File ( stageDeployDirectory, "plugins" ); + pluginsDirectory = new File( stageDeployDirectory, "plugins" ); if ( !pluginsDirectory.exists() || !pluginsDirectory.isDirectory() ) { System.err.println( "stage deploy pluginsDirectory is missing or not a directory." ); @@ -99,14 +99,14 @@ try } // plugin - mavenRocksDirectory = new File ( pluginsDirectory, "maven-rocks-plugin" ); + mavenRocksDirectory = new File( pluginsDirectory, "maven-rocks-plugin" ); if ( !mavenRocksDirectory.exists() || !mavenRocksDirectory.isDirectory() ) { System.err.println( "stage deploy mavenRocksDirectory is missing or not a directory." ); return false; } } -catch( IOException e ) +catch ( IOException e ) { e.printStackTrace(); result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy?rev=1146397&r1=1146396&r2=1146397&view=diff ============================================================================== --- maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy Wed Jul 13 20:29:52 2011 @@ -17,15 +17,15 @@ * specific language governing permissions and limitations * under the License. */ -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; +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; assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' ); assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' ); -assert new File(basedir, 'target/site/surefire-report.html').exists(); -assert !new File(basedir, 'target/site/index.html').exists(); +assert new File( basedir, 'target/site/surefire-report.html' ).exists(); +assert !new File( basedir, 'target/site/index.html' ).exists(); return true; \ No newline at end of file Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/top-parent-no-site/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/top-parent-no-site/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff ============================================================================== --- maven/plugins/branches/maven-site-plugin-3.x/src/it/top-parent-no-site/verify.bsh (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/it/top-parent-no-site/verify.bsh Wed Jul 13 20:29:52 2011 @@ -24,28 +24,28 @@ boolean result = true; try { - File deployDirectory = new File ( basedir, "deploy" ); + File deployDirectory = new File( basedir, "deploy" ); if ( !deployDirectory.exists() || !deployDirectory.isDirectory() ) { System.err.println( "deploy directory is missing or not a directory:" + deployDirectory.getAbsolutePath() ); return false; } - File stageDeployDirectory = new File ( deployDirectory, "staging" ); + File stageDeployDirectory = new File( deployDirectory, "staging" ); if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() ) { System.err.println( "stageDeployDirectory file is missing or not a directory." ); return false; } - File stageDirectory = new File ( basedir, "target/staging" ); + File stageDirectory = new File( basedir, "target/staging" ); if ( !stageDirectory.exists() || !stageDirectory.isDirectory() ) { System.err.println( "stageDirectory file is missing or not a directory." ); return false; } } -catch( IOException e ) +catch ( IOException e ) { e.printStackTrace(); result = false;