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 9a0e596 maybe a fix
9a0e596 is described below
commit 9a0e596f3f32929ce3783d7d8a00217c88128457
Author: tibordigana <[email protected]>
AuthorDate: Sat Feb 15 10:53:47 2020 +0100
maybe a fix
---
.../org/apache/maven/plugin/surefire/booterclient/ForkStarter.java | 2 +-
.../apache/maven/plugin/surefire/extensions/LegacyForkChannel.java | 2 +-
.../maven/plugin/surefire/extensions/SurefireForkChannel.java | 2 +-
.../java/org/apache/maven/surefire/extensions/ForkChannelTest.java | 7 +++++--
.../java/org/apache/maven/surefire/extensions/ForkChannel.java | 4 ++--
5 files changed, 10 insertions(+), 7 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 a23d656..4c407ba 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
@@ -632,7 +632,7 @@ public class ForkStarter
CommandlineStreams streams = exec.execute();
closer.addCloseable( streams );
- forkChannel.openChannel();
+ forkChannel.connectToClient();
in = forkChannel.useStdIn()
? forkChannel.bindCommandReader( commandReader,
streams.getStdInChannel() )
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 31ad325..4ec9962 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
@@ -42,7 +42,7 @@ final class LegacyForkChannel extends ForkChannel
}
@Override
- public void openChannel()
+ public void connectToClient()
{
}
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 214c9dc..a917460 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
@@ -61,7 +61,7 @@ final class SurefireForkChannel extends ForkChannel
}
@Override
- public void openChannel() throws IOException
+ public void connectToClient() throws IOException
{
if ( channel != null )
{
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 63db316..017fb87 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
@@ -96,15 +96,18 @@ public class ForkChannelTest
} );
client.start();
- channel.openChannel();
+ channel.connectToClient();
SECONDS.sleep( 3L );
TestLessInputStreamBuilder builder = new TestLessInputStreamBuilder();
TestLessInputStream commandReader = builder.build();
- commandReader.noop();
channel.bindCommandReader( commandReader ).start();
channel.bindEventHandler( consumer ).start();
+ SECONDS.sleep( 3L );
+
+ commandReader.noop();
+
client.join( TESTCASE_TIMEOUT );
assertThat( hasError.get() )
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 baeae00..818510e 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
@@ -33,7 +33,7 @@ import java.nio.channels.WritableByteChannel;
* and dedicated forked JVM {@link #getForkChannelId()}. It represents a
server.
* <br>
* <br>
- * It opens the channel via {@link #openChannel()}, provides a connection
string {@link #getForkNodeConnectionString()}
+ * It opens the channel via {@link #connectToClient()}, provides a connection
string {@link #getForkNodeConnectionString()}
* used by the client in the JVM, binds event and command handlers.
*
* @author <a href="mailto:[email protected]";>Tibor Digana (tibor17)</a>
@@ -51,7 +51,7 @@ public abstract class ForkChannel implements Closeable
this.forkChannelId = forkChannelId;
}
- public abstract void openChannel() throws IOException;
+ public abstract void connectToClient() throws IOException;
/**
* This is server related class, which if binds to a TCP port, determines
the connection string for the client.
