From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 20 Oct 2022 15:01:20 +0000 (+0200)
Subject: Fix TCPClientServerTest stability
X-Git-Tag: v4.0.3~18
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1f399897d219f2a55e581c44a829d0842514eacb;hp=f6ec1f4e6b69128dea361b674f17a69345dc4f5c;p=netconf.git

Fix TCPClientServerTest stability

Client's toString() changes when the connection completes. Move the
check to after we have waited for callbacks.

JIRA: NETCONF-590
Change-Id: I1ad7e375ca60d350affd1b226fa11ffc87106fe6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java b/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java
index 54767e6943..3272b66afb 100644
--- a/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java
+++ b/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java
@@ -103,10 +103,6 @@ public class TCPClientServerTest {
             final var client = TCPClient.connect(clientListener, NettyTransportSupport.newBootstrap().group(group),
                 clientGrouping).get(2, TimeUnit.SECONDS);
             try {
-                assertThat(client.toString(), allOf(
-                    startsWith("TCPClient{listener=clientListener, state=TCPTransportChannel{channel=[id: 0x"),
-                    endsWith(":" + serverPort.getValue() + "]}}")));
-
                 verify(serverListener, timeout(500)).onTransportChannelEstablished(any());
                 final var serverTransports = serverCaptor.getAllValues();
                 assertEquals(1, serverTransports.size());
@@ -120,6 +116,10 @@ public class TCPClientServerTest {
                 assertThat(clientTransports.get(0).toString(), allOf(
                     startsWith("TCPTransportChannel{channel=[id: "),
                     endsWith(":" + serverPort.getValue() + "]}")));
+
+                assertThat(client.toString(), allOf(
+                    startsWith("TCPClient{listener=clientListener, state=TCPTransportChannel{channel=[id: 0x"),
+                    endsWith(":" + serverPort.getValue() + "]}}")));
             } finally {
                 client.shutdown().get(2, TimeUnit.SECONDS);
             }