Repository: maven-surefire Updated Branches: refs/heads/UnicodeTestNamesIT [created] bd46d1ede
UnicodeTestNamesIT should be able to run on Unix/Windows multiple times Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bd46d1ed Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bd46d1ed Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bd46d1ed Branch: refs/heads/UnicodeTestNamesIT Commit: bd46d1edecb6430d13adfef8a9388720993eab84 Parents: 0a81c48 Author: Tibor17 <[email protected]> Authored: Thu Jan 4 01:06:04 2018 +0100 Committer: Tibor17 <[email protected]> Committed: Thu Jan 4 01:06:04 2018 +0100 ---------------------------------------------------------------------- .../maven/surefire/its/UnicodeTestNamesIT.java | 35 ++++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd46d1ed/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java index 5470a3f..1ad5fe9 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java @@ -20,40 +20,47 @@ package org.apache.maven.surefire.its; */ import java.io.File; + import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.apache.maven.surefire.its.fixture.TestFile; -import org.junit.Assert; -import org.junit.Assume; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Verifies unicode filenames pass through correctly. - * <br> - * If the underlying file system turns out not to support unicode, we just fail an assumption.s */ public class UnicodeTestNamesIT - extends SurefireJUnit4IntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { @Test public void checkFileNamesWithUnicode() { SurefireLauncher unpacked = unpack( "unicode-testnames" ); - File xxyz = new File( unpacked.getUnpackedAt(), "src/test/java/junit/twoTestCases/XXYZTest.java" ); + File basedir = unpacked.getUnpackedAt(); + + unpacked.execute( "clean" ); + + File xxyz = new File( basedir, "src/test/java/junit/twoTestCases/XXYZTest.java" ); + File dest = new File( basedir, "src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java" ); + + //noinspection ResultOfMethodCallIgnored + dest.delete(); + assertTrue( xxyz.renameTo( dest ) ); - File dest = new File( unpacked.getUnpackedAt(), - "src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java" ); + assertTrue( dest.exists() ); + assertFalse( new File( basedir, "src/test/java/junit/twoTestCases/????Test.java" ).exists() ); - Assume.assumeTrue( xxyz.renameTo( dest ) ); - Assume.assumeTrue( dest.exists() ); - Assume.assumeTrue( - !new File( unpacked.getUnpackedAt(), "src/test/java/junit/twoTestCases/????Test.java" ).exists() ); + OutputValidator outputValidator = + unpacked.executeTest() + .assertTestSuiteResults( 2, 0, 0, 0 ); - OutputValidator outputValidator = unpacked.executeTest().assertTestSuiteResults( 2, 0, 0, 0 ); TestFile surefireReportsFile = outputValidator.getSurefireReportsFile( "junit.twoTestCases.èç´¢å ¶æ Test.txt" ); - Assert.assertTrue( surefireReportsFile.exists() ); + assertTrue( surefireReportsFile.exists() ); //surefireReportsFile .assertContainsText( "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.txt" ); }
