fix unit tests

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java

@@ -745,7 +745,7 @@ public abstract class AbstractSurefireMojo extends AbstractMojo implements Suref
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
-    private final PluginConsoleLogger consoleLogger = new PluginConsoleLogger(logger);
+    private PluginConsoleLogger consoleLogger = new PluginConsoleLogger(logger);
 
     /**
      * (TestNG only) Define the factory class used to create all test instances.
@@ -974,12 +974,17 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
     void setLogger(Logger logger) {
         this.logger = logger;
+        this.consoleLogger = new PluginConsoleLogger(logger);
     }
 
     void setSurefireDependencyResolver(SurefireDependencyResolver surefireDependencyResolver) {
         this.surefireDependencyResolver = surefireDependencyResolver;
     }
 
+    SurefireDependencyResolver getSurefireDependencyResolver() {
+        return surefireDependencyResolver;
+    }
+
     @Nonnull
     protected final PluginConsoleLogger getConsoleLogger() {
         return consoleLogger;

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java

@@ -609,7 +609,7 @@ private StartupConfiguration startupConfigurationForProvider(ProviderInfo provid
         File classesDir = mockFile("classes");
         File testClassesDir = mockFile("test-classes");
         TestClassPath testClassPath =
-                new TestClassPath(new ArrayList<Artifact>(), classesDir, testClassesDir, Collections.emptyList());
+                new TestClassPath(new ArrayList<>(), classesDir, testClassesDir, Collections.emptyList());
 
         Artifact common = new DefaultArtifact(
                 "org.apache.maven.surefire",
@@ -1748,7 +1748,6 @@ public void shouldSmartlyResolveJUnit5ProviderWithJupiterEngineInPluginDependenc
         assertThat(junitPlatformArtifact.getArtifactId()).isEqualTo("junit-platform-engine");
         assertThat(junitPlatformArtifact.getVersion()).isEqualTo("1.4.0");
 
-
         PluginDescriptor pluginDescriptor = mock(PluginDescriptor.class);
         mojo.setPluginDescriptor(pluginDescriptor);
         Plugin p = mock(Plugin.class);
@@ -1761,7 +1760,6 @@ public void shouldSmartlyResolveJUnit5ProviderWithJupiterEngineInPluginDependenc
 
         assertThat(prov.isApplicable()).isTrue();
 
-
         Artifact surefireProvider = new DefaultArtifact(
                 "org.apache.maven.surefire", "surefire-junit-platform", surefireVersion, null, "jar", "", null);
         Artifact java5 = new DefaultArtifact(
@@ -1951,8 +1949,8 @@ private JUnitPlatformProviderInfo createJUnitPlatformProviderInfo(
                     testClasspathWrapper,
                     null,
                     null,
-                    getBooterArtifact() ,
-                    mock(SurefireDependencyResolver.class),
+                    getBooterArtifact(),
+                    getSurefireDependencyResolver(),
                     mock(MavenSession.class),
                     mock(MavenProject.class),
                     getPluginDescriptor(),