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 2020/06/21 11:04:21 UTC
[maven-surefire] branch faster-build updated (795a32f -> 9b7b40e)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch faster-build
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
from 795a32f using ParallelParameterized instead of junit's Parameterized
new 08beb51 two integration tests did not have the postfix "IT"
new 9b7b40e fixed expected value in assertions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...er.java => Surefire1095NpeInRunListenerIT.java} | 2 +-
...Surefire1146RerunFailedAndParameterizedIT.java} | 25 ++++++++++++++++------
2 files changed, 20 insertions(+), 7 deletions(-)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/{Surefire1095NpeInRunListener.java => Surefire1095NpeInRunListenerIT.java} (98%)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/{Surefire1146RerunFailedAndParameterized.java => Surefire1146RerunFailedAndParameterizedIT.java} (68%)
[maven-surefire] 02/02: fixed expected value in assertions
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch faster-build
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 9b7b40e2bca8203cf39d5c4aea7f84117d14bcc4
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Jun 21 13:03:08 2020 +0200
fixed expected value in assertions
---
.../Surefire1146RerunFailedAndParameterizedIT.java | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java
index 4840762..a1c5666 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java
@@ -41,28 +41,41 @@ public class Surefire1146RerunFailedAndParameterizedIT
private void verify( OutputValidator outputValidator, int run, int failures, int errors, int skipped, int flakes )
{
outputValidator.verifyTextInLog( "Flakes:" );
- outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionParameterizedTest.flakyTest[0: (Test11); Test12; Test13;](jiras.surefire1146.CustomDescriptionParameterizedTest)" );
+ outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionParameterizedTest.flakyTest[0: (Test11); Test12; Test13;]" );
outputValidator.verifyTextInLog( "Run 1: CustomDescriptionParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 2: CustomDescriptionParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 3: PASS" );
- outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[0: (Test11), Test12, Test13;](jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest)" );
+ outputValidator.getSurefireReportsXmlFile( "TEST-jiras.surefire1146.CustomDescriptionParameterizedTest.xml" )
+ .assertContainsText( "<testcase name=\"flakyTest[0: (Test11); Test12; Test13;]\" classname=\"jiras.surefire1146.CustomDescriptionParameterizedTest\"" )
+ .assertContainsText( "<testcase name=\"flakyTest[1: (Test21); Test22; Test23;]\" classname=\"jiras.surefire1146.CustomDescriptionParameterizedTest\"" );
+
+ outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[0: (Test11), Test12, Test13;]" );
outputValidator.verifyTextInLog( "Run 1: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 2: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 3: PASS" );
+
+ outputValidator.getSurefireReportsXmlFile( "TEST-jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.xml" )
+ .assertContainsText( "<testcase name=\"flakyTest[0: (Test11), Test12, Test13;]\" classname=\"jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest\"" )
+ .assertContainsText( "<testcase name=\"flakyTest[1: (Test21), Test22, Test23;]\" classname=\"jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest\"" )
+ .assertContainsText( "<testcase name=\"flakyTest[2: (Test31), Test32, Test33;]\" classname=\"jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest\"" );
- outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[2: (Test31), Test32, Test33;](jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest)" );
+ outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[2: (Test31), Test32, Test33;]" );
outputValidator.verifyTextInLog( "Run 1: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 2: PASS" );
- outputValidator.verifyTextInLog( "jiras.surefire1146.SimpleParameterizedTest.flakyTest[0](jiras.surefire1146.SimpleParameterizedTest)" );
+ outputValidator.verifyTextInLog( "jiras.surefire1146.SimpleParameterizedTest.flakyTest[0]" );
outputValidator.verifyTextInLog( "Run 1: SimpleParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 2: SimpleParameterizedTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 3: PASS" );
+ outputValidator.getSurefireReportsXmlFile( "TEST-jiras.surefire1146.SimpleParameterizedTest.xml" )
+ .assertContainsText( "<testcase name=\"flakyTest[0]\" classname=\"jiras.surefire1146.SimpleParameterizedTest\"" );
- outputValidator.verifyTextInLog( "jiras.surefire1146.StandardTest.flakyTest(jiras.surefire1146.StandardTest)" );
+ outputValidator.verifyTextInLog( "jiras.surefire1146.StandardTest.flakyTest" );
outputValidator.verifyTextInLog( "Run 1: StandardTest.flakyTest:" );
outputValidator.verifyTextInLog( "Run 2: PASS" );
+ outputValidator.getSurefireReportsXmlFile( "TEST-jiras.surefire1146.StandardTest.xml" )
+ .assertContainsText( "<testcase name=\"flakyTest\" classname=\"jiras.surefire1146.StandardTest\"" );
verifyStatistics( outputValidator, run, failures, errors, skipped, flakes );
}
[maven-surefire] 01/02: two integration tests did not have the
postfix "IT"
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch faster-build
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 08beb513ef3b0c8983a74230f4e227d23540bb4e
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Jun 21 12:37:48 2020 +0200
two integration tests did not have the postfix "IT"
---
...ire1095NpeInRunListener.java => Surefire1095NpeInRunListenerIT.java} | 2 +-
...arameterized.java => Surefire1146RerunFailedAndParameterizedIT.java} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListenerIT.java
similarity index 98%
rename from surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
rename to surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListenerIT.java
index d120d41..91df0af 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListenerIT.java
@@ -45,7 +45,7 @@ import org.junit.Test;
* @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1095}"/>
* @since 2.18
*/
-public final class Surefire1095NpeInRunListener
+public final class Surefire1095NpeInRunListenerIT
extends SurefireJUnit4IntegrationTestCase
{
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java
similarity index 98%
rename from surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
rename to surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java
index 3a5fa8c..4840762 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterizedIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1146">SUREFIRE-1146</a>
*/
-public class Surefire1146RerunFailedAndParameterized
+public class Surefire1146RerunFailedAndParameterizedIT
extends SurefireJUnit4IntegrationTestCase
{