Author: hboutemy
Date: Sat Jan 14 18:04:18 2012
New Revision: 1231541
URL: http://svn.apache.org/viewvc?rev=1231541&view=rev
Log:
code formatting
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
Sat Jan 14 18:04:18 2012
@@ -34,7 +34,7 @@ public class AbstractTestCaseIT
public void testAbstractTestCase()
{
- unpack( "/default-configuration-abstract"
).executeTest().verifyErrorFree( 1);
+ unpack( "/default-configuration-abstract"
).executeTest().verifyErrorFree( 1 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
Sat Jan 14 18:04:18 2012
@@ -47,6 +47,6 @@ public class AggregateReportIT
testDirs[0] = new File( outputValidator.getBaseDir(), "child1" );
testDirs[1] = new File( outputValidator.getBaseDir(), "child2" );
IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults(
testDirs );
- HelperAssertions.assertTestSuiteResults(2, 0, 1, 0, suite);
+ HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, suite );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
Sat Jan 14 18:04:18 2012
@@ -35,12 +35,12 @@ public class CheckSingleTestIT
{
public void testSingleTest()
{
- unpack().setTestToRun("BasicTest" ).executeTest().verifyErrorFree( 1 );
+ unpack().setTestToRun( "BasicTest" ).executeTest().verifyErrorFree( 1
);
}
public void testSingleTestDotJava()
{
- unpack().setTestToRun("BasicTest.java"
).executeTest().verifyErrorFree( 1 );
+ unpack().setTestToRun( "BasicTest.java"
).executeTest().verifyErrorFree( 1 );
}
public void testSingleTestNonExistent()
@@ -52,7 +52,8 @@ public class CheckSingleTestIT
public void testSingleTestNonExistentOverride()
{
- final OutputValidator output = unpack().setTestToRun( "DoesNotExist"
).failIfNoTests(false).executeTest().verifyErrorFreeLog();
+ final OutputValidator output =
+ unpack().setTestToRun( "DoesNotExist" ).failIfNoTests( false
).executeTest().verifyErrorFreeLog();
TestFile reportsDir = output.getTargetFile( "surefire-reports" );
assertFalse( "Unexpected reports directory", reportsDir.exists() );
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
Sat Jan 14 18:04:18 2012
@@ -75,7 +75,7 @@ public class CheckTestFailIfNoTestsForkM
private SurefireLauncher unpack()
{
- return unpack("default-configuration-classWithNoTests");
+ return unpack( "default-configuration-classWithNoTests" );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
Sat Jan 14 18:04:18 2012
@@ -32,6 +32,6 @@ public class CheckTestNgGroupThreadParal
{
public void testTestNgGroupThreadParallel()
{
- unpack( "testng-group-thread-parallel"
).executeTest().verifyErrorFree(3);
+ unpack( "testng-group-thread-parallel"
).executeTest().verifyErrorFree( 3 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
Sat Jan 14 18:04:18 2012
@@ -34,7 +34,7 @@ public class CheckTestNgListenerReporter
public void testTestNgListenerReporter()
{
final SurefireLauncher verifierStarter = unpack(
"testng-listener-reporter" );
- verifierStarter.executeTest().verifyErrorFree(1)
+ verifierStarter.executeTest().verifyErrorFree( 1 )
.getTargetFile( "resultlistener-output.txt" ).assertFileExists()
.getTargetFile( "suitelistener-output.txt" ).assertFileExists()
.getTargetFile( "reporter-output.txt" ).assertFileExists();
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
Sat Jan 14 18:04:18 2012
@@ -31,6 +31,6 @@ public class CheckTestNgPathWithSpacesIT
{
public void testTestNgTestWithSpaces()
{
- unpack( "testng-path with spaces" ).executeTest().verifyErrorFree(1);
+ unpack( "testng-path with spaces" ).executeTest().verifyErrorFree( 1 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
Sat Jan 14 18:04:18 2012
@@ -32,12 +32,12 @@ public class CheckTestNgSuiteXmlIT
{
public void testTestNgSuiteXml()
{
- unpack().executeTest().verifyErrorFree( 1) ;
+ unpack().executeTest().verifyErrorFree( 1 );
}
public void testTestNgSuiteXmlForkModeAlways()
{
- unpack().forkAlways().executeTest().verifyErrorFree( 1) ;
+ unpack().forkAlways().executeTest().verifyErrorFree( 1 );
}
private SurefireLauncher unpack()
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
Sat Jan 14 18:04:18 2012
@@ -32,6 +32,6 @@ public class ClasspathScopeFilteringIT
{
public void testAdditionalClasspath()
{
- unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFree(1);
+ unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFree( 1
);
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
Sat Jan 14 18:04:18 2012
@@ -53,13 +53,13 @@ public class ForkConsoleOutputIT
public void testPrintSummaryFalseWithRedirect()
{
- final OutputValidator outputValidator = unpack().redirectToFile( true
).printSummary( false).debugLogging().showErrorStackTraces().executeTest();
+ final OutputValidator outputValidator = unpack().redirectToFile( true
).printSummary( false ).debugLogging().showErrorStackTraces().executeTest();
outputValidator.getSurefireReportsFile(
"forkConsoleOutput.Test1-output.txt" ).assertFileExists();
}
public void testPrintSummaryFalseWithoutRedirect()
{
- final OutputValidator outputValidator = unpack().redirectToFile( false
).printSummary( false).executeTest();
+ final OutputValidator outputValidator = unpack().redirectToFile( false
).printSummary( false ).executeTest();
outputValidator.getSurefireReportsFile(
"forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
Sat Jan 14 18:04:18 2012
@@ -34,33 +34,31 @@ public class ForkModeIT
{
public void testForkModeAlways()
{
-
- String[] pids = doTest( unpack( getProject() ).forkAlways());
+ String[] pids = doTest( unpack( getProject() ).forkAlways() );
assertDifferentPids( pids );
}
public void testForkModePerTest()
{
- String[] pids = doTest( unpack( getProject() ).forkPerTest());
+ String[] pids = doTest( unpack( getProject() ).forkPerTest() );
assertDifferentPids( pids );
}
public void testForkModeNever()
{
- String[] pids = doTest( unpack( getProject() ).forkNever() );
+ String[] pids = doTest( unpack( getProject() ).forkNever() );
assertSamePids( pids );
}
public void testForkModeNone()
{
- String[] pids = doTest( unpack( getProject() ).forkMode( "none" ));
-
+ String[] pids = doTest( unpack( getProject() ).forkMode( "none" ) );
assertSamePids( pids );
}
public void testForkModeOnce()
{
- String[] pids = doTest( unpack( getProject() ).forkOnce());
+ String[] pids = doTest( unpack( getProject() ).forkOnce() );
// DGF It would be nice to assert that "once" was different
// from "never" ... but there's no way to check the PID of
// Maven itself. No matter, "once" is tested by setting
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
Sat Jan 14 18:04:18 2012
@@ -32,21 +32,21 @@ public class JUnit47RedirectOutputIT
throws Exception
{
final OutputValidator clean = unpack().redirectToFile( true ).addGoal(
"clean" ).executeTest();
- checkReports(clean);
+ checkReports( clean );
}
-
public void testClassesParallel()
throws Exception
{
- final OutputValidator clean = unpack().redirectToFile( true ).addGoal(
"clean" ).parallelClasses().executeTest();
- checkReports(clean);
+ final OutputValidator clean =
+ unpack().redirectToFile( true ).addGoal( "clean"
).parallelClasses().executeTest();
+ checkReports( clean );
}
private void checkReports( OutputValidator validator )
throws IOException
{
- String report = StringUtils.trimToNull(
validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt"
).readFileToString() ) ;
+ String report = StringUtils.trimToNull(
validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt"
).readFileToString() );
assertNotNull( report );
String report2 = StringUtils.trimToNull(
validator.getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt"
).readFileToString() );
assertNotNull( report2 );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
Sat Jan 14 18:04:18 2012
@@ -36,7 +36,7 @@ public class JUnit48TestCategoriesIT
public void testCategoriesAB()
throws Exception
{
- runAB( unpacked());
+ runAB( unpacked() );
}
@@ -66,7 +66,7 @@ public class JUnit48TestCategoriesIT
public void testCategoriesACForkAlways()
throws Exception
{
- runAC(unpacked().forkAlways());
+ runAC( unpacked().forkAlways() );
}
@@ -89,7 +89,7 @@ public class JUnit48TestCategoriesIT
private SurefireLauncher unpacked()
throws VerificationException, IOException
{
- return unpack( "/junit48-categories");
+ return unpack( "/junit48-categories" );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
Sat Jan 14 18:04:18 2012
@@ -38,40 +38,40 @@ public class JUnitDepIT
public void testJUnit44Dep()
throws Exception
{
- unpack().debugLogging().
- addGoal( "-Djunit-dep.version=4.4" )
+ unpack().debugLogging()
+ .addGoal( "-Djunit-dep.version=4.4" )
.executeTest()
- .verifyErrorFree(1)
- .verifyTextInLog("surefire-junit4"); // Ahem. Will match on the 4.7
provider too
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "surefire-junit4" ); // Ahem. Will match on the 4.7
provider too
}
public void testJUnit44DepWithSneaky381()
throws Exception
{
- unpack().debugLogging().
- addGoal( "-Djunit-dep.version=4.4" )
- .activateProfile("provided381")
+ unpack().debugLogging()
+ .addGoal( "-Djunit-dep.version=4.4" )
+ .activateProfile( "provided381" )
.executeTest()
- .verifyErrorFree(1);
+ .verifyErrorFree( 1 );
}
public void testJUnit47Dep()
throws Exception
{
- unpack().debugLogging().
- addGoal( "-Djunit-dep.version=4.7" )
+ unpack().debugLogging()
+ .addGoal( "-Djunit-dep.version=4.7" )
.executeTest()
- .verifyErrorFree(1).
- verifyTextInLog("surefire-junit47");
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "surefire-junit47" );
}
public void testJUnit48Dep()
throws Exception
{
- unpack().debugLogging().
- addGoal( "-Djunit-dep.version=4.8" )
+ unpack().debugLogging()
+ .addGoal( "-Djunit-dep.version=4.8" )
.executeTest()
- .verifyErrorFree(1).
- verifyTextInLog("surefire-junit47");
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "surefire-junit47" );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
Sat Jan 14 18:04:18 2012
@@ -33,8 +33,8 @@ public class Junit47concurrencyIT
throws Exception
{
// todo: Align with others
- unpack("concurrentjunit47").addD("junitVersion",
"4.7").setJUnitVersion("4.7").executeTest()
- .verifyErrorFree(1);
+ unpack( "concurrentjunit47" ).addD( "junitVersion", "4.7"
).setJUnitVersion( "4.7" ).executeTest()
+ .verifyErrorFree( 1 );
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
Sat Jan 14 18:04:18 2012
@@ -95,10 +95,9 @@ public class Junit4VersionsIT
runJUnitTest( "4.7" );
}
-
public void runJUnitTest( String version )
throws Exception
{
- unpack().setJUnitVersion( version ).executeTest().verifyErrorFree( 1
);
+ unpack().setJUnitVersion( version ).executeTest().verifyErrorFree( 1 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
Sat Jan 14 18:04:18 2012
@@ -31,7 +31,7 @@ public class NoRunnableTestsInClassIT
{
public void testJunit3ParallelBuildResultCount()
{
- unpack("norunnableTests").failNever().executeTest().
- verifyTextInLog("No tests found in junit.norunnabletests.BasicTest");
+ unpack( "norunnableTests" ).failNever().executeTest()
+ .verifyTextInLog( "No tests found in junit.norunnabletests.BasicTest"
);
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
Sat Jan 14 18:04:18 2012
@@ -31,6 +31,6 @@ public class PlainOldJavaClasspathIT
{
public void testPlainOldJavaClasspath()
{
- executeErrorFreeTest("plain-old-java-classpath", 1);
+ executeErrorFreeTest( "plain-old-java-classpath", 1 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
Sat Jan 14 18:04:18 2012
@@ -32,15 +32,16 @@ public class PlexusConflictIT
{
public void testPlexusConflict()
{
- unpack().executeTest().verifyErrorFree(1);
+ unpack().executeTest().verifyErrorFree( 1 );
}
public void testPlexusConflictIsolatedClassLoader()
{
- unpack().addD( "surefire.useSystemClassLoader", "false"
).executeTest().verifyErrorFree(1);
+ unpack().addD( "surefire.useSystemClassLoader", "false"
).executeTest().verifyErrorFree( 1 );
}
- private SurefireLauncher unpack() {
- return unpack("/plexus-conflict");
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/plexus-conflict" );
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
Sat Jan 14 18:04:18 2012
@@ -31,7 +31,6 @@ public class PojoSimpleIT
{
public void testit()
{
- unpack("pojo-simple").executeTest().assertTestSuiteResults(2, 0, 1, 0);
+ unpack( "pojo-simple" ).executeTest().assertTestSuiteResults( 2, 0, 1,
0 );
}
-
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
Sat Jan 14 18:04:18 2012
@@ -33,9 +33,9 @@ public class ReportersIT
{
public void testRedirectOutputTestNg()
{
- OutputValidator reporters = unpack("reporters").
- redirectToFile(true)
- .printSummary(true).executeTest();
+ OutputValidator reporters = unpack( "reporters" )
+ .redirectToFile( true )
+ .printSummary( true ).executeTest();
reporters.getSurefireReportsFile( "TestSuite-output.txt"
).assertFileExists();
reporters.getSurefireReportsFile( "TEST-TestSuite.xml"
).assertFileExists();
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
Sat Jan 14 18:04:18 2012
@@ -55,8 +55,8 @@ public class ResultCountingIT
private void assertForkMode( String forkMode )
throws IOException, VerificationException
{
- OutputValidator outputValidator =
unpack("result-counting").failNever().forkMode(forkMode).executeTest();
- outputValidator.assertTestSuiteResults(36, 23, 4, 2);
- outputValidator.verifyTextInLog("Tests run: 36, Failures: 4, Errors:
23, Skipped: 2");
+ OutputValidator outputValidator = unpack( "result-counting"
).failNever().forkMode( forkMode ).executeTest();
+ outputValidator.assertTestSuiteResults( 36, 23, 4, 2 );
+ outputValidator.verifyTextInLog( "Tests run: 36, Failures: 4, Errors:
23, Skipped: 2" );
}
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
Sat Jan 14 18:04:18 2012
@@ -43,22 +43,22 @@ public class RunOrderIT
public void testAlphabetical()
throws Exception
{
- OutputValidator validator = executeWithRunOrder("alphabetical");
- assertTestnamesAppearInSpecificOrder(validator,
TESTS_IN_ALPHABETICAL_ORDER );
+ OutputValidator validator = executeWithRunOrder( "alphabetical" );
+ assertTestnamesAppearInSpecificOrder( validator,
TESTS_IN_ALPHABETICAL_ORDER );
}
public void testReverseAlphabetical()
throws Exception
{
- OutputValidator validator = executeWithRunOrder("reversealphabetical");
- assertTestnamesAppearInSpecificOrder(validator,
TESTS_IN_REVERSE_ALPHABETICAL_ORDER );
+ OutputValidator validator = executeWithRunOrder( "reversealphabetical"
);
+ assertTestnamesAppearInSpecificOrder( validator,
TESTS_IN_REVERSE_ALPHABETICAL_ORDER );
}
public void testHourly()
throws Exception
{
int startHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
- OutputValidator validator = executeWithRunOrder("hourly");
+ OutputValidator validator = executeWithRunOrder( "hourly" );
int endHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
if ( startHour != endHour )
{
@@ -67,36 +67,36 @@ public class RunOrderIT
String[] testnames =
( ( startHour % 2 ) == 0 ) ? TESTS_IN_ALPHABETICAL_ORDER :
TESTS_IN_REVERSE_ALPHABETICAL_ORDER;
- assertTestnamesAppearInSpecificOrder(validator, testnames);
+ assertTestnamesAppearInSpecificOrder( validator, testnames );
}
public void testNonExistingRunOrder()
throws Exception
{
-
unpack().forkMode(getForkMode()).runOrder("nonExistingRunOrder").executeTestWithFailure()
- .verifyTextInLog("There's no RunOrder with the name
nonExistingRunOrder.");
+ unpack().forkMode( getForkMode() ).runOrder( "nonExistingRunOrder"
).executeTestWithFailure()
+ .verifyTextInLog( "There's no RunOrder with the name
nonExistingRunOrder." );
}
- private OutputValidator executeWithRunOrder(String runOrder)
+ private OutputValidator executeWithRunOrder( String runOrder )
throws IOException, VerificationException
{
- return
unpack().forkMode(getForkMode()).runOrder(runOrder).executeTest().verifyErrorFree(3);
+ return unpack().forkMode( getForkMode() ).runOrder( runOrder
).executeTest().verifyErrorFree( 3 );
}
-
protected String getForkMode()
{
return "once";
}
- private SurefireLauncher unpack() {
- return unpack("runOrder");
+ private SurefireLauncher unpack()
+ {
+ return unpack( "runOrder" );
}
- private void assertTestnamesAppearInSpecificOrder(OutputValidator
validator, String[] testnames)
+ private void assertTestnamesAppearInSpecificOrder( OutputValidator
validator, String[] testnames )
throws VerificationException
{
- if ( !validator.stringsAppearInSpecificOrderInLog(testnames) )
+ if ( !validator.stringsAppearInSpecificOrderInLog( testnames ) )
{
throw new VerificationException( "Response does not contain
expected item" );
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
Sat Jan 14 18:04:18 2012
@@ -36,7 +36,7 @@ public class SystemPropertiesTestIT
unpack().addGoal( "-DsetOnMavenCommandLine=baz" )
.addGoal( "-DsetOnArgLineWorkAround=baz" )
.executeTest()
- .verifyErrorFree(8);
+ .verifyErrorFree( 8 );
}
public void testSystemPropertiesNoFork()
@@ -47,11 +47,11 @@ public class SystemPropertiesTestIT
// DGF fake the argLine, since we're not forking
.addGoal( "-DsetOnArgLine=bar" )
.executeTest()
- .verifyErrorFree(8);
+ .verifyErrorFree( 8 );
}
public SurefireLauncher unpack()
{
- return unpack("/system-properties");
+ return unpack( "/system-properties" );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
Sat Jan 14 18:04:18 2012
@@ -33,13 +33,14 @@ public class TestNgGroupsIT
{
public void testTestNgGroupThreadParallel()
{
- unpack().setExcludedGroups( "notincluded"
).executeTest().verifyErrorFree(1);
+ unpack().setExcludedGroups( "notincluded"
).executeTest().verifyErrorFree( 1 );
}
public void testGroups()
{
- unpack().setGroups("functional" ).executeTest().verifyErrorFree(2);
+ unpack().setGroups( "functional" ).executeTest().verifyErrorFree( 2 );
}
+
public SurefireLauncher unpack()
{
return unpack( "/testng-groups" );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
Sat Jan 14 18:04:18 2012
@@ -32,6 +32,6 @@ public class TestNgParallelWithAnnotatio
{
public void testTestNgGroupThreadParallel()
{
- executeErrorFreeTest("/testng-parallel-with-annotations", 3);
+ executeErrorFreeTest( "/testng-parallel-with-annotations", 3);
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
Sat Jan 14 18:04:18 2012
@@ -38,25 +38,25 @@ public class TestSingleMethodIT
public void testJunit44()
throws Exception
{
- singleMethod( "junit44-single-method");
+ singleMethod( "junit44-single-method" );
}
public void testJunit48()
throws Exception
{
- singleMethod( "junit48-single-method");
+ singleMethod( "junit48-single-method" );
}
public void testTestNg()
throws Exception
{
- singleMethod( "testng-single-method");
+ singleMethod( "testng-single-method" );
}
public void testTestNg5149()
throws Exception
{
- singleMethod( "/testng-single-method-5-14-9");
+ singleMethod( "/testng-single-method-5-14-9" );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
Sat Jan 14 18:04:18 2012
@@ -32,7 +32,7 @@ public class TimeoutForkedTestIT
public void testTimeoutForked()
throws Exception
{
- unpack( "/timeout-forked"
).addGoal("-DsleepLength=10000").addGoal("-DforkTimeout=1").executeTestWithFailure();
+ unpack( "/timeout-forked" ).addGoal( "-DsleepLength=10000" ).addGoal(
"-DforkTimeout=1" ).executeTestWithFailure();
// SUREFIRE-468 test that had to be reverted due to SUREFIRE-705
//assertFalse( getSurefireReportsFile(
"TEST-timeoutForked.BasicTest.xml" ).exists() );
// assertFalse( getSurefireReportsFile( "timeoutForked.BasicTest.txt"
).exists() );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
Sat Jan 14 18:04:18 2012
@@ -50,7 +50,7 @@ public class TwoTestCasesIT
{
final OutputValidator outputValidator = unpack(
"junit-twoTestCaseSuite" ).executeTest();
outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0,
0 );
- List<ReportTestSuite> reports = HelperAssertions.extractReports( ( new
File[]{ outputValidator.getBaseDir() } ) );
+ List<ReportTestSuite> reports = HelperAssertions.extractReports( new
File[]{ outputValidator.getBaseDir() } );
Set<String> classNames = extractClassNames( reports );
assertContains( classNames, "junit.twoTestCaseSuite.BasicTest" );
assertContains( classNames, "junit.twoTestCaseSuite.TestTwo" );
@@ -98,13 +98,13 @@ public class TwoTestCasesIT
{
final OutputValidator outputValidator = unpack(
"testng-twoTestCaseSuite" ).executeTest();
outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0,
0 );
- List<ReportTestSuite> reports = HelperAssertions.extractReports( ( new
File[]{ outputValidator.getBaseDir() } ) );
+ List<ReportTestSuite> reports = HelperAssertions.extractReports( new
File[]{ outputValidator.getBaseDir() } );
Set<String> classNames = extractClassNames( reports );
assertContains( classNames, "testng.two.TestNGTestTwo" );
assertContains( classNames, "testng.two.TestNGSuiteTest" );
assertEquals( "wrong number of classes", 2, classNames.size() );
IntegrationTestSuiteResults results =
HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults(2, 0, 0, 0, results);
+ HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
Sat Jan 14 18:04:18 2012
@@ -44,14 +44,14 @@ public class UmlautDirIT
public void testUmlautIsolatedClassLoader()
throws Exception
{
-
specialUnpack().useSystemClassLoader(false).executeTest().assertTestSuiteResults(
1, 0, 0, 0 );
+ specialUnpack().useSystemClassLoader( false
).executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
}
SurefireLauncher specialUnpack()
throws VerificationException, IOException
{
final File unpackLocation = unpack( "junit-pathWithUmlaut"
).getUnpackLocation();
- File dest = new File(
unpackLocation.getParentFile().getPath(),"/junit-pathWith\u00DCmlaut");
+ File dest = new File( unpackLocation.getParentFile().getPath(),
"/junit-pathWith\u00DCmlaut" );
FileUtils.deleteDirectory( dest );
unpackLocation.renameTo( dest );
return new SurefireLauncher( new Verifier( dest.getAbsolutePath() ) );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
Sat Jan 14 18:04:18 2012
@@ -31,6 +31,6 @@ public class UseIsolatedClassLoaderIT
{
public void testUseSystemClassLoader()
{
- executeErrorFreeTest("/isolated-classloader", 1);
+ executeErrorFreeTest( "/isolated-classloader", 1 );
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
Sat Jan 14 18:04:18 2012
@@ -90,12 +90,13 @@ public class WorkingDirectoryIT
throws VerificationException
{
final OutputValidator child = unpack.getSubProjectValidator( "child" );
- getOutFile(child).delete();
+ getOutFile( child ).delete();
return child;
}
- private TestFile getOutFile(OutputValidator child ){
+ private TestFile getOutFile( OutputValidator child )
+ {
return child.getTargetFile( "out.txt" );
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
Sat Jan 14 18:04:18 2012
@@ -32,7 +32,7 @@ public class WorkingDirectoryMissingIT
public void testWorkingDirectory()
{
- unpack("working-directory-missing").executeTest().verifyErrorFreeLog();
+ unpack( "working-directory-missing"
).executeTest().verifyErrorFreeLog();
}
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java?rev=1231541&r1=1231540&r2=1231541&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
Sat Jan 14 18:04:18 2012
@@ -37,9 +37,9 @@ public class XmlReporterRunTimeIT
public void testForkModeAlways()
throws Exception
{
- OutputValidator outputValidator =
unpack("/runorder-parallel").parallelMethods().executeTest();
+ OutputValidator outputValidator = unpack( "/runorder-parallel"
).parallelMethods().executeTest();
- List<ReportTestSuite> reports = HelperAssertions.extractReports((new
File[]{outputValidator.getBaseDir()}));
+ List<ReportTestSuite> reports = HelperAssertions.extractReports( new
File[]{ outputValidator.getBaseDir() } );
for ( ReportTestSuite report : reports )
{
if ( "runorder.parallel.Test1".equals( report.getFullClassName() )
)
