(maven-surefire) branch SUREFIRE-2220 updated (25af424da -> 3d2760a9b)

[mi...@apache.org]

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

michaelo pushed a change to branch SUREFIRE-2220
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


 discard 25af424da [SUREFIRE-2220] SurefireForkChannel#getForkNodeConnectionString() returns invalid URI string if localHost resolves to IPv6 address
     new 3d2760a9b [SUREFIRE-2220] SurefireForkChannel#getForkNodeConnectionString() returns invalid URI string if localHost resolves to IPv6 address

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (25af424da)
            \
             N -- N -- N   refs/heads/SUREFIRE-2220 (3d2760a9b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

(maven-surefire) 01/01: [SUREFIRE-2220] SurefireForkChannel#getForkNodeConnectionString() returns invalid URI string if localHost resolves to IPv6 address

[mi...@apache.org]

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

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

commit 3d2760a9b20ee0742691c0c19b5b1c6dbcaf4efb
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 9 00:18:29 2023 +0100

    [SUREFIRE-2220] SurefireForkChannel#getForkNodeConnectionString() returns invalid URI string if localHost resolves to IPv6 address
    
    This closes #697
---
 .../plugin/surefire/extensions/SurefireForkChannel.java  | 16 +++++++++++++++-
 .../maven/surefire/extensions/ForkChannelTest.java       | 15 ++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

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 99e6e0304..c58d3ee16 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
@@ -25,6 +25,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketOption;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousServerSocketChannel;
@@ -112,7 +114,19 @@ final class SurefireForkChannel extends ForkChannel {
 
     @Override
     public String getForkNodeConnectionString() {
-        return "tcp://" + localHost + ":" + localPort + (isBlank(sessionId) ? "" : "?sessionId=" + sessionId);
+        try {
+            URI uri = new URI(
+                    "tcp",
+                    null,
+                    localHost,
+                    localPort,
+                    null,
+                    isBlank(sessionId) ? null : "sessionId=" + sessionId,
+                    null);
+            return uri.toASCIIString();
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override
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 966bcb239..1108dd18f 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
@@ -121,14 +121,15 @@ public class ForkChannelTest {
             assertThat(channel.getCountdownCloseablePermits()).isEqualTo(3);
 
             String localHost = InetAddress.getLoopbackAddress().getHostAddress();
-            assertThat(channel.getForkNodeConnectionString())
-                    .startsWith("tcp://" + localHost + ":")
-                    .isNotEqualTo("tcp://" + localHost + ":")
-                    .endsWith("?sessionId=" + sessionId);
-
-            URI uri = new URI(channel.getForkNodeConnectionString());
-
+            URI uri = new URI(connectionString);
+            assertThat(uri.getScheme()).isEqualTo("tcp");
+            String uriHost = uri.getHost();
+            if (uriHost.startsWith("[") && uriHost.endsWith("]")) {
+                uriHost = uriHost.substring(1, uriHost.length() - 1);
+            }
+            assertThat(uriHost).isEqualTo(localHost);
             assertThat(uri.getPort()).isPositive();
+            assertThat(uri.getQuery()).isEqualTo("sessionId=" + sessionId);
 
             final TestLessInputStreamBuilder builder = new TestLessInputStreamBuilder();
             TestLessInputStream commandReader = builder.build();