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/26 22:41:02 UTC
[1/2] git commit: [SUREFIRE-990] prevent NPE in case the testClass in
a Description is null
Updated Branches:
refs/heads/master 50a12074a -> 2feedb6b1
[SUREFIRE-990] prevent NPE in case the testClass in a Description is null
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ff463e07
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ff463e07
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ff463e07
Branch: refs/heads/master
Commit: ff463e0758ee69eae8a9f78ed0feb8410256f803
Parents: 8315562
Author: Andreas Gudian <ag...@apache.org>
Authored: Fri Apr 26 22:18:01 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Fri Apr 26 22:18:01 2013 +0200
----------------------------------------------------------------------
.../surefire/common/junit48/FilterFactory.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ff463e07/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
index d3c5b07..2386c8d 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
@@ -170,7 +170,7 @@ public class FilterFactory
public boolean shouldRun( Description description )
{
return shouldRun( description,
- ( description.getMethodName() == null ? null
+ ( ( description.getMethodName() == null || description.getTestClass() == null ) ? null
: Description.createSuiteDescription( description.getTestClass() ) ) );
}
[2/2] git commit: Merge remote-tracking branch
'refs/remotes/apache/master'
Posted by ag...@apache.org.
Merge remote-tracking branch 'refs/remotes/apache/master'
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2feedb6b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2feedb6b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2feedb6b
Branch: refs/heads/master
Commit: 2feedb6b16494ca4a573a6f796a3e1ef85f5724e
Parents: ff463e0 50a1207
Author: Andreas Gudian <ag...@apache.org>
Authored: Fri Apr 26 22:34:30 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Fri Apr 26 22:34:30 2013 +0200
----------------------------------------------------------------------
.../plugin/surefire/InPluginVMSurefireStarter.java | 9 +-
.../plugin/surefire/booterclient/ForkStarter.java | 21 +-
.../maven/surefire/booter/BaseProviderFactory.java | 2 +-
.../surefire/booter/SurefireClassLoadersAware.java | 2 +-
.../maven/surefire/booter/SurefireReflector.java | 17 +-
.../apache/maven/surefire/util/LazyTestsToRun.java | 183 ---------------
.../surefire/booter/ClasspathConfiguration.java | 25 +-
.../apache/maven/surefire/booter/ForkedBooter.java | 90 ++++++--
.../maven/surefire/booter/LazyTestsToRun.java | 181 ++++++++++++++
.../maven/surefire/booter/ProviderFactory.java | 27 +--
.../java/org/apache/maven/surefire/booter/Foo.java | 2 +-
.../surefire/booter/SurefireReflectorTest.java | 2 +-
.../maven/surefire/junit4/JUnit4ProviderTest.java | 2 +-
13 files changed, 298 insertions(+), 265 deletions(-)
----------------------------------------------------------------------