[maven-surefire] 02/02: [SUREFIRE-1614] Fix corrupted stream warning

[sor]

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

sor pushed a commit to branch SUREFIRE-1614
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 938d422802e431682a866c90f7269ca2fa85f790
Author: Christian Stein <sormu...@gmail.com>
AuthorDate: Wed Dec 12 23:04:47 2018 +0100

    [SUREFIRE-1614] Fix corrupted stream warning
---
 .../junitplatform/JUnitPlatformProvider.java       | 31 +++++++++-------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git 
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
 
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
index 177adef..868b369 100644
--- 
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
+++ 
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
@@ -104,22 +104,29 @@ public class JUnitPlatformProvider
     public RunResult invoke( Object forkTestSet )
                     throws TestSetFailedException, ReporterException
     {
+        ReporterFactory reporterFactory = parameters.getReporterFactory();
+        RunListener runListener = reporterFactory.createReporter();
+
+        ConsoleOutputCapture.startCapture( (ConsoleOutputReceiver) runListener 
);
+
         if ( forkTestSet instanceof TestsToRun )
         {
-            return invokeAllTests( (TestsToRun) forkTestSet );
+            invokeAllTests( (TestsToRun) forkTestSet, runListener );
         }
         else if ( forkTestSet instanceof Class )
         {
-            return invokeAllTests( TestsToRun.fromClass( (Class<?>) 
forkTestSet ) );
+            invokeAllTests( TestsToRun.fromClass( (Class<?>) forkTestSet ), 
runListener );
         }
         else if ( forkTestSet == null )
         {
-            return invokeAllTests( scanClasspath() );
+            invokeAllTests( scanClasspath(), runListener );
         }
         else
         {
             throw new IllegalArgumentException( "Unexpected value of 
forkTestSet: " + forkTestSet );
         }
+
+        return reporterFactory.close();
     }
 
     private TestsToRun scanClasspath()
@@ -130,22 +137,10 @@ public class JUnitPlatformProvider
         return parameters.getRunOrderCalculator().orderTestClasses( 
scannedClasses );
     }
 
-    private RunResult invokeAllTests( TestsToRun testsToRun )
+    private void invokeAllTests( TestsToRun testsToRun, RunListener 
runListener )
     {
-        RunResult runResult;
-        ReporterFactory reporterFactory = parameters.getReporterFactory();
-        try
-        {
-            RunListener runListener = reporterFactory.createReporter();
-            ConsoleOutputCapture.startCapture( (ConsoleOutputReceiver) 
runListener );
-            LauncherDiscoveryRequest discoveryRequest = 
buildLauncherDiscoveryRequest( testsToRun );
-            launcher.execute( discoveryRequest, new RunListenerAdapter( 
runListener ) );
-        }
-        finally
-        {
-            runResult = reporterFactory.close();
-        }
-        return runResult;
+        LauncherDiscoveryRequest discoveryRequest = 
buildLauncherDiscoveryRequest( testsToRun );
+        launcher.execute( discoveryRequest, new RunListenerAdapter( 
runListener ) );
     }
 
     private LauncherDiscoveryRequest buildLauncherDiscoveryRequest( TestsToRun 
testsToRun )