[2/3] maven-surefire git commit: Merge branch 'master' of https://github.com/apache/maven-surefire into SUREFIRE-1295

[tibordigana]

Merge branch 'master' of https://github.com/apache/maven-surefire into 
SUREFIRE-1295

Conflicts:
        
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9272881e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9272881e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9272881e

Branch: refs/heads/master
Commit: 9272881e6e8228504b3a3bc35a2d3f0c9f171c35
Parents: 364b0c9 a1ecfc0
Author: Tibor17 <tibo...@lycos.com>
Authored: Wed Nov 30 20:42:43 2016 +0100
Committer: Tibor17 <tibo...@lycos.com>
Committed: Wed Nov 30 20:42:43 2016 +0100

----------------------------------------------------------------------
 .../booterclient/output/ForkClient.java         | 101 +++++++------------
 .../booterclient/ForkingRunListenerTest.java    |  59 ++++++-----
 .../surefire/booter/ProviderConfiguration.java  |   5 -
 3 files changed, 66 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9272881e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
----------------------------------------------------------------------
diff --cc 
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index 46d1115,475b9ff..1472aa4
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@@ -77,7 -70,7 +70,7 @@@ import static org.apache.maven.surefire
   * @author Kristian Rosenvold
   */
  public class ForkClient
-         implements StreamConsumer
 -    implements StreamConsumer
++     implements StreamConsumer
  {
      private static final long START_TIME_ZERO = 0L;
      private static final long START_TIME_NEGATIVE_TIMEOUT = -1L;
@@@ -195,52 -183,25 +185,45 @@@
                      setCurrentStartTime();
                      break;
                  case BOOTERCODE_TESTSET_COMPLETED:
 +                    testsInProgress.clear();
- 
-                     getOrCreateReporter( channelNumber )
-                             .testSetCompleted( createReportEntry( remaining ) 
);
++                    
+                     testSetReporter.testSetCompleted( createReportEntry( 
remaining ) );
                      break;
                  case BOOTERCODE_TEST_STARTING:
 +                    ReportEntry reportEntry = createReportEntry( remaining );
 +                    testsInProgress.offer( reportEntry.getSourceName() );
- 
-                     getOrCreateReporter( channelNumber )
-                             .testStarting( createReportEntry( remaining ) );
++                    
+                     testSetReporter.testStarting( createReportEntry( 
remaining ) );
                      break;
                  case BOOTERCODE_TEST_SUCCEEDED:
 +                    reportEntry = createReportEntry( remaining );
 +                    testsInProgress.remove( reportEntry.getSourceName() );
- 
-                     getOrCreateReporter( channelNumber )
-                             .testSucceeded( reportEntry );
++                    
+                     testSetReporter.testSucceeded( createReportEntry( 
remaining ) );
                      break;
                  case BOOTERCODE_TEST_FAILED:
 +                    reportEntry = createReportEntry( remaining );
 +                    testsInProgress.remove( reportEntry.getSourceName() );
- 
-                     getOrCreateReporter( channelNumber )
-                             .testFailed( reportEntry );
++                    
+                     testSetReporter.testFailed( createReportEntry( remaining 
) );
                      break;
                  case BOOTERCODE_TEST_SKIPPED:
 +                    reportEntry = createReportEntry( remaining );
 +                    testsInProgress.remove( reportEntry.getSourceName() );
- 
-                     getOrCreateReporter( channelNumber )
-                             .testSkipped( reportEntry );
++                    
+                     testSetReporter.testSkipped( createReportEntry( remaining 
) );
                      break;
                  case BOOTERCODE_TEST_ERROR:
 +                    reportEntry = createReportEntry( remaining );
 +                    testsInProgress.remove( reportEntry.getSourceName() );
- 
-                     getOrCreateReporter( channelNumber )
-                             .testError( reportEntry );
++                    
+                     testSetReporter.testError( createReportEntry( remaining ) 
);
                      break;
                  case BOOTERCODE_TEST_ASSUMPTIONFAILURE:
 +                    reportEntry = createReportEntry( remaining );
 +                    testsInProgress.remove( reportEntry.getSourceName() );
- 
-                     getOrCreateReporter( channelNumber )
-                             .testAssumptionFailure( reportEntry );
++                    
+                     testSetReporter.testAssumptionFailure( createReportEntry( 
remaining ) );
                      break;
                  case BOOTERCODE_SYSPROPS:
                      int keyEnd = remaining.indexOf( "," );