Updated Branches: refs/heads/master 9c4bba6f4 -> 3a0dbc30a
Fixing locale-specific binding within test-suite itself Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3a0dbc30 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3a0dbc30 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3a0dbc30 Branch: refs/heads/master Commit: 3a0dbc30a80daf2e02691f0c90bd70619fedcaba Parents: 9c4bba6 Author: Kristian Rosenvold <[email protected]> Authored: Fri Mar 22 15:29:38 2013 +0100 Committer: Kristian Rosenvold <[email protected]> Committed: Fri Mar 22 15:29:38 2013 +0100 ---------------------------------------------------------------------- pom.xml | 5 ++++ surefire-integration-tests/pom.xml | 4 +++ .../its/ForkConsoleOutputWithErrorsIT.java | 2 +- .../org/apache/maven/surefire/its/ReportersIT.java | 2 +- .../surefire/its/fixture/OutputValidator.java | 18 +++++++++++--- .../maven/surefire/its/fixture/TestFile.java | 11 ++++++++- .../its/jiras/Surefire943ReportContentIT.java | 2 +- .../its/jiras/Surefire975DefaultVMEncodingIT.java | 2 +- 8 files changed, 37 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bb5ae5f..ff015bf 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,11 @@ <version>3.1</version> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.2</version> + </dependency> + <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-booter</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml index cc91c3a..4a3799f 100644 --- a/surefire-integration-tests/pom.xml +++ b/surefire-integration-tests/pom.xml @@ -83,6 +83,10 @@ <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java index 8652512..af4a6e6 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java @@ -40,7 +40,7 @@ public class ForkConsoleOutputWithErrorsIT final OutputValidator outputValidator = unpack( "/fork-consoleOutputWithErrors" ). failNever().redirectToFile( true ).executeTest(); final TestFile surefireReportsFile = - outputValidator.getSurefireReportsFile( "TEST-forkConsoleOutput.Test2.xml" ); + outputValidator.getSurefireReportsXmlFile( "TEST-forkConsoleOutput.Test2.xml" ); surefireReportsFile.assertContainsText( "sout: Will Fail soon" ); surefireReportsFile.assertContainsText( "serr: Will Fail now" ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java index 701342f..b1c68f0 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java @@ -38,7 +38,7 @@ public class ReportersIT OutputValidator reporters = unpack( "reporters" ).redirectToFile( true ).printSummary( true ).executeTest(); reporters.getSurefireReportsFile( "TestSuite-output.txt" ).assertFileExists(); - reporters.getSurefireReportsFile( "TEST-TestSuite.xml" ).assertFileExists(); + reporters.getSurefireReportsXmlFile( "TEST-TestSuite.xml" ).assertFileExists(); reporters.getSurefireReportsFile( "TestSuite.txt" ).assertFileExists(); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java index 99e9a18..f5beb9c 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java @@ -20,7 +20,11 @@ package org.apache.maven.surefire.its.fixture; */ import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; import java.util.List; + +import org.apache.commons.io.FileUtils; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; @@ -97,21 +101,21 @@ public class OutputValidator } } - public List<String> loadFile( File file, boolean hasCommand ) + public List<String> loadFile( File file, Charset charset ) { //noinspection unchecked try { - //noinspection unchecked - return verifier.loadFile( file, hasCommand ); + return FileUtils.readLines( file, charset.name() ); } - catch ( VerificationException e ) + catch ( IOException e ) { throw new SurefireVerifierException( e ); } } + public String getBasedir() { return verifier.getBasedir(); @@ -166,6 +170,12 @@ public class OutputValidator return new TestFile( new File( targetDir, fileName ), this ); } + public TestFile getSurefireReportsXmlFile( String fileName ) + { + File targetDir = getSubFile( "target/surefire-reports" ); + return new TestFile( new File( targetDir, fileName ), Charset.forName("UTF-8"), this ); + } + public TestFile getSiteFile( String fileName ) { File targetDir = getSubFile( "target/site" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java index 9a62d64..3c76c62 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java @@ -26,6 +26,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.net.URI; +import java.nio.charset.Charset; import java.util.List; import org.apache.commons.io.FileUtils; @@ -41,11 +42,19 @@ public class TestFile private final File file; + private final Charset encoding; + private final OutputValidator surefireVerifier; public TestFile( File file, OutputValidator surefireVerifier ) { + this( file, Charset.defaultCharset(), surefireVerifier); + } + + public TestFile( File file, Charset charset,OutputValidator surefireVerifier ) + { this.file = file; + this.encoding = charset; this.surefireVerifier = surefireVerifier; } @@ -123,7 +132,7 @@ public class TestFile public TestFile assertContainsText( String text ) { - final List<String> list = surefireVerifier.loadFile( file, false ); + final List<String> list = surefireVerifier.loadFile( file, encoding ); for ( String line : list ) { if ( line.contains( text ) ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java index 8e68d28..5568c48 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java @@ -48,7 +48,7 @@ public class Surefire943ReportContentIT throws FileNotFoundException { Xpp3Dom testResult = - Xpp3DomBuilder.build( validator.getSurefireReportsFile( "TEST-" + className + ".xml" ).getFileInputStream(), + Xpp3DomBuilder.build( validator.getSurefireReportsXmlFile( "TEST-" + className + ".xml" ).getFileInputStream(), "UTF-8" ); Xpp3Dom[] children = testResult.getChildren( "testcase" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a0dbc30/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java index 9469126..1fce01d 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java @@ -34,7 +34,7 @@ public class Surefire975DefaultVMEncodingIT { OutputValidator outputValidator = unpack( "surefire-975-wrong-encoding" ).setMavenOpts( "-Dfile.encoding=windows-1251" ).executeTest(); - outputValidator.getSurefireReportsFile( "TEST-EncodingInReportTest.xml" ).assertContainsText( + outputValidator.getSurefireReportsXmlFile( "TEST-EncodingInReportTest.xml" ).assertContainsText( "\u043A\u0438\u0440\u0438\u043B\u043B\u0438\u0446\u0435" ); }
