You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2013/04/27 21:45:08 UTC
git commit: [SUREFIRE-991] fixed NPE in ConcurrentRunListener for the
case that a testSucceeds is called more often that testStarting (issue with
the cucumber test runner)
Updated Branches:
refs/heads/master 3d903eb72 -> 6f51572ef
[SUREFIRE-991] fixed NPE in ConcurrentRunListener for the case that a testSucceeds is called more often that testStarting (issue with the cucumber test runner)
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6f51572e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6f51572e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6f51572e
Branch: refs/heads/master
Commit: 6f51572efbb6f3b0132d3225e9077c11bb6e70b9
Parents: 3d903eb
Author: Andreas Gudian <ag...@apache.org>
Authored: Sat Apr 27 20:50:17 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Sat Apr 27 20:50:17 2013 +0200
----------------------------------------------------------------------
.../surefire/junitcore/ConcurrentRunListener.java | 9 ++++++---
.../maven/surefire/junitcore/TestMethod.java | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6f51572e/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
index a1db7f3..7254364 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
@@ -135,9 +135,12 @@ public abstract class ConcurrentRunListener
public void testSucceeded( ReportEntry report )
{
TestMethod testMethod = getTestMethod();
- testMethod.testFinished();
- testMethod.getTestSet().incrementFinishedTests( getRunListener(), reportImmediately );
- testMethod.detachFromCurrentThread();
+ if ( null != testMethod )
+ {
+ testMethod.testFinished();
+ testMethod.getTestSet().incrementFinishedTests( getRunListener(), reportImmediately );
+ testMethod.detachFromCurrentThread();
+ }
}
private TestMethod getOrCreateThreadAttachedTestMethod( ReportEntry description )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6f51572e/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
index cad3fd5..dc1ae27 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
@@ -89,7 +89,7 @@ class TestMethod
public int getElapsed()
{
- return (int) ( endTime - startTime );
+ return endTime > 0 ? (int) ( endTime - startTime ) : 0;
}