fix the NPEs

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

Author: olamy

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

@@ -2067,7 +2067,7 @@ private Artifact getLoggerApiArtifact() {
         return getPluginArtifactMap().get("org.apache.maven.surefire:surefire-logger-api");
     }
 
-    private Artifact getBooterArtifact() {
+    Artifact getBooterArtifact() {
         return getPluginArtifactMap().get("org.apache.maven.surefire:surefire-booter");
     }
 

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

@@ -1748,10 +1748,6 @@ public void shouldSmartlyResolveJUnit5ProviderWithJupiterEngineInPluginDependenc
         assertThat(junitPlatformArtifact.getArtifactId()).isEqualTo("junit-platform-engine");
         assertThat(junitPlatformArtifact.getVersion()).isEqualTo("1.4.0");
 
-        JUnitPlatformProviderInfo prov =
-                mojo.createJUnitPlatformProviderInfo(junitPlatformArtifact, testClasspathWrapper);
-
-        assertThat(prov.isApplicable()).isTrue();
 
         PluginDescriptor pluginDescriptor = mock(PluginDescriptor.class);
         mojo.setPluginDescriptor(pluginDescriptor);
@@ -1760,6 +1756,12 @@ public void shouldSmartlyResolveJUnit5ProviderWithJupiterEngineInPluginDependenc
         List<Dependency> directPluginDependencies = toDependencies(pluginDepJupiterEngine);
         when(p.getDependencies()).thenReturn(directPluginDependencies);
 
+        JUnitPlatformProviderInfo prov =
+                mojo.createJUnitPlatformProviderInfo(junitPlatformArtifact, testClasspathWrapper);
+
+        assertThat(prov.isApplicable()).isTrue();
+
+
         Artifact surefireProvider = new DefaultArtifact(
                 "org.apache.maven.surefire", "surefire-junit-platform", surefireVersion, null, "jar", "", null);
         Artifact java5 = new DefaultArtifact(
@@ -1949,13 +1951,13 @@ private JUnitPlatformProviderInfo createJUnitPlatformProviderInfo(
                     testClasspathWrapper,
                     null,
                     null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null);
+                    getBooterArtifact() ,
+                    mock(SurefireDependencyResolver.class),
+                    mock(MavenSession.class),
+                    mock(MavenProject.class),
+                    getPluginDescriptor(),
+                    getPluginArtifactMap(),
+                    getConsoleLogger());
         }
 
         void setProjectTestArtifacts(List<Artifact> projectTestArtifacts) {