commit d8d59559a8370a70b65d972c114ec1660fb19785
author Hervé Boutemy <hboutemy@apache.org> Sat Jun 06 18:34:41 2020 +0200
committer Hervé Boutemy <hboutemy@apache.org> Sat Jun 06 18:34:41 2020 +0200
tree 3bf9b3c60e5cc6e0d1d41f2d0503edac4e70c6ed
parent 94d92aad2c1966d29ec41e24648d17834fec433f

[MNG-5937] improved check & msg for unconfigured wrapper properties

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
index 915786c..5610f9b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
@@ -23,7 +23,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -33,6 +32,7 @@
 
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-5937">MNG-5937</a>.
@@ -54,9 +54,9 @@
         super( "[3.7.0,)" );
         
         String mavenDist = System.getProperty( "maven.distro" );
-        if ( mavenDist == null )
+        if ( StringUtils.isEmpty( mavenDist ) )
         {
-            throw new IllegalStateException( "Missing maven.distro to test maven-wrapper" );
+            throw new IllegalStateException( "Missing maven.distro=${mavenDistro} parameter to test maven-wrapper: see run ITs instructions" );
         }
         
         Verifier distInstaller = newVerifier( baseDir.toAbsolutePath().toFile().toString() );
@@ -69,9 +69,9 @@
         distInstaller.executeGoal( "org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file" );
         
         String distroValue = System.getProperty( "maven.wrapper.distrodir" );
-        if ( distroValue == null )
+        if ( StringUtils.isEmpty( distroValue ) )
         {
-            throw new IllegalStateException( "Missing maven.wrapper.distrodir to test maven-wrapper" );
+            throw new IllegalStateException( "Missing maven.wrapper.distrodir=${wrapperDistroDir} parameter to test maven-wrapper: see run ITs instructions" );
         }
         wrapperDistro = Paths.get( distroValue );