From 04afea0fbd3cbe8f28c3424b015ee2e93f932f12 Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Thu, 2 Feb 2023 21:35:24 -0800 Subject: [PATCH] test: new JDK fixed InetSocketAddress toString so we are updating our test (#9876) The change was introduced in JDK 14 (https://github.com/openjdk/jdk/commit/f8440c33d22245ae02ec34982b8f1dd33ec7cc2b) so JDK 17 for us to care about. Fixes internal issue: b/261217361 --- .../io/grpc/internal/ManagedChannelImplBuilderTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java index 286c48ebd6..51f21ffc87 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java @@ -414,10 +414,14 @@ public class ManagedChannelImplBuilderTest { @Test public void makeTargetStringForDirectAddress_scopedIpv6() throws Exception { InetSocketAddress address = new InetSocketAddress("0:0:0:0:0:0:0:0%0", 10005); - assertEquals("/0:0:0:0:0:0:0:0%0:10005", address.toString()); String target = ManagedChannelImplBuilder.makeTargetStringForDirectAddress(address); URI uri = new URI(target); - assertEquals("directaddress:////0:0:0:0:0:0:0:0%250:10005", target); + assertThat(address.toString()).isIn( + Arrays.asList("/[0:0:0:0:0:0:0:0%0]:10005", "/0:0:0:0:0:0:0:0%0:10005")); + assertThat(target).isIn( + Arrays.asList( + "directaddress:////%5B0:0:0:0:0:0:0:0%250%5D:10005", + "directaddress:////0:0:0:0:0:0:0:0%250:10005")); assertEquals(target, uri.toString()); }