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 2012/01/14 14:29:27 UTC
svn commit: r1231499 -
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/
Author: hboutemy
Date: Sat Jan 14 13:29:26 2012
New Revision: 1231499
URL: http://svn.apache.org/viewvc?rev=1231499&view=rev
Log:
code formatting
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire146ForkPerTestNoSet
{
public void testForkPerTestNoSetup()
{
- executeErrorFreeTest("surefire-146-forkPerTestNoSetup", 1);
+ executeErrorFreeTest( "surefire-146-forkPerTestNoSetup", 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java Sat Jan 14 13:29:26 2012
@@ -37,13 +37,13 @@ public class Surefire162CharsetProviderI
public void testCharsetProvider()
throws Exception
{
- SurefireLauncher unpack = unpack("/surefire-162-charsetProvider");
+ SurefireLauncher unpack = unpack( "/surefire-162-charsetProvider" );
OutputValidator verifier = unpack.getSurefireVerifier();
File jarFile = new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "jar" ) );
jarFile.getParentFile().mkdirs();
- FileUtils.copyFile( verifier.getSubFile("repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar"), jarFile );
- FileUtils.copyFile(verifier.getSubFile("repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom"),
- new File(verifier.getArtifactPath("jcharset", "jcharset", "1.2.1", "pom")));
- unpack.executeTest().verifyErrorFree(1);
+ FileUtils.copyFile( verifier.getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar" ), jarFile );
+ FileUtils.copyFile( verifier.getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom" ),
+ new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "pom" ) ) );
+ unpack.executeTest().verifyErrorFree( 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java Sat Jan 14 13:29:26 2012
@@ -37,7 +37,7 @@ public class Surefire224WellFormedXmlFai
{
public void testWellFormedXmlFailures()
{
- OutputValidator outputValidator = unpack("/surefire-224-wellFormedXmlFailures").executeTest();
+ OutputValidator outputValidator = unpack( "/surefire-224-wellFormedXmlFailures" ).executeTest();
outputValidator.assertTestSuiteResults( 4, 0, 4, 0 );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java Sat Jan 14 13:29:26 2012
@@ -32,7 +32,7 @@ public class Surefire257NotRerunningTest
public void testShouldNotRerun()
throws Exception
{
- unpack("/surefire-257-rerunningTests").addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals()
- .verifyTextInLog("Skipping execution of surefire because it has already been run for this configuration");
+ unpack( "/surefire-257-rerunningTests" ).addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals()
+ .verifyTextInLog( "Skipping execution of surefire because it has already been run for this configuration" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java Sat Jan 14 13:29:26 2012
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.its.ji
*/
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URI;
import org.apache.maven.surefire.its.fixture.*;
@@ -39,14 +38,15 @@ public class Surefire260TestWithIdentica
extends SurefireIntegrationTestCase
{
- public void testWithIdenticalNames() throws IOException {
-
- SurefireLauncher surefireLauncher = unpack("surefire-260-testWithIdenticalNames").failNever();
+ public void testWithIdenticalNames()
+ throws IOException
+ {
+ SurefireLauncher surefireLauncher = unpack( "surefire-260-testWithIdenticalNames" ).failNever();
surefireLauncher.executeTest();
surefireLauncher.reset();
OutputValidator validator = surefireLauncher.addSurefireReportGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
final URI uri = siteFile.toURI();
final WebClient webClient = new WebClient();
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java Sat Jan 14 13:29:26 2012
@@ -32,8 +32,7 @@ public class Surefire34SecurityManagerIT
{
public void testSecurityManager()
{
- SurefireLauncher surefireLauncher = unpack("/surefire-34-securityManager").failNever();
- surefireLauncher.executeTest().
- assertTestSuiteResults(2, 1, 0, 0);
+ SurefireLauncher surefireLauncher = unpack( "/surefire-34-securityManager" ).failNever();
+ surefireLauncher.executeTest().assertTestSuiteResults( 2, 1, 0, 0 );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire377TestNgAndJUnitTo
{
public void testTestNgAndJUnitTogether()
{
- executeErrorFreeTest("/testng-junit-together", 2);
+ executeErrorFreeTest( "/testng-junit-together", 2 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java Sat Jan 14 13:29:26 2012
@@ -31,8 +31,8 @@ public class Surefire408ManualProviderSe
{
public void testPaallelBuildResultCount()
{
- unpack("/surefire-408-manual-provider-selection").showErrorStackTraces()
- .executeTest()
- .verifyTextInLog("Using configured provider org.apache.maven.surefire.junit.JUnit3Provider");
+ unpack( "/surefire-408-manual-provider-selection" ).showErrorStackTraces()
+ .executeTest()
+ .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire42NotExtendingTestC
{
public void testInnerClass()
{
- executeErrorFreeTest("junit-notExtendingTestCase", 1);
+ executeErrorFreeTest( "junit-notExtendingTestCase", 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire44InnerClassTestIT
{
public void testInnerClass()
{
- executeErrorFreeTest("/junit-innerClass", 1);
+ executeErrorFreeTest( "/junit-innerClass", 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java Sat Jan 14 13:29:26 2012
@@ -33,8 +33,8 @@ public class Surefire500PuzzlingErrorIT
{
public void testBuildFailingWhenErrors()
{
- OutputValidator outputValidator = unpack("/surefire-500-puzzling-error").failNever().executeTest();
- TestFile surefireReportsFile = outputValidator.getSurefireReportsFile("surefire500.ExplodingTest.txt");
- surefireReportsFile.assertContainsText("java.lang.NoClassDefFoundError: whoops!");
+ OutputValidator outputValidator = unpack( "/surefire-500-puzzling-error" ).failNever().executeTest();
+ TestFile surefireReportsFile = outputValidator.getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
+ surefireReportsFile.assertContainsText( "java.lang.NoClassDefFoundError: whoops!" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java Sat Jan 14 13:29:26 2012
@@ -45,6 +45,6 @@ public class Surefire510TestClassPathFor
public SurefireLauncher unpack()
{
- return unpack("/surefire-510-testClassPath");
+ return unpack( "/surefire-510-testClassPath" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java Sat Jan 14 13:29:26 2012
@@ -39,12 +39,12 @@ public class Surefire570MultipleReportDi
SurefireLauncher surefireLauncher = unpack().failNever();
surefireLauncher.executeTest();
- surefireLauncher.addGoal("-Daggregate=true");
- OutputValidator validator = surefireLauncher.execute("surefire-report:report");
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
- siteFile.assertContainsText("MyModule1ClassTest");
- siteFile.assertContainsText("MyModule2ClassTest");
- siteFile.assertContainsText("MyDummyClassM1Test");
+ surefireLauncher.addGoal( "-Daggregate=true" );
+ OutputValidator validator = surefireLauncher.execute( "surefire-report:report" );
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ siteFile.assertContainsText( "MyModule1ClassTest" );
+ siteFile.assertContainsText( "MyModule2ClassTest" );
+ siteFile.assertContainsText( "MyDummyClassM1Test" );
}
public void testReportWithoutAggregate()
@@ -53,16 +53,16 @@ public class Surefire570MultipleReportDi
SurefireLauncher surefireLauncher = unpack().failNever();
surefireLauncher.executeTest();
surefireLauncher.reset();
- surefireLauncher.execute("surefire-report:report");
- OutputValidator module1 = surefireLauncher.getSubProjectValidator("module1");
- TestFile siteFile = module1.getSiteFile("surefire-report.html");
- siteFile.assertContainsText("MyModule1ClassTest");
- siteFile.assertContainsText("MyDummyClassM1Test");
+ surefireLauncher.execute( "surefire-report:report" );
+ OutputValidator module1 = surefireLauncher.getSubProjectValidator( "module1" );
+ TestFile siteFile = module1.getSiteFile( "surefire-report.html" );
+ siteFile.assertContainsText( "MyModule1ClassTest" );
+ siteFile.assertContainsText( "MyDummyClassM1Test" );
}
public SurefireLauncher unpack()
{
- return unpack("/surefire-570-multipleReportDirectories");
+ return unpack( "/surefire-570-multipleReportDirectories" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java Sat Jan 14 13:29:26 2012
@@ -32,12 +32,12 @@ public class Surefire613TestCountInParal
{
public void testPaallelBuildResultCount()
{
- OutputValidator validator = unpack("/surefire-613-testCount-in-parallel").failNever().executeTest();
+ OutputValidator validator = unpack( "/surefire-613-testCount-in-parallel" ).failNever().executeTest();
- validator.verifyTextInLog("testAllok to stdout");
- validator.verifyTextInLog("testAllok to stderr");
- validator.verifyTextInLog("testWithException1 to stdout");
- validator.verifyTextInLog("testWithException1 to stderr");
- validator.assertTestSuiteResults(30, 8, 4, 17);
+ validator.verifyTextInLog( "testAllok to stdout" );
+ validator.verifyTextInLog( "testAllok to stderr" );
+ validator.verifyTextInLog( "testWithException1 to stdout" );
+ validator.verifyTextInLog( "testWithException1 to stderr" );
+ validator.assertTestSuiteResults( 30, 8, 4, 17 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java Sat Jan 14 13:29:26 2012
@@ -31,7 +31,7 @@ public class Surefire621TestCountingJuni
{
public void testJunit3ParallelBuildResultCount()
{
- unpack( "surefire-621-testCounting-junit3-in-parallel" ).failNever().execute("install").
- assertTestSuiteResults(6, 0, 0, 0);
+ unpack( "surefire-621-testCounting-junit3-in-parallel" ).failNever().execute( "install" )
+ .assertTestSuiteResults(6, 0, 0, 0);
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java Sat Jan 14 13:29:26 2012
@@ -34,31 +34,26 @@ public class Surefire628ConsoleOutputBef
public void testJunit3ParallelBuildResultCount()
{
- OutputValidator validator = unpack("surefire-628-consoleoutputbeforeandafterclass")
+ OutputValidator validator = unpack( "surefire-628-consoleoutputbeforeandafterclass" )
.failNever().parallelMethods().executeTest();
- validator.verifyTextInLog("628Test1");
- validator.verifyTextInLog("Before628Test1");
- validator.verifyTextInLog("After628Test1");
- validator.verifyTextInLog("628Test2");
- validator.verifyTextInLog("BeforeClass628Test2");
- validator.verifyTextInLog("AfterClass628Test2");
+ validator.verifyTextInLog( "628Test1" );
+ validator.verifyTextInLog( "Before628Test1" );
+ validator.verifyTextInLog( "After628Test1" );
+ validator.verifyTextInLog( "628Test2" );
+ validator.verifyTextInLog( "BeforeClass628Test2" );
+ validator.verifyTextInLog( "AfterClass628Test2" );
}
-
-
public void testProperBeforeAndAfterClassCapture()
{
- OutputValidator validator = unpack("surefire-628-consoleoutputbeforeandafterclass")
+ OutputValidator validator = unpack( "surefire-628-consoleoutputbeforeandafterclass" )
.failNever().redirectToFile( true ).parallelClasses().executeTest();
final TestFile surefireReportsFile = validator.getSurefireReportsFile( "surefire628.Test2-output.txt" );
- surefireReportsFile
- .assertContainsText("628Test2")
- .assertContainsText("BeforeClass628Test2")
- .assertContainsText("AfterClass628Test2");
+ surefireReportsFile.assertContainsText( "628Test2" )
+ .assertContainsText( "BeforeClass628Test2" )
+ .assertContainsText( "AfterClass628Test2" );
}
-
-
-}
\ No newline at end of file
+}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java Sat Jan 14 13:29:26 2012
@@ -32,6 +32,6 @@ public class Surefire634UnsettableSystem
public void testJunit3ParallelBuildResultCount()
{
unpack( "/surefire-634-systemPropertiesWarning" ).executeTest()
- .verifyTextInLog("java.library.path cannot be set as system property");
+ .verifyTextInLog( "java.library.path cannot be set as system property" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire673MockitoIT
{
public void testBuildFailingWhenErrors()
{
- unpack("/surefire-673-mockito").executeTest().verifyErrorFreeLog();
+ unpack( "/surefire-673-mockito" ).executeTest().verifyErrorFreeLog();
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire674BuildFailingWhen
{
public void testBuildFailingWhenErrors()
{
- unpack("/surefire-674-buildFailingWhenErrors").executeTestWithFailure().verifyTextInLog("BUILD FAILURE");
+ unpack( "/surefire-674-buildFailingWhenErrors" ).executeTestWithFailure().verifyTextInLog( "BUILD FAILURE" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java Sat Jan 14 13:29:26 2012
@@ -31,7 +31,7 @@ public class Surefire674BuildFailingWhen
{
public void testBuildFailingWhenErrors()
{
- unpack("/failsafe-buildfail").executeVerifyWithFailure().
- verifyTextInLog("BUILD FAILURE");
+ unpack( "/failsafe-buildfail" ).executeVerifyWithFailure()
+ .verifyTextInLog( "BUILD FAILURE" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java Sat Jan 14 13:29:26 2012
@@ -31,6 +31,6 @@ public class Surefire685CommaSeparatedIn
{
public void testBuildFailingWhenErrors()
{
- executeErrorFreeTest("/surefire-685-commaseparatedIncludes", 2);
+ executeErrorFreeTest( "/surefire-685-commaseparatedIncludes", 2 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java Sat Jan 14 13:29:26 2012
@@ -31,7 +31,7 @@ public class Surefire697NiceSummaryIT
{
public void testBuildFailingWhenErrors()
{
- unpack( "/surefire-697-niceSummary" ).failNever().executeTest().
- verifyTextInLog("testShortMultiline(junit.surefire697.BasicTest): A very short multiline message");
+ unpack( "/surefire-697-niceSummary" ).failNever().executeTest()
+ .verifyTextInLog( "testShortMultiline(junit.surefire697.BasicTest): A very short multiline message" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java Sat Jan 14 13:29:26 2012
@@ -31,8 +31,8 @@ public class Surefire705ParallelForkTime
{
public void testTimeoutForked()
{
- unpack( "/fork-timeout" ).setJUnitVersion("4.8.1").
- addGoal( "-Djunit.version=4.8.1" )
+ unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" )
+ .addGoal( "-Djunit.version=4.8.1" )
.addGoal( "-Djunit.parallel=classes" )
.addGoal( "-DtimeOut=1" )
.executeTestWithFailure();
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java Sat Jan 14 13:29:26 2012
@@ -29,7 +29,6 @@ public class Surefire733AllOverrridesCap
{
public void testLogOutput()
{
- unpack( "surefire-733-allOverridesCaptured" ).executeTest()
- .verifyTextInLog("abc");
+ unpack( "surefire-733-allOverridesCaptured" ).executeTest().verifyTextInLog( "abc" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java Sat Jan 14 13:29:26 2012
@@ -32,7 +32,7 @@ public class Surefire735ForkFailWithRedi
public void testVMStartFail()
throws Exception
{
- unpack().failNever().executeTest().verifyTextInLog("Invalid maximum heap size: -Xmxxxx712743m");
+ unpack().failNever().executeTest().verifyTextInLog( "Invalid maximum heap size: -Xmxxxx712743m" );
}
public void testVMStartFtestVMStartFailail()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java Sat Jan 14 13:29:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its.jiras;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
@@ -33,14 +33,14 @@ public class Surefire740TruncatedCommaIT
{
public void testRussianLocaleReport()
{
- OutputValidator validator = unpack("/surefire-740-comma-truncated")
- .addEnvVar("MAVEN_OPTS", "-Duser.language=ru -Duser.country=RU")
+ OutputValidator validator = unpack( "/surefire-740-comma-truncated" )
+ .addEnvVar( "MAVEN_OPTS", "-Duser.language=ru -Duser.country=RU" )
.failNever().addSurefireReportGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertTrue( "Expecting file", siteFile.exists());
- siteFile.assertContainsText("027"); // Avoid asserting with the "," or "." ;)
+ assertTrue( "Expecting file", siteFile.exists() );
+ siteFile.assertContainsText( "027" ); // Avoid asserting with the "," or "." ;)
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java Sat Jan 14 13:29:26 2012
@@ -31,12 +31,12 @@ public class Surefire747MethodParallelWi
public void testMethodsParallelWithSuite()
{
- unpack().executeTest().verifyErrorFree(6);
+ unpack().executeTest().verifyErrorFree( 6 );
}
public void testClassesParallelWithSuite()
{
- unpack().parallelClasses().executeTest().verifyErrorFree(6);
+ unpack().parallelClasses().executeTest().verifyErrorFree( 6 );
}
public SurefireLauncher unpack()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java Sat Jan 14 13:29:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its.jiras;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java Sat Jan 14 13:29:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its.jiras;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
@@ -35,7 +35,7 @@ public class Surefire772BothReportsIT
public SurefireLauncher unpack()
{
- return unpack("/surefire-772-both-reports").deleteSiteDir().addGoal("-Dclean.skip=true").failNever();
+ return unpack( "/surefire-772-both-reports" ).deleteSiteDir().addGoal( "-Dclean.skip=true" ).failNever();
}
public void testReportGeneration()
@@ -46,11 +46,11 @@ public class Surefire772BothReportsIT
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = outputValidator.getSiteFile("surefire-report.html");
+ TestFile siteFile = outputValidator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = outputValidator.getSiteFile("failsafe-report.html");
+ siteFile = outputValidator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
@@ -59,14 +59,14 @@ public class Surefire772BothReportsIT
throws Exception
{
OutputValidator validator = unpack().
- activateProfile("skipFailsafe")
+ activateProfile( "skipFailsafe" )
.addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile =validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
}
@@ -75,14 +75,14 @@ public class Surefire772BothReportsIT
throws Exception
{
OutputValidator validator = unpack().failNever().
- activateProfile("skipSurefire").addFailsafeReportOnlyGoal()
+ activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal()
.addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java Sat Jan 14 13:29:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its.jiras;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-
import java.io.IOException;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
@@ -38,13 +38,13 @@ public class Surefire772NoFailsafeReport
public void testReportGeneration()
throws Exception
{
- final OutputValidator site = unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ final OutputValidator site =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
assertSurefireReportPresent( site );
assertNoFailsefeReport( site );
}
-
public void testSkippedFailsafeReportGeneration()
throws Exception
{
@@ -68,8 +68,7 @@ public class Surefire772NoFailsafeReport
throws Exception
{
final OutputValidator validator =
- unpack().activateProfile( "forceFailsafe" ).activateProfile( "skipFailsafe" )
- .addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ unpack().activateProfile( "forceFailsafe" ).activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
assertSurefireReportPresent( validator );
assertNoFailsefeReport( validator );
@@ -80,6 +79,7 @@ public class Surefire772NoFailsafeReport
TestFile siteFile = site.getSiteFile( "failsafe-report.html" );
assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
}
+
private void assertFailsafeReport( OutputValidator site )
{
TestFile siteFile = site.getSiteFile( "failsafe-report.html" );
@@ -100,5 +100,4 @@ public class Surefire772NoFailsafeReport
return unpack.skipClean().failNever().assertNotPresent( "site" );
}
-
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java Sat Jan 14 13:29:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its.jiras;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
@@ -34,61 +34,63 @@ public class Surefire772NoSurefireReport
{
public void testReportGeneration()
{
- OutputValidator validator = unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testSkippedSurefireReportGeneration()
{
- OutputValidator validator = unpack().activateProfile("skipSurefire").addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testOptionalSurefireReportGeneration()
{
- OutputValidator validator = unpack().activateProfile("optionalSurefire").addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().activateProfile( "optionalSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testSkipOptionalSurefireReportGeneration()
{
- OutputValidator validator = unpack().activateProfile("optionalSurefire").activateProfile("skipSurefire").addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().activateProfile( "optionalSurefire" ).activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public SurefireLauncher unpack()
{
- return unpack("/surefire-772-no-surefire-reports").failNever()
- .deleteSiteDir().addGoal("-Dclean.skip=true");
-
+ return unpack( "/surefire-772-no-surefire-reports" ).failNever().deleteSiteDir().addGoal( "-Dclean.skip=true" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java Sat Jan 14 13:29:26 2012
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.its.jiras;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,7 +19,6 @@ package org.apache.maven.surefire.its.ji
* under the License.
*/
-
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
@@ -36,44 +36,46 @@ public class Surefire772SpecifiedReports
{
OutputValidator validator = unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public void testSkippedFailsafeReportGeneration()
{
- OutputValidator validator = unpack().activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().activateProfile( "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertTrue( "Expecting surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertFalse("Expecting no failsafe report file", siteFile.isFile());
+ assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
}
public void testSkippedSurefireReportGeneration()
{
- OutputValidator validator = unpack().activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ OutputValidator validator =
+ unpack().activateProfile( "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
assertFalse( "Expecting no surefire report file", siteFile.isFile() );
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
System.out.println( "siteFile.getAbsolutePath() = " + siteFile.getAbsolutePath() );
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
}
public SurefireLauncher unpack()
{
- return unpack("/surefire-772-specified-reports").deleteSiteDir().addGoal( "-Dclean.skip=true" ).failNever();
+ return unpack( "/surefire-772-specified-reports" ).deleteSiteDir().addGoal( "-Dclean.skip=true" ).failNever();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java?rev=1231499&r1=1231498&r2=1231499&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java Sat Jan 14 13:29:26 2012
@@ -23,7 +23,7 @@ import org.apache.maven.surefire.its.fix
/**
* SUREFIRE-818
- *
+ *
* @author Kristian Rosenvold
*/
public class Surefire818NpeIgnoresTestsIT
@@ -31,6 +31,6 @@ public class Surefire818NpeIgnoresTestsI
{
public void testBuildFailingWhenErrors()
{
- unpack("surefire-818-ignored-tests-on-npe").executeTestWithFailure().assertTestSuiteResults( 2 ,0 , 1, 0 );
+ unpack( "surefire-818-ignored-tests-on-npe" ).executeTestWithFailure().assertTestSuiteResults( 2, 0, 1, 0 );
}
-}
\ No newline at end of file
+}