This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch maven2surefire-jvm-communication
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to
refs/heads/maven2surefire-jvm-communication by this push:
new fc1c90a using (future with Generics) EventHandler instead of
org.apache.maven.surefire.shared.utils.cli.StreamConsumer
fc1c90a is described below
commit fc1c90a538842ef7a98ec99811401adad62b5c96
Author: tibordigana <[email protected]>
AuthorDate: Tue Feb 18 01:16:17 2020 +0100
using (future with Generics) EventHandler instead of
org.apache.maven.surefire.shared.utils.cli.StreamConsumer
---
.../plugin/surefire/booterclient/ForkStarter.java | 4 +--
.../surefire/booterclient/output/ForkClient.java | 25 ++++++++++---------
.../output/NativeStdErrStreamConsumer.java | 8 +++---
.../output/ThreadedStreamConsumer.java | 22 ++++++----------
.../surefire/extensions/LegacyForkChannel.java | 8 +++---
.../surefire/extensions/SurefireForkChannel.java | 8 +++---
.../booterclient/output/ForkClientTest.java | 4 +--
.../maven/surefire/extensions/ForkChannelTest.java | 6 ++---
.../maven/surefire/extensions/ForkChannel.java | 9 +++----
.../surefire/extensions/StdErrStreamLine.java | 29 ----------------------
.../extensions/util/LineConsumerThread.java | 14 +++++------
.../extensions/util/CommandlineExecutorTest.java | 6 ++---
12 files changed, 57 insertions(+), 86 deletions(-)
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index ad66d0a..3eb7d09 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -34,6 +34,7 @@ import
org.apache.maven.plugin.surefire.booterclient.output.ThreadedStreamConsum
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
import org.apache.maven.surefire.extensions.CloseableDaemonThread;
+import org.apache.maven.surefire.extensions.EventHandler;
import org.apache.maven.surefire.extensions.util.CommandlineExecutor;
import org.apache.maven.surefire.extensions.util.CommandlineStreams;
import org.apache.maven.surefire.extensions.util.CountdownCloseable;
@@ -50,7 +51,6 @@ import org.apache.maven.surefire.extensions.ForkNodeFactory;
import org.apache.maven.surefire.extensions.util.LineConsumerThread;
import org.apache.maven.surefire.providerapi.SurefireProvider;
import org.apache.maven.surefire.report.StackTraceWriter;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import org.apache.maven.surefire.suite.RunResult;
import org.apache.maven.surefire.testset.TestRequest;
import org.apache.maven.surefire.util.DefaultScanResult;
@@ -639,7 +639,7 @@ public class ForkStarter
in = forkChannel.bindCommandReader( commandReader,
streams.getStdInChannel() );
in.start();
- StreamConsumer stdErrConsumer = new NativeStdErrStreamConsumer(
reporter );
+ EventHandler stdErrConsumer = new NativeStdErrStreamConsumer(
reporter );
out = forkChannel.bindEventHandler( eventConsumer,
countdownCloseable, streams.getStdOutChannel() );
out.start();
diff --git
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
index a02db78..703e92b 100644
---
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
@@ -22,8 +22,8 @@ package org.apache.maven.plugin.surefire.booterclient.output;
import
org.apache.maven.plugin.surefire.booterclient.lazytestprovider.NotifiableTestStream;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
+import org.apache.maven.surefire.extensions.EventHandler;
import org.apache.maven.surefire.providerapi.MasterProcessChannelEncoder;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.RunListener;
@@ -31,6 +31,7 @@ import org.apache.maven.surefire.report.RunMode;
import org.apache.maven.surefire.report.StackTraceWriter;
import org.apache.maven.surefire.report.TestSetReportEntry;
+import javax.annotation.Nonnull;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -59,7 +60,7 @@ import static
org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
* @author Kristian Rosenvold
*/
public class ForkClient
- implements StreamConsumer
+ implements EventHandler
{
private static final String PRINTABLE_JVM_NATIVE_STREAM = "Listening for
transport dt_socket at address:";
private static final long START_TIME_ZERO = 0L;
@@ -168,7 +169,7 @@ public class ForkClient
}
}
- private final class TestStartingListener implements
ForkedProcessReportEventListener
+ private final class TestStartingListener implements
ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
@@ -178,7 +179,7 @@ public class ForkClient
}
}
- private final class TestSucceededListener implements
ForkedProcessReportEventListener
+ private final class TestSucceededListener implements
ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
@@ -188,7 +189,7 @@ public class ForkClient
}
}
- private final class TestFailedListener implements
ForkedProcessReportEventListener
+ private final class TestFailedListener implements
ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
@@ -198,7 +199,7 @@ public class ForkClient
}
}
- private final class TestSkippedListener implements
ForkedProcessReportEventListener
+ private final class TestSkippedListener implements
ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
@@ -208,7 +209,7 @@ public class ForkClient
}
}
- private final class TestErrorListener implements
ForkedProcessReportEventListener
+ private final class TestErrorListener implements
ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
@@ -218,7 +219,7 @@ public class ForkClient
}
}
- private final class TestAssumptionFailureListener implements
ForkedProcessReportEventListener
+ private final class TestAssumptionFailureListener implements
ForkedProcessReportEventListener<ReportEntry>
{
@Override
public void handle( RunMode runMode, ReportEntry reportEntry )
@@ -373,11 +374,11 @@ public class ForkClient
}
@Override
- public final void consumeLine( String s )
+ public final void handleEvent( @Nonnull String event )
{
- if ( isNotBlank( s ) )
+ if ( isNotBlank( event ) )
{
- processLine( s );
+ processLine( event );
}
}
@@ -472,7 +473,7 @@ public class ForkClient
BufferedReader stringReader = new BufferedReader( new
StringReader( s ) );
for ( String s1 = stringReader.readLine(); s1 != null; s1 =
stringReader.readLine() )
{
- consumeLine( s1 );
+ handleEvent( s1 );
}
}
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
index 8e4f6f0..06ecc93 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
@@ -20,7 +20,9 @@ package org.apache.maven.plugin.surefire.booterclient.output;
*/
import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
-import org.apache.maven.surefire.extensions.StdErrStreamLine;
+import org.apache.maven.surefire.extensions.EventHandler;
+
+import javax.annotation.Nonnull;
/**
* Used by forked JMV, see {@link
org.apache.maven.plugin.surefire.booterclient.ForkStarter}.
@@ -30,7 +32,7 @@ import org.apache.maven.surefire.extensions.StdErrStreamLine;
* @see org.apache.maven.plugin.surefire.booterclient.ForkStarter
*/
public final class NativeStdErrStreamConsumer
- implements StdErrStreamLine
+ implements EventHandler
{
private final DefaultReporterFactory defaultReporterFactory;
@@ -40,7 +42,7 @@ public final class NativeStdErrStreamConsumer
}
@Override
- public void consumeLine( String line )
+ public void handleEvent( @Nonnull String line )
{
InPluginProcessDumpSingleton.getSingleton()
.dumpStreamText( line,
defaultReporterFactory.getReportsDirectory() );
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
index 316167c..a6ae68f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
@@ -38,7 +38,7 @@ import static java.lang.Thread.currentThread;
* @author Kristian Rosenvold
*/
public final class ThreadedStreamConsumer
- implements EventHandler, StreamConsumer, Closeable
+ implements EventHandler, Closeable
{
private static final String END_ITEM = "";
@@ -55,17 +55,17 @@ public final class ThreadedStreamConsumer
final class Pumper
implements Runnable
{
- private final StreamConsumer target;
+ private final EventHandler target;
private final MultipleFailureException errors = new
MultipleFailureException();
- Pumper( StreamConsumer target )
+ Pumper( EventHandler target )
{
this.target = target;
}
/**
- * Calls {@link ForkClient#consumeLine(String)} which may throw any
{@link RuntimeException}.<br>
+ * Calls {@link ForkClient#handleEvent(String)} which may throw any
{@link RuntimeException}.<br>
* Even if {@link ForkClient} is not fault-tolerant, this method MUST
be fault-tolerant and thus the
* try-catch block must be inside of the loop which prevents from
loosing events from {@link StreamConsumer}.
* <br>
@@ -87,7 +87,7 @@ public final class ThreadedStreamConsumer
{
return;
}
- target.consumeLine( item );
+ target.handleEvent( item );
}
catch ( Throwable t )
{
@@ -107,7 +107,7 @@ public final class ThreadedStreamConsumer
}
}
- public ThreadedStreamConsumer( StreamConsumer target )
+ public ThreadedStreamConsumer( EventHandler target )
{
pumper = new Pumper( target );
thread = DaemonThreadFactory.newDaemonThread( pumper,
"ThreadedStreamConsumer" );
@@ -115,15 +115,9 @@ public final class ThreadedStreamConsumer
}
@Override
- // todo remove this method and use object instead of string
+ // todo use object instead of string
public void handleEvent( @Nonnull String event )
{
- consumeLine( event );
- }
-
- @Override
- public void consumeLine( @Nonnull String s )
- {
if ( stop.get() )
{
return;
@@ -136,7 +130,7 @@ public final class ThreadedStreamConsumer
try
{
- items.put( s );
+ items.put( event );
}
catch ( InterruptedException e )
{
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
index e030c43..1df3326 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/LegacyForkChannel.java
@@ -21,11 +21,11 @@ package org.apache.maven.plugin.surefire.extensions;
import org.apache.maven.surefire.extensions.CloseableDaemonThread;
import org.apache.maven.surefire.extensions.CommandReader;
+import org.apache.maven.surefire.extensions.EventHandler;
import org.apache.maven.surefire.extensions.ForkChannel;
import org.apache.maven.surefire.extensions.util.CountdownCloseable;
import org.apache.maven.surefire.extensions.util.LineConsumerThread;
import org.apache.maven.surefire.extensions.util.StreamFeeder;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import javax.annotation.Nonnull;
import java.nio.channels.ReadableByteChannel;
@@ -66,11 +66,13 @@ final class LegacyForkChannel extends ForkChannel
}
@Override
- public CloseableDaemonThread bindEventHandler( @Nonnull StreamConsumer
consumer,
+ public CloseableDaemonThread bindEventHandler( @Nonnull EventHandler
eventHandler,
@Nonnull CountdownCloseable
countdownCloseable,
ReadableByteChannel stdOut )
{
- return new LineConsumerThread( "std-out-fork-" + getForkChannelId(),
stdOut, consumer, countdownCloseable );
+ // todo develop Event and EventConsumerThread, see the algorithm in
ForkedChannelDecoder#handleEvent()
+ return new LineConsumerThread( "std-out-fork-" + getForkChannelId(),
stdOut,
+ eventHandler, countdownCloseable );
}
@Override
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
index d7d0880..149c147 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
@@ -21,11 +21,11 @@ package org.apache.maven.plugin.surefire.extensions;
import org.apache.maven.surefire.extensions.CloseableDaemonThread;
import org.apache.maven.surefire.extensions.CommandReader;
+import org.apache.maven.surefire.extensions.EventHandler;
import org.apache.maven.surefire.extensions.ForkChannel;
import org.apache.maven.surefire.extensions.util.CountdownCloseable;
import org.apache.maven.surefire.extensions.util.LineConsumerThread;
import org.apache.maven.surefire.extensions.util.StreamFeeder;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import javax.annotation.Nonnull;
import java.io.IOException;
@@ -102,11 +102,13 @@ final class SurefireForkChannel extends ForkChannel
}
@Override
- public CloseableDaemonThread bindEventHandler( @Nonnull StreamConsumer
consumer,
+ public CloseableDaemonThread bindEventHandler( @Nonnull EventHandler
eventHandler,
@Nonnull CountdownCloseable
countdownCloseable,
ReadableByteChannel stdOut )
{
- return new LineConsumerThread( "events-fork-" + getForkChannelId(),
channel, consumer, countdownCloseable );
+ // todo develop Event and EventConsumerThread, see the algorithm in
ForkedChannelDecoder#handleEvent()
+ return new LineConsumerThread( "events-fork-" + getForkChannelId(),
channel,
+ eventHandler, countdownCloseable );
}
@Override
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
index 8a5db41..1aedbb4 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
@@ -85,7 +85,7 @@ public class ForkClientTest
AtomicBoolean printedErrorStream = new AtomicBoolean();
ConsoleLogger logger = mock( ConsoleLogger.class );
ForkClient client = new ForkClient( factory, null, logger,
printedErrorStream, 0 );
- client.consumeLine( null );
+ client.handleEvent( null );
assertThat( client.isSaidGoodBye() )
.isFalse();
assertThat( client.getErrorInFork() )
@@ -113,7 +113,7 @@ public class ForkClientTest
AtomicBoolean printedErrorStream = new AtomicBoolean();
ConsoleLogger logger = mock( ConsoleLogger.class );
ForkClient client = new ForkClient( factory, null, logger,
printedErrorStream, 0 );
- client.consumeLine( " " );
+ client.handleEvent( " " );
assertThat( client.isSaidGoodBye() )
.isFalse();
assertThat( client.getErrorInFork() )
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
index 3b3780b..9ad815c 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
@@ -23,9 +23,9 @@ import
org.apache.maven.plugin.surefire.booterclient.lazytestprovider.TestLessIn
import
org.apache.maven.plugin.surefire.booterclient.lazytestprovider.TestLessInputStream.TestLessInputStreamBuilder;
import org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory;
import org.apache.maven.surefire.extensions.util.CountdownCloseable;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import org.junit.Test;
+import javax.annotation.Nonnull;
import java.io.Closeable;
import java.io.IOException;
import java.net.Socket;
@@ -113,12 +113,12 @@ public class ForkChannelTest
}
}
- private static class Consumer implements StreamConsumer
+ private static class Consumer implements EventHandler
{
final Queue<String> lines = new ConcurrentLinkedQueue<>();
@Override
- public void consumeLine( String s )
+ public void handleEvent( @Nonnull String s )
{
lines.add( s );
}
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ForkChannel.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ForkChannel.java
index 40a167d..e23253e 100644
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ForkChannel.java
+++
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ForkChannel.java
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.extensions;
*/
import org.apache.maven.surefire.extensions.util.CountdownCloseable;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import javax.annotation.Nonnull;
import java.io.Closeable;
@@ -65,9 +64,9 @@ public abstract class ForkChannel implements Closeable
* Can be called anytime.
*
* @return If {@code true}, both {@link ReadableByteChannel} and {@link
CountdownCloseable} must not be null
- * in {@link #bindEventHandler(StreamConsumer, CountdownCloseable,
ReadableByteChannel)}. If {@code false} then
+ * in {@link #bindEventHandler(EventHandler, CountdownCloseable,
ReadableByteChannel)}. If {@code false} then
* both {@link ReadableByteChannel} and {@link CountdownCloseable} have to
be null
- * in {@link #bindEventHandler(StreamConsumer, CountdownCloseable,
ReadableByteChannel)}.
+ * in {@link #bindEventHandler(EventHandler, CountdownCloseable,
ReadableByteChannel)}.
*/
public abstract boolean useStdOut();
@@ -85,13 +84,13 @@ public abstract class ForkChannel implements Closeable
/**
*
- * @param consumer event consumer
+ * @param eventHandler event eventHandler
* @param countdownCloseable count down of the final call of {@link
Closeable#close()}
* @param stdOut optional standard output stream of the JVM
* @return the thread instance to start up in order to stream out the data
* @throws IOException if an error in the fork channel
*/
- public abstract CloseableDaemonThread bindEventHandler( @Nonnull
StreamConsumer consumer,
+ public abstract CloseableDaemonThread bindEventHandler( @Nonnull
EventHandler eventHandler,
@Nonnull
CountdownCloseable countdownCloseable,
ReadableByteChannel stdOut )
throws IOException;
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StdErrStreamLine.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StdErrStreamLine.java
deleted file mode 100644
index f0ae082..0000000
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StdErrStreamLine.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.maven.surefire.extensions;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
-
-/**
- * The line handler of forked process standard-error.
- */
-public interface StdErrStreamLine extends StreamConsumer
-{
-}
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/LineConsumerThread.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/LineConsumerThread.java
index 162af4b..3ed57fa 100644
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/LineConsumerThread.java
+++
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/LineConsumerThread.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.extensions.util;
*/
import org.apache.maven.surefire.extensions.CloseableDaemonThread;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
+import org.apache.maven.surefire.extensions.EventHandler;
import javax.annotation.Nonnull;
import java.io.IOException;
@@ -35,24 +35,24 @@ public final class LineConsumerThread extends
CloseableDaemonThread
{
private final Charset encoding;
private final ReadableByteChannel channel;
- private final StreamConsumer consumer;
+ private final EventHandler eventHandler;
private final CountdownCloseable countdownCloseable;
private volatile boolean disabled;
public LineConsumerThread( @Nonnull String threadName,
- @Nonnull ReadableByteChannel channel, @Nonnull
StreamConsumer consumer,
+ @Nonnull ReadableByteChannel channel, @Nonnull
EventHandler eventHandler,
@Nonnull CountdownCloseable countdownCloseable )
{
- this( threadName, channel, consumer, countdownCloseable,
Charset.defaultCharset() );
+ this( threadName, channel, eventHandler, countdownCloseable,
Charset.defaultCharset() );
}
public LineConsumerThread( @Nonnull String threadName,
- @Nonnull ReadableByteChannel channel, @Nonnull
StreamConsumer consumer,
+ @Nonnull ReadableByteChannel channel, @Nonnull
EventHandler eventHandler,
@Nonnull CountdownCloseable countdownCloseable,
@Nonnull Charset encoding )
{
super( threadName );
this.channel = channel;
- this.consumer = consumer;
+ this.eventHandler = eventHandler;
this.countdownCloseable = countdownCloseable;
this.encoding = encoding;
}
@@ -72,7 +72,7 @@ public final class LineConsumerThread extends
CloseableDaemonThread
isError |= stream.ioException() != null;
if ( !isError && !disabled )
{
- consumer.consumeLine( line );
+ eventHandler.handleEvent( line );
}
}
catch ( IllegalStateException e )
diff --git
a/surefire-extensions-api/src/test/java/org/apache/maven/surefire/extensions/util/CommandlineExecutorTest.java
b/surefire-extensions-api/src/test/java/org/apache/maven/surefire/extensions/util/CommandlineExecutorTest.java
index fc919d2..1a1b93d 100644
---
a/surefire-extensions-api/src/test/java/org/apache/maven/surefire/extensions/util/CommandlineExecutorTest.java
+++
b/surefire-extensions-api/src/test/java/org/apache/maven/surefire/extensions/util/CommandlineExecutorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.surefire.extensions.util;
import org.apache.maven.surefire.booter.Command;
import org.apache.maven.surefire.extensions.CommandReader;
+import org.apache.maven.surefire.extensions.EventHandler;
import org.apache.maven.surefire.shared.utils.cli.Commandline;
-import org.apache.maven.surefire.shared.utils.cli.StreamConsumer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -90,7 +90,7 @@ public class CommandlineExecutorTest
CountdownCloseable countdownCloseable = new CountdownCloseable(
closer, 1 );
exec = new CommandlineExecutor( cli, countdownCloseable );
streams = exec.execute();
- StreamConsumer consumer = mock( StreamConsumer.class );
+ EventHandler consumer = mock( EventHandler.class );
CommandReader commandReader = new CommandReader()
{
@Override
@@ -123,6 +123,6 @@ public class CommandlineExecutorTest
out.start();
exec.awaitExit();
verify( consumer )
- .consumeLine( contains( "a.txt" ) );
+ .handleEvent( contains( "a.txt" ) );
}
}
