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 2022/01/23 06:07:19 UTC
[maven-surefire] 10/12: [SUREFIRE-1842] - NPE at end of successful test run
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch release/2.22.3
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 48e8ea02d7246f93eee0a35ce226248bd78cef1b
Author: tibordigana <ti...@apache.org>
AuthorDate: Wed Sep 23 03:38:43 2020 +0200
[SUREFIRE-1842] - NPE at end of successful test run
(cherry picked from commit aef6573be8a31f8235786517405b49a6c1ef89c5)
---
.../java/org/apache/maven/surefire/booter/BaseProviderFactory.java | 3 +--
.../test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
index 2b329ee..4df2c28 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
@@ -111,8 +111,7 @@ public class BaseProviderFactory
@Override
public RunOrderCalculator getRunOrderCalculator()
{
- return directoryScannerParameters == null
- ? null : new DefaultRunOrderCalculator( runOrderParameters, getThreadCount() );
+ return new DefaultRunOrderCalculator( runOrderParameters, getThreadCount() );
}
@Override
diff --git a/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java b/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java
index bf6cafc..a970c6b 100644
--- a/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java
+++ b/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java
@@ -21,9 +21,11 @@ package org.apache.maven.surefire.junit4;
import junit.framework.TestCase;
import org.apache.maven.surefire.booter.BaseProviderFactory;
+import org.apache.maven.surefire.testset.RunOrderParameters;
import org.apache.maven.surefire.testset.TestRequest;
import org.junit.runner.Description;
+import java.io.File;
import java.util.HashMap;
import static java.util.Arrays.asList;
@@ -48,6 +50,7 @@ public class JUnit4ProviderTest
providerParameters.setProviderProperties( new HashMap<String, String>() );
providerParameters.setClassLoaders( getClass().getClassLoader() );
providerParameters.setTestRequest( new TestRequest( null, null, null ) );
+ providerParameters.setRunOrderParameters( new RunOrderParameters( "hourly", new File( "" ) ) );
return new JUnit4Provider( providerParameters );
}