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 2015/05/02 11:56:42 UTC
[08/10] maven-surefire git commit: Add review changes requested by
Tibor Digana
Add review changes requested by Tibor Digana
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/78fb9b05
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/78fb9b05
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/78fb9b05
Branch: refs/heads/master
Commit: 78fb9b054a12cfeb5a4e4306e12fe894e50a5dff
Parents: 7552ea9
Author: Sean Flanigan <sf...@redhat.com>
Authored: Thu Apr 30 17:51:36 2015 +1000
Committer: Sean Flanigan <sf...@redhat.com>
Committed: Thu Apr 30 17:51:36 2015 +1000
----------------------------------------------------------------------
.../surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java | 2 +-
.../apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java | 2 +-
.../org/apache/maven/surefire/junitcore/JUnitCoreProvider.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78fb9b05/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
index e0bc7de..fbf87d5 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
@@ -42,7 +42,7 @@ public class Surefire1152RerunFailingTestsInSuiteIT
{
launcher.addGoal( goal );
}
- OutputValidator outputValidator = launcher.executeTest();
+ OutputValidator outputValidator = launcher.executeVerify();
outputValidator.assertTestSuiteResults( 3, 0, 0, 0, 3 );
outputValidator.assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
return outputValidator;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78fb9b05/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
index 6861a21..05988b7 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4ProviderUtil.java
@@ -64,7 +64,7 @@ public final class JUnit4ProviderUtil
{
try
{
- Class testClassObj = Class.forName( classMethod.getClazz(), true, testClassLoader );
+ Class testClassObj = Class.forName( classMethod.getClazz(), false, testClassLoader );
Set<String> failingMethods = testClassMethods.get( testClassObj );
if ( failingMethods == null )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/78fb9b05/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
index bc2dd3b..66147ad 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
@@ -152,7 +152,7 @@ public class JUnitCoreProvider
final FilterFactory filterFactory = new FilterFactory( testClassLoader );
Filter failingMethodsFilter = filterFactory.createFailingMethodFilter( failingTests );
JUnitCoreWrapper.execute( consoleLogger, testsToRun, jUnitCoreParameters, customRunListeners,
- filterFactory.and( filter, failingMethodsFilter ) );
+ failingMethodsFilter );
}
}
return reporterFactory.close();