From 5b86f8d59eb9882faa31a2e7bae9b81575b773ed Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Wed, 5 Jul 2023 13:59:28 +0100
Subject: [PATCH] ARTEMIS-4346: move stomp test client to artemis-test-support
 systest helper module

---
 tests/artemis-test-support/pom.xml                         | 7 +++++++
 .../integration/stomp/util/AbstractClientStompFrame.java   | 0
 .../stomp/util/AbstractStompClientConnection.java          | 5 -----
 .../tests/integration/stomp/util/ClientStompFrame.java     | 0
 .../tests/integration/stomp/util/ClientStompFrameV10.java  | 0
 .../tests/integration/stomp/util/ClientStompFrameV11.java  | 0
 .../tests/integration/stomp/util/ClientStompFrameV12.java  | 0
 .../integration/stomp/util/StompClientConnection.java      | 0
 .../stomp/util/StompClientConnectionFactory.java           | 0
 .../integration/stomp/util/StompClientConnectionV10.java   | 0
 .../integration/stomp/util/StompClientConnectionV11.java   | 0
 .../integration/stomp/util/StompClientConnectionV12.java   | 0
 .../tests/integration/stomp/util/StompFrameFactory.java    | 0
 .../integration/stomp/util/StompFrameFactoryFactory.java   | 0
 .../tests/integration/stomp/util/StompFrameFactoryV10.java | 0
 .../tests/integration/stomp/util/StompFrameFactoryV11.java | 0
 .../tests/integration/stomp/util/StompFrameFactoryV12.java | 0
 17 files changed, 7 insertions(+), 5 deletions(-)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java (98%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java (100%)
 rename tests/{integration-tests/src/test => artemis-test-support/src/main}/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java (100%)

diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml
index c0dc1a90fb..1150800e30 100644
--- a/tests/artemis-test-support/pom.xml
+++ b/tests/artemis-test-support/pom.xml
@@ -103,6 +103,13 @@
          <scope>provided</scope>
       </dependency>
 
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-stomp-protocol</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+
       <!-- This should be the only dependency not at 'provided' scope, for now -->
       <dependency>
          <groupId>org.apache.activemq</groupId>
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractClientStompFrame.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
similarity index 98%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
index cee7bf4f43..3dbcf7af99 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
@@ -30,7 +30,6 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
-import org.apache.activemq.artemis.tests.util.Wait;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
 import org.apache.activemq.transport.netty.NettyTransport;
 import org.apache.activemq.transport.netty.NettyTransportFactory;
@@ -91,8 +90,6 @@ public abstract class AbstractStompClientConnection implements StompClientConnec
       transport.setTransportListener(new StompTransportListener());
       transport.connect();
 
-      Wait.waitFor(() -> transport.isConnected(), 1000);
-
       if (!transport.isConnected()) {
          throw new RuntimeException("Could not connect transport");
       }
@@ -112,8 +109,6 @@ public abstract class AbstractStompClientConnection implements StompClientConnec
       if (autoConnect) {
          transport.connect();
 
-         Wait.waitFor(() -> transport.isConnected(), 1000);
-
          if (!transport.isConnected()) {
             throw new RuntimeException("Could not connect transport");
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrame.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV10.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV11.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/ClientStompFrameV12.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnection.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionFactory.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV10.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV12.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactory.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryFactory.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV10.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
similarity index 100%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
rename to tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java