commit 042071ab5476fd00fab424be8964000e54fc4240
author Hervé Boutemy <hboutemy@apache.org> Sat Jun 06 22:30:22 2020 +0200
committer Hervé Boutemy <hboutemy@apache.org> Sat Jun 06 22:30:22 2020 +0200
tree 053f563c568d59f9008c9f6c3d95fa95e3adf492
parent 2c060ccf4912313eef65a5f6de0684efd7185979

[MNG-5937] fail in setUp() instead of constructor gives better reporting

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 5610f9b..6c46cfc 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
@@ -41,7 +41,7 @@
 public class MavenITmng5937MavenWrapper
     extends AbstractMavenIntegrationTestCase
 {
-    private final Path wrapperDistro;
+    private Path wrapperDistro;
     
     private final Map<String,String> envVars;
     
@@ -49,10 +49,28 @@
     
     private ZipUnArchiver zipUnArchiver = new ZipUnArchiver();
     
-    public MavenITmng5937MavenWrapper() throws Exception
+    public MavenITmng5937MavenWrapper()
+        throws Exception
     {
         super( "[3.7.0,)" );
         
+        String localRepo = System.getProperty("maven.repo.local");
+        
+        envVars = new HashMap<>( 4 );
+        envVars.put( "MVNW_REPOURL", Paths.get( localRepo ).toUri().toURL().toString() );
+        envVars.put( "MVNW_VERBOSE", "true" );
+        String javaHome = System.getenv( "JAVA_HOME" );
+        if ( javaHome != null )
+        {
+            // source needs to call the javac executable.
+            // if JAVA_HOME is not set, ForkedLauncher sets it to java.home, which is the JRE home
+            envVars.put( "JAVA_HOME", javaHome );
+        }
+    }
+
+    public void setUp()
+        throws Exception
+    {
         String mavenDist = System.getProperty( "maven.distro" );
         if ( StringUtils.isEmpty( mavenDist ) )
         {
@@ -74,19 +92,6 @@
             throw new IllegalStateException( "Missing maven.wrapper.distrodir=${wrapperDistroDir} parameter to test maven-wrapper: see run ITs instructions" );
         }
         wrapperDistro = Paths.get( distroValue );
-        
-        String localRepo = System.getProperty("maven.repo.local");
-        
-        envVars = new HashMap<>( 4 );
-        envVars.put( "MVNW_REPOURL", Paths.get( localRepo ).toUri().toURL().toString() );
-        envVars.put( "MVNW_VERBOSE", "true" );
-        String javaHome = System.getenv( "JAVA_HOME" );
-        if ( javaHome != null )
-        {
-            // source needs to call the javac executable.
-            // if JAVA_HOME is not set, ForkedLauncher sets it to java.home, which is the JRE home
-            envVars.put( "JAVA_HOME", javaHome );
-        }
     }
 
     public void testitMNG5937Bin()