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/02/26 22:06:54 UTC

maven-surefire git commit: UnicodeTestNamesIT

Repository: maven-surefire
Updated Branches:
  refs/heads/UnicodeTestNamesIT2 [created] 1c1249fc7


UnicodeTestNamesIT


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1c1249fc
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1c1249fc
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1c1249fc

Branch: refs/heads/UnicodeTestNamesIT2
Commit: 1c1249fc79965298b580f2354167775468bfc7a4
Parents: a7a5d4b
Author: Tibor17 <ti...@apache.org>
Authored: Mon Feb 26 23:06:34 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Mon Feb 26 23:06:34 2018 +0100

----------------------------------------------------------------------
 Jenkinsfile                                                      | 4 ++--
 surefire-its/pom.xml                                             | 2 +-
 .../java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1c1249fc/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 0b6e691..ff0a65c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,8 +27,8 @@ properties(
 )
 
 final def oses = ['linux', 'windows']
-final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [9, 10]
+final def mavens = ['3.2.x', '3.3.x', '3.5.x']
+final def jdks = [7, 8, 9, 10]
 
 final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1c1249fc/surefire-its/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index bc097db..639962a 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -108,7 +108,7 @@
           <forkMode>once</forkMode>
           <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true</argLine>
           <includes>
-            <include>org/apache/**/*IT*.java</include>
+            <include>org/apache/**/UnicodeTestNamesIT.java</include>
           </includes>
           <!-- Pass current surefire version to the main suite so that it -->
           <!-- can forward to all integration test projects. SUREFIRE-513 -->

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1c1249fc/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
index 64db960..bd200ac 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
@@ -32,7 +32,8 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 
 /**
- * Verifies unicode filenames pass through correctly.
+ * Verifies unicode filenames pass through correctly. <br>
+ * https://issues.apache.org/jira/browse/SUREFIRE-857
  */
 public class UnicodeTestNamesIT
         extends SurefireJUnit4IntegrationTestCase
@@ -64,7 +65,6 @@ public class UnicodeTestNamesIT
 
         TestFile surefireReportFile = outputValidator.getSurefireReportsFile( TXT_REPORT );
         assertTrue( surefireReportFile.exists() );
-        surefireReportFile.assertContainsText( "junit.twoTestCases.????Test" );
 
         TestFile surefireXmlReportFile = outputValidator.getSurefireReportsXmlFile( XML_REPORT );
         assertTrue( surefireXmlReportFile.exists() );