Repository: maven-surefire Updated Branches: refs/heads/master 5c793434a -> 3ab27f473
[SUREFIRE-1088] fix handling of @Ignored test cases Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3ab27f47 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3ab27f47 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3ab27f47 Branch: refs/heads/master Commit: 3ab27f473c88e9b1ad9fc975dc89c7d5af297616 Parents: 5c79343 Author: Andreas Gudian <agud...@apache.org> Authored: Sun Oct 12 19:46:48 2014 +0200 Committer: Andreas Gudian <agud...@apache.org> Committed: Sun Oct 12 19:46:48 2014 +0200 ---------------------------------------------------------------------- .../maven/plugin/surefire/report/TestSetRunListener.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3ab27f47/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java index d4c0263..35b923c 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java @@ -130,6 +130,8 @@ public class TestSetRunListener public void testSetCompleted( ReportEntry report ) { + clearLastSkipMarker(); + WrappedReportEntry wrap = wrapTestSet( report ); List<String> testResults = briefOrPlainFormat ? detailsForThis.getTestResults() : null; if ( fileReporter != null ) @@ -231,13 +233,18 @@ public class TestSetRunListener private void checkForUnfinishedTestSetDueToSkip( ReportEntry reportEntry ) { - if ( lastSkipped != null && !StringUtils.equals( lastSkipped.getSourceName(), reportEntry.getSourceName() ) ) { + if ( lastSkipped != null && !StringUtils.equals( lastSkipped.getSourceName(), reportEntry.getSourceName() ) ) + { // a new test class was started to be processed, but a skipped test class was not yet marked as completed testSetCompleted( lastSkipped ); - lastSkipped = null; } } + private void clearLastSkipMarker() + { + lastSkipped = null; + } + public void testAssumptionFailure( ReportEntry report ) { testSkipped( report );