[SUREFIRE-2005] Improved dump message "Boot Manifest-JAR contains abs…

…olute paths in classpath" with exception message
apache · Feb 7, 2022 · 550f98a · 550f98a
1 parent 463fb64
commit 550f98a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java b/...main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java
@@ -54,6 +54,7 @@
 import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath;
 import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.absolute;
 import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.relative;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
 import static org.apache.maven.surefire.api.util.internal.StringUtils.NL;
 
 /**
@@ -198,6 +199,13 @@ static ClasspathElementUri toClasspathElementUri( @Nonnull Path parent,
                         + "'"
                         + NL
                         + "Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>";
+
+                if ( isNotBlank( e.getLocalizedMessage() ) )
+                {
+                    error += NL;
+                    error += e.getLocalizedMessage();
+                }
+
                 InPluginProcessDumpSingleton.getSingleton()
                         .dumpStreamText( error, dumpLogDirectory );
             }

diff --git a/.../java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfigurationTest.java b/.../java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfigurationTest.java
@@ -182,7 +182,7 @@ public URI answer( InvocationOnMock invocation ) throws URISyntaxException
                     }
                 } );
         when( relativize( same( parent ), same( classPathElement ) ) )
-                .thenThrow( new IllegalArgumentException() );
+                .thenThrow( new IllegalArgumentException( "'other' has different root" ) );
         when( toClasspathElementUri( same( parent ), same( classPathElement ), same( dumpDirectory ), anyBoolean() ) )
                 .thenCallRealMethod();
         when( escapeUri( anyString(), any( Charset.class ) ) )