[maven-verifier] branch MSHARED-885 updated: [MSHARED-885] Adjust tests

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-885
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git


The following commit(s) were added to refs/heads/MSHARED-885 by this push:
     new ff3e1f5  [MSHARED-885] Adjust tests
ff3e1f5 is described below

commit ff3e1f5d5858439f46f5a7aaec0b695fd4e870ff
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sun May 3 13:36:09 2020 +0200

    [MSHARED-885] Adjust tests
---
 .../java/org/apache/maven/it/ForkedLauncherTest.java   | 18 ++++++++++++------
 src/test/resources/wrapper-project/mvnw                |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/apache/maven/it/ForkedLauncherTest.java 
b/src/test/java/org/apache/maven/it/ForkedLauncherTest.java
index 5ed5e78..05effea 100644
--- a/src/test/java/org/apache/maven/it/ForkedLauncherTest.java
+++ b/src/test/java/org/apache/maven/it/ForkedLauncherTest.java
@@ -1,5 +1,7 @@
 package org.apache.maven.it;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -20,7 +22,6 @@ package org.apache.maven.it;
  */
 
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
@@ -32,7 +33,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Properties;
 
-import org.apache.maven.it.ForkedLauncher;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -52,9 +52,12 @@ public class ForkedLauncherTest
         launcher = new ForkedLauncher( ".", Collections.<String, 
String>emptyMap(), false, true );
         File logFile = temporaryFolder.newFile( "build.log" );
 
-        assertThat( "exit code", launcher.run( new String[0], new 
Properties(), workingDir, logFile ), is( 0 ) );
-        
+        int exitCode = launcher.run( new String[0], new Properties(), 
workingDir, logFile );
+
+        // most likely this contains the exception in case exitCode != 0
         expectFileLine( logFile, "Hello World" );
+
+        assertThat( "exit code", exitCode , is ( 0 ) );
     }
 
     @Test
@@ -63,9 +66,12 @@ public class ForkedLauncherTest
         launcher = new ForkedLauncher( ".", Collections.<String, 
String>emptyMap(), true, true );
         File logFile = temporaryFolder.newFile( "build.log" );
 
-        launcher.run( new String[0], new Properties(), workingDir, logFile );
-        
+        int exitCode = launcher.run( new String[0], new Properties(), 
workingDir, logFile );
+
+        // most likely this contains the exception in case exitCode != 0
         expectFileLine( logFile, "Hello World" );
+
+        assertThat( "exit code", exitCode , is ( 0 ) );
     }
     
     private void expectFileLine( File file, String expectedline ) throws 
IOException
diff --git a/src/test/resources/wrapper-project/mvnw 
b/src/test/resources/wrapper-project/mvnw
index 5be005b..e8c29e9 100644
--- a/src/test/resources/wrapper-project/mvnw
+++ b/src/test/resources/wrapper-project/mvnw
@@ -17,4 +17,4 @@
 # specific language governing permissions and limitations
 # under the License.
 # ----------------------------------------------------------------------------
-echo Hello Linux
+echo Hello World