You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/01/04 22:17:42 UTC
maven-surefire git commit: UnicodeTestNamesIT should be able to run
multiple times [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/UnicodeTestNamesIT 38ca7e316 -> ea8708849 (forced update)
UnicodeTestNamesIT should be able to run 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/ea870884
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ea870884
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ea870884
Branch: refs/heads/UnicodeTestNamesIT
Commit: ea870884958c383b3068fd834a80ef7d6ac3282f
Parents: 2f16bc7
Author: Tibor17 <ti...@apache.org>
Authored: Thu Jan 4 01:06:04 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Thu Jan 4 23:17:04 2018 +0100
----------------------------------------------------------------------
.../maven/surefire/its/UnicodeTestNamesIT.java | 37 ++++++++++++--------
1 file changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ea870884/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..e1b5c4b 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,41 +20,48 @@ 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.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
/**
* 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() );
+ assumeFalse( 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() );
- //surefireReportsFile .assertContainsText( "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.txt" );
+ assertTrue( surefireReportsFile.exists() );
+ surefireReportsFile.assertContainsText( "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test" );
}
}