(activemq-artemis) branch main updated: ARTEMIS-4452 make test more robust

[jbertram]

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

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new ebd634ae54 ARTEMIS-4452 make test more robust
ebd634ae54 is described below

commit ebd634ae543311224fc5a5b2bba9fc5b5a8a3d79
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Wed Jan 10 13:52:16 2024 -0600

    ARTEMIS-4452 make test more robust
---
 .../activemq/artemis/core/remoting/impl/netty/NettyConnector.java     | 2 +-
 .../activemq/artemis/tests/integration/client/NettyConnectorTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 0a12996268..7413755ab9 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -1102,7 +1102,7 @@ public class NettyConnector extends AbstractConnector {
       }
    }
 
-   class HttpHandler extends ChannelDuplexHandler {
+   public class HttpHandler extends ChannelDuplexHandler {
 
       private Channel channel;
 
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
index 6538a73e5f..4900c30512 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java
@@ -29,6 +29,7 @@ import 
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
 import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.utils.Wait;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -80,7 +81,8 @@ public class NettyConnectorTest extends ActiveMQTestBase {
          Bootstrap bootstrap = connector.getBootStrap();
          ChannelPipeline pipeline = bootstrap.register().channel().pipeline();
          pipeline.flush();
-         Object httpHandler = pipeline.get("NettyConnector$HttpHandler#0");
+         Wait.assertTrue("HttpHandler is null!", () -> 
pipeline.get(NettyConnector.HttpHandler.class) != null, 500, 25);
+         Object httpHandler = pipeline.get(NettyConnector.HttpHandler.class);
          Method getHeadersMethod = 
httpHandler.getClass().getMethod("getHeaders", (Class<?>[]) null);
          getHeadersMethod.setAccessible(true);
          Map<String, String> headers = (Map<String, String>) 
getHeadersMethod.invoke(httpHandler, (Object[]) null);