From 3688be38bfa4a6becaaecd2c8f9705a203b75991 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Sun, 28 Aug 2022 10:14:06 -0400
Subject: [PATCH] Fix TcpClientServerAnnDemoTest for latest SI

---
 .../TcpClientServerAnnotationDemoTest.java         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java
index 1674fd3d..08139490 100644
--- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java
+++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java
@@ -18,10 +18,8 @@ package org.springframework.integration.samples.tcpclientserver;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -47,6 +45,7 @@ import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 
@@ -65,8 +64,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Artem Bilan
  *
  */
-@ContextConfiguration(classes = TcpClientServerAnnotationDemoTest.Config.class)
-@RunWith(SpringJUnit4ClassRunner.class)
+@SpringJUnitConfig
 @DirtiesContext
 @SpringIntegrationTest(noAutoStartup = "*tcpOutGate*")
 public class TcpClientServerAnnotationDemoTest {
@@ -81,10 +79,10 @@ public class TcpClientServerAnnotationDemoTest {
 	AbstractClientConnectionFactory client;
 
 	@Autowired
-	@Qualifier("tcpClientServerAnnotationDemoTest.Config.tcpOutGate.serviceActivator")
+	@Qualifier("tcpOutGate.serviceActivator")
 	AbstractEndpoint outGateway;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		if (!this.outGateway.isRunning()) {
 			TestingUtilities.waitListening(this.crLfServer, 10000L);