You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/07/28 14:44:17 UTC
[activemq-artemis] branch new-logging updated: more test updates
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/new-logging by this push:
new e9f2918888 more test updates
e9f2918888 is described below
commit e9f2918888a5f5d04f0974d5b97b9180dc868cbd
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jul 28 15:43:49 2022 +0100
more test updates
---
.../tests/integration/interceptors/Outgoing.java | 7 +++---
.../tests/integration/jms/FloodServerTest.java | 9 +++-----
.../integration/jms/client/ConnectionTest.java | 5 +++--
.../tests/integration/jms/client/RollbackTest.java | 3 ---
.../integration/jms/cluster/JMSFailoverTest.java | 7 +++---
.../jms/server/JMSServerDeployerTest.java | 5 -----
.../integration/journal/AsyncOpenCloseTest.java | 7 +++---
.../integration/journal/NIOJournalCompactTest.java | 13 +++++------
.../journal/ValidateTransactionHealthTest.java | 9 ++++----
.../largemessage/LargeMessageTestBase.java | 25 +++++++++++-----------
.../management/ActiveMQServerControlTest.java | 5 +++--
.../management/ManagementHelperTest.java | 17 +++++++++------
.../tests/integration/mqtt/MQTTTestSupport.java | 13 ++++++-----
.../tests/integration/mqtt/PahoMQTTTest.java | 7 +++---
.../mqtt5/spec/ControlPacketFormatTests.java | 3 ---
.../integration/mqtt5/spec/DataFormatTests.java | 3 ---
.../mqtt5/spec/EnhancedAuthenticationTests.java | 3 ---
.../integration/mqtt5/spec/FlowControlTests.java | 3 ---
.../integration/mqtt5/spec/HandlingErrorTests.java | 3 ---
.../mqtt5/spec/MessageDeliveryRetryTests.java | 3 ---
.../mqtt5/spec/MessageOrderingTests.java | 3 ---
.../mqtt5/spec/MessageReceiptTests.java | 3 ---
.../mqtt5/spec/NetworkConnectionTests.java | 3 ---
.../tests/integration/mqtt5/spec/QoSTests.java | 3 ---
.../integration/mqtt5/spec/SessionStateTests.java | 3 ---
.../integration/mqtt5/spec/SubscriptionTests.java | 3 ---
.../mqtt5/spec/TopicNameAndFilterTests.java | 3 ---
.../integration/mqtt5/spec/WebSocketTests.java | 3 ---
.../mqtt5/spec/controlpackets/AuthTests.java | 3 ---
.../mqtt5/spec/controlpackets/ConnAckTests.java | 3 ---
.../mqtt5/spec/controlpackets/ConnectTests.java | 5 +++--
.../controlpackets/ConnectTestsWithSecurity.java | 3 ---
.../mqtt5/spec/controlpackets/DisconnectTests.java | 3 ---
.../mqtt5/spec/controlpackets/PingReqTests.java | 3 ---
.../mqtt5/spec/controlpackets/PingRespTests.java | 3 ---
.../mqtt5/spec/controlpackets/PubAckTests.java | 3 ---
.../mqtt5/spec/controlpackets/PubCompTests.java | 3 ---
.../mqtt5/spec/controlpackets/PubRecTests.java | 3 ---
.../mqtt5/spec/controlpackets/PubRelTests.java | 3 ---
.../mqtt5/spec/controlpackets/PublishTests.java | 7 +++---
.../controlpackets/PublishTestsWithSecurity.java | 3 ---
.../mqtt5/spec/controlpackets/SubAckTests.java | 3 ---
.../mqtt5/spec/controlpackets/SubscribeTests.java | 3 ---
.../controlpackets/SubscribeTestsWithSecurity.java | 3 ---
.../mqtt5/spec/controlpackets/UnsubAckTests.java | 3 ---
.../spec/controlpackets/UnsubscribeTests.java | 3 ---
46 files changed, 75 insertions(+), 159 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
index e76aed6a5b..efea6ff178 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
@@ -23,15 +23,16 @@ import org.apache.activemq.artemis.core.protocol.core.Packet;
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Outgoing implements Interceptor {
- private static final Logger log = Logger.getLogger(Outgoing.class);
+ private static final Logger log = LoggerFactory.getLogger(Outgoing.class);
@Override
public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException {
- log.debug("Outgoin:Packet : " + packet);
+ log.debug("Outgoin:Packet : {}", packet);
if (packet.getType() == PacketImpl.SESS_SEND) {
SessionSendMessage p = (SessionSendMessage) packet;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
index 56e5d2cb94..ae03507b7f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
@@ -30,23 +30,20 @@ import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A FloodServerTest
*/
public class FloodServerTest extends ActiveMQTestBase {
-
- private static final Logger log = Logger.getLogger(FloodServerTest.class);
+ private static final Logger log = LoggerFactory.getLogger(FloodServerTest.class);
private ActiveMQServer server;
- private final String topicName = "my-topic";
-
-
@Override
@Before
public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java
index d1ed5badb2..2fb2aafb74 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ConnectionTest.java
@@ -40,14 +40,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConnectionTest extends JMSTestBase {
- private static final Logger log = Logger.getLogger(ConnectionTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ConnectionTest.class);
private Connection conn2;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RollbackTest.java
index fe072c2866..a6461ee592 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RollbackTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RollbackTest.java
@@ -33,7 +33,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Before;
import org.junit.Test;
@@ -41,8 +40,6 @@ public class RollbackTest extends ActiveMQTestBase {
protected ActiveMQServer server;
- private static Logger log = Logger.getLogger(RollbackTest.class);
-
@Override
@Before
public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
index 472070dc36..2d6d6382c7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
@@ -70,10 +70,11 @@ import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.InVMNodeManagerServer;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A JMSFailoverTest
@@ -83,7 +84,7 @@ import org.junit.Test;
*/
public class JMSFailoverTest extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(JMSFailoverTest.class);
+ private static final Logger log = LoggerFactory.getLogger(JMSFailoverTest.class);
@@ -228,7 +229,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
JMSUtil.crash(liveServer, ((ActiveMQSession) sess).getCoreSession());
for (int i = 0; i < numMessages; i++) {
- log.debug("got message " + i);
+ log.debug("got message {}", i);
BytesMessage bm = (BytesMessage) consumer.receive(1000);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
index 3c9e658346..53a889ca8c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
@@ -31,17 +31,12 @@ import org.apache.activemq.artemis.jms.server.JMSServerManager;
import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class JMSServerDeployerTest extends ActiveMQTestBase {
-
- private static final Logger log = org.jboss.logging.Logger.getLogger(JMSServerDeployerTest.class);
-
-
private JMSServerManager jmsServer;
private Context context;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AsyncOpenCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AsyncOpenCloseTest.java
index 4aed037518..ad0e4a6159 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AsyncOpenCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AsyncOpenCloseTest.java
@@ -34,14 +34,15 @@ import org.apache.activemq.artemis.nativo.jlibaio.LibaioContext;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.ReusableLatch;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AsyncOpenCloseTest extends ActiveMQTestBase {
- private static final Logger logger = Logger.getLogger(AsyncOpenCloseTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(AsyncOpenCloseTest.class);
@Test
public void testCloseOnSubmit() throws Exception {
@@ -72,7 +73,7 @@ public class AsyncOpenCloseTest extends ActiveMQTestBase {
byte writtenByte = (byte) 'a';
for (int nclose = 0; nclose < OPEN_TIMES; nclose++) {
- logger.debug("************************************************** test " + nclose);
+ logger.debug("************************************************** test {}", nclose);
writtenByte++;
if (writtenByte >= (byte) 'z') {
writtenByte = (byte) 'a';
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
index a43000f6a3..224ff724e0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
@@ -58,14 +58,15 @@ import org.apache.activemq.artemis.utils.IDGenerator;
import org.apache.activemq.artemis.utils.actors.OrderedExecutorFactory;
import org.apache.activemq.artemis.utils.SimpleIDGenerator;
import org.apache.activemq.artemis.utils.critical.EmptyCriticalAnalyzer;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NIOJournalCompactTest extends JournalImplTestBase {
- private static final Logger logger = Logger.getLogger(NIOJournalCompactTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(NIOJournalCompactTest.class);
private static final int NUMBER_OF_RECORDS = 100;
@@ -1875,14 +1876,14 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
survivingMsgs.add(message.getMessageID());
- logger.debug("Going to store " + message);
+ logger.debug("Going to store {}", message);
// This one will stay here forever
storage.storeMessage(message);
- logger.debug("message stored " + message);
+ logger.debug("message stored {}", message);
- logger.debug("Going to commit " + tx);
+ logger.debug("Going to commit {}", tx);
storage.commit(tx);
- logger.debug("Committed " + tx);
+ logger.debug("Committed {}", tx);
ctx.executeOnCompletion(new IOCallback() {
@Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
index 4876ef9a4b..d794bf48fd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
@@ -33,16 +33,17 @@ import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
import org.apache.activemq.artemis.nativo.jlibaio.LibaioContext;
import org.apache.activemq.artemis.tests.util.SpawnedTestBase;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This test spawns a remote VM, as we want to "crash" the VM right after the journal is filled with data
*/
public class ValidateTransactionHealthTest extends SpawnedTestBase {
- private static final Logger log = Logger.getLogger(ValidateTransactionHealthTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ValidateTransactionHealthTest.class);
private static final int OK = 10;
@@ -213,7 +214,7 @@ public class ValidateTransactionHealthTest extends SpawnedTestBase {
@Override
public void addRecord(final RecordInfo info) {
if (info.id == lastID) {
- log.debug("id = " + info.id + " last id = " + lastID);
+ log.debug("id = {} last id = {}", info.id, lastID);
}
ByteBuffer buffer = ByteBuffer.wrap(info.data);
@@ -397,7 +398,7 @@ public class ValidateTransactionHealthTest extends SpawnedTestBase {
journal.appendAddRecordTransactional(transactionId, id, (byte) 99, buffer.array());
if (++transactionCounter == transactionSize) {
- log.debug("Commit transaction " + transactionId);
+ log.debug("Commit transaction {}", transactionId);
journal.appendCommitRecord(transactionId, true);
transactionCounter = 0;
transactionId = nextID.incrementAndGet();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
index bd32dd420c..776d0f1039 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
@@ -49,16 +49,17 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.DataConstants;
import org.apache.activemq.artemis.utils.DeflaterReader;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public abstract class LargeMessageTestBase extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(LargeMessageTestBase.class);
+ private static final Logger log = LoggerFactory.getLogger(LargeMessageTestBase.class);
protected final SimpleString ADDRESS = new SimpleString("SimpleAddress");
@@ -283,9 +284,9 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
public void write(final byte[] b) throws IOException {
if (b[0] == ActiveMQTestBase.getSamplebyte(bytesRead.get())) {
bytesRead.addAndGet(b.length);
- LargeMessageTestBase.log.debug("Read position " + bytesRead.get() + " on consumer");
+ LargeMessageTestBase.log.debug("Read position {} on consumer", bytesRead.get());
} else {
- LargeMessageTestBase.log.warn("Received invalid packet at position " + bytesRead.get());
+ LargeMessageTestBase.log.warn("Received invalid packet at position {}", bytesRead.get());
}
}
@@ -306,7 +307,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
buffer.resetReaderIndex();
for (long b = 0; b < numberOfBytes; b++) {
if (b % (1024L * 1024L) == 0) {
- LargeMessageTestBase.log.debug("Read " + b + " bytes");
+ LargeMessageTestBase.log.debug("Read {} bytes", b);
}
Assert.assertEquals(ActiveMQTestBase.getSamplebyte(b), buffer.readByte());
@@ -371,7 +372,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
if (b[0] == ActiveMQTestBase.getSamplebyte(bytesRead.get())) {
bytesRead.addAndGet(b.length);
} else {
- LargeMessageTestBase.log.warn("Received invalid packet at position " + bytesRead.get());
+ LargeMessageTestBase.log.warn("Received invalid packet at position {}", bytesRead.get());
}
}
}
@@ -379,7 +380,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
@Override
public void write(final int b) throws IOException {
if (bytesRead.get() % (1024L * 1024L) == 0) {
- LargeMessageTestBase.log.debug("Read " + bytesRead.get() + " bytes");
+ LargeMessageTestBase.log.debug("Read {} bytes", bytesRead.get());
}
if (b == (byte) 'a') {
bytesRead.incrementAndGet();
@@ -396,7 +397,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
for (long b = 0; b < numberOfBytes; b++) {
if (b % (1024L * 1024L) == 0L) {
- LargeMessageTestBase.log.debug("Read " + b + " bytes");
+ LargeMessageTestBase.log.debug("Read {} bytes", b);
}
Assert.assertEquals(ActiveMQTestBase.getSamplebyte(b), buffer.readByte());
}
@@ -463,17 +464,17 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
final long delayDelivery,
final ClientSession session,
final ClientProducer producer) throws Exception {
- LargeMessageTestBase.log.debug("NumberOfBytes = " + numberOfBytes);
+ LargeMessageTestBase.log.debug("NumberOfBytes = {}", numberOfBytes);
for (int i = 0; i < numberOfMessages; i++) {
ClientMessage message = session.createMessage(true);
// If the test is using more than 1M, we will only use the Streaming, as it require too much memory from the
// test
if (numberOfBytes > 1024 * 1024 || i % 2 == 0) {
- LargeMessageTestBase.log.debug("Sending message (stream)" + i);
+ LargeMessageTestBase.log.debug("Sending message (stream){}", i);
message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(numberOfBytes));
} else {
- LargeMessageTestBase.log.debug("Sending message (array)" + i);
+ LargeMessageTestBase.log.debug("Sending message (array){}", i);
byte[] bytes = new byte[(int) numberOfBytes];
for (int j = 0; j < bytes.length; j++) {
bytes[j] = ActiveMQTestBase.getSamplebyte(j);
@@ -569,7 +570,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
@Override
public void write(final int b) throws IOException {
if (count++ % 1024 * 1024 == 0) {
- LargeMessageTestBase.log.debug("OutputStream received " + count + " bytes");
+ LargeMessageTestBase.log.debug("OutputStream received {} bytes", count);
}
if (closed) {
throw new IOException("Stream was closed");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 30f76a3186..b9c34c55d6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -106,18 +106,19 @@ import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.RetryMethod;
import org.apache.activemq.artemis.utils.RetryRule;
import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public class ActiveMQServerControlTest extends ManagementTestBase {
- private static final Logger log = Logger.getLogger(ActiveMQServerControlTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ActiveMQServerControlTest.class);
@Rule
public RetryRule retryRule = new RetryRule(0);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
index 1ac3889827..62b1495949 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
@@ -24,15 +24,14 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.management.ManagementHelper;
import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ManagementHelperTest extends Assert {
-
- private static final Logger log = Logger.getLogger(ManagementHelperTest.class);
-
+ private static final Logger log = LoggerFactory.getLogger(ManagementHelperTest.class);
@Test
public void testArrayOfStringParameter() throws Exception {
@@ -47,7 +46,7 @@ public class ManagementHelperTest extends Assert {
Assert.assertEquals(2, parameters.length);
Assert.assertEquals(param, parameters[0]);
Object parameter_2 = parameters[1];
- log.debug("type " + parameter_2);
+ log.debug("type {}", parameter_2);
Assert.assertTrue(parameter_2 instanceof Object[]);
Object[] retrievedParams = (Object[]) parameter_2;
Assert.assertEquals(params.length, retrievedParams.length);
@@ -181,12 +180,16 @@ public class ManagementHelperTest extends Assert {
String key1 = RandomUtil.randomString();
String[] val1 = new String[]{"a", "b", "c"};
- log.debug("val1 type is " + Arrays.toString(val1));
+ if (log.isDebugEnabled()) {
+ log.debug("val1 type is " + Arrays.toString(val1));
+ }
String key2 = RandomUtil.randomString();
Long[] val2 = new Long[]{1L, 2L, 3L, 4L, 5L};
- log.debug("val2 type is " + Arrays.toString(val2));
+ if (log.isDebugEnabled()) {
+ log.debug("val2 type is " + Arrays.toString(val2));
+ }
map.put(key1, val1);
map.put(key2, val2);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java
index d3f0417fb1..011045ddeb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTestSupport.java
@@ -62,17 +62,18 @@ import org.fusesource.hawtdispatch.internal.DispatcherConfig;
import org.fusesource.mqtt.client.MQTT;
import org.fusesource.mqtt.client.Tracer;
import org.fusesource.mqtt.codec.MQTTFrame;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.util.Collections.singletonList;
public class MQTTTestSupport extends ActiveMQTestBase {
- private static final Logger log = Logger.getLogger(MQTTTestSupport.class);
+ private static final Logger log = LoggerFactory.getLogger(MQTTTestSupport.class);
protected ActiveMQServer server;
static {
@@ -406,17 +407,19 @@ public class MQTTTestSupport extends ActiveMQTestBase {
return new Tracer() {
@Override
public void onReceive(MQTTFrame frame) {
- log.debug("Client Received:\n" + frame);
+ log.debug("Client Received:\n{}", frame);
}
@Override
public void onSend(MQTTFrame frame) {
- log.debug("Client Sent:\n" + frame);
+ log.debug("Client Sent:\n{}", frame);
}
@Override
public void debug(String message, Object... args) {
- log.debug(String.format(message, args));
+ if(log.isDebugEnabled()) {
+ log.debug(String.format(message, args));
+ }
}
};
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/PahoMQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/PahoMQTTTest.java
index 9124ba41f0..c5ef33f934 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/PahoMQTTTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/PahoMQTTTest.java
@@ -33,15 +33,16 @@ import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.jboss.logging.Logger;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public class PahoMQTTTest extends MQTTTestSupport {
- private static final Logger log = Logger.getLogger(PahoMQTTTest.class);
+ private static final Logger log = LoggerFactory.getLogger(PahoMQTTTest.class);
@Parameterized.Parameters(name = "protocol={0}")
public static Collection<Object[]> getParams() {
@@ -58,7 +59,7 @@ public class PahoMQTTTest extends MQTTTestSupport {
public void testLotsOfClients() throws Exception {
final int CLIENTS = Integer.getInteger("PahoMQTTTest.CLIENTS", 100);
- log.debug("Using: {} clients: " + CLIENTS);
+ log.debug("Using: {} clients: ", CLIENTS);
final AtomicInteger receiveCounter = new AtomicInteger();
MqttClient client = createPahoClient("consumer");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/ControlPacketFormatTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/ControlPacketFormatTests.java
index 2ba94c8242..33432d0201 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/ControlPacketFormatTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/ControlPacketFormatTests.java
@@ -38,7 +38,6 @@ import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.Wait;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.common.MqttMessage;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -51,8 +50,6 @@ import org.junit.Test;
public class ControlPacketFormatTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(ControlPacketFormatTests.class);
-
public ControlPacketFormatTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/DataFormatTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/DataFormatTests.java
index 26963de675..382737531c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/DataFormatTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/DataFormatTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -34,8 +33,6 @@ import org.junit.Ignore;
@Ignore
public class DataFormatTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(DataFormatTests.class);
-
public DataFormatTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/EnhancedAuthenticationTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/EnhancedAuthenticationTests.java
index 44fe66d076..5eafda48bf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/EnhancedAuthenticationTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/EnhancedAuthenticationTests.java
@@ -23,7 +23,6 @@ import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.common.MqttException;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -45,8 +44,6 @@ import org.junit.Test;
public class EnhancedAuthenticationTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(EnhancedAuthenticationTests.class);
-
public EnhancedAuthenticationTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/FlowControlTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/FlowControlTests.java
index 7f8b8c3de9..f0804baece 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/FlowControlTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/FlowControlTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -36,8 +35,6 @@ import org.junit.Ignore;
@Ignore
public class FlowControlTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(FlowControlTests.class);
-
public FlowControlTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/HandlingErrorTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/HandlingErrorTests.java
index 8f59980989..1e958e7ab3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/HandlingErrorTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/HandlingErrorTests.java
@@ -23,7 +23,6 @@ import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
import org.eclipse.paho.mqttv5.common.MqttException;
-import org.jboss.logging.Logger;
import org.junit.Assume;
import org.junit.Test;
@@ -35,8 +34,6 @@ import org.junit.Test;
public class HandlingErrorTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(HandlingErrorTests.class);
-
public HandlingErrorTests(String protocol) {
this.protocol = protocol;
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageDeliveryRetryTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageDeliveryRetryTests.java
index 84ddd95f8b..969acfdc5e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageDeliveryRetryTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageDeliveryRetryTests.java
@@ -25,14 +25,11 @@ import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
-import org.jboss.logging.Logger;
import org.junit.Test;
public class MessageDeliveryRetryTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(MessageDeliveryRetryTests.class);
-
public MessageDeliveryRetryTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageOrderingTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageOrderingTests.java
index bf9b3d8d6e..85b858c6bf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageOrderingTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageOrderingTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -39,8 +38,6 @@ import org.junit.Ignore;
@Ignore
public class MessageOrderingTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(MessageOrderingTests.class);
-
public MessageOrderingTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageReceiptTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageReceiptTests.java
index 6501dc082b..38ed137787 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageReceiptTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/MessageReceiptTests.java
@@ -25,7 +25,6 @@ import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.Wait;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.common.MqttMessage;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -36,8 +35,6 @@ import org.junit.Test;
public class MessageReceiptTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(MessageReceiptTests.class);
-
public MessageReceiptTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/NetworkConnectionTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/NetworkConnectionTests.java
index 41f84332d3..9f37362b36 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/NetworkConnectionTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/NetworkConnectionTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -30,8 +29,6 @@ import org.junit.Ignore;
@Ignore
public class NetworkConnectionTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(NetworkConnectionTests.class);
-
public NetworkConnectionTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/QoSTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/QoSTests.java
index d41ec080e7..959b9d59c7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/QoSTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/QoSTests.java
@@ -40,7 +40,6 @@ import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.common.MqttMessage;
import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -62,8 +61,6 @@ import org.junit.Test;
public class QoSTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(QoSTests.class);
-
public QoSTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SessionStateTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SessionStateTests.java
index 0fa2cb2701..82a185400c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SessionStateTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SessionStateTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -30,8 +29,6 @@ import org.junit.Ignore;
@Ignore
public class SessionStateTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(SessionStateTests.class);
-
public SessionStateTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SubscriptionTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SubscriptionTests.java
index 9cf3fba6d3..eab98d5eb9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SubscriptionTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/SubscriptionTests.java
@@ -26,7 +26,6 @@ import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.apache.activemq.artemis.utils.Wait;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.common.MqttMessage;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -44,8 +43,6 @@ import org.junit.Test;
public class SubscriptionTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(SubscriptionTests.class);
-
public SubscriptionTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/TopicNameAndFilterTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/TopicNameAndFilterTests.java
index a4d8754f46..5d387d3a28 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/TopicNameAndFilterTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/TopicNameAndFilterTests.java
@@ -30,7 +30,6 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.common.MqttMessage;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -51,8 +50,6 @@ import org.junit.Test;
public class TopicNameAndFilterTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(TopicNameAndFilterTests.class);
-
public TopicNameAndFilterTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/WebSocketTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/WebSocketTests.java
index 232d03a4df..4dfdde7a19 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/WebSocketTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/WebSocketTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -42,8 +41,6 @@ import org.junit.Ignore;
@Ignore
public class WebSocketTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(WebSocketTests.class);
-
public WebSocketTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java
index f9e290443a..902908975b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/AuthTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec.controlpackets;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -42,8 +41,6 @@ import org.junit.Ignore;
@Ignore
public class AuthTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(AuthTests.class);
-
public AuthTests(String protocol) {
this.protocol = protocol;
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java
index 03b0befb6d..942cc50b83 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java
@@ -42,7 +42,6 @@ import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
import org.eclipse.paho.mqttv5.client.MqttDisconnectResponse;
import org.eclipse.paho.mqttv5.common.MqttException;
import org.eclipse.paho.mqttv5.common.packet.MqttReturnCode;
-import org.jboss.logging.Logger;
import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
@@ -84,8 +83,6 @@ import org.junit.Test;
public class ConnAckTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(ConnAckTests.class);
-
public ConnAckTests(String protocol) {
this.protocol = protocol;
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTests.java
index 65c64bb2f4..722276aeb3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTests.java
@@ -43,9 +43,10 @@ import org.eclipse.paho.mqttv5.common.MqttMessage;
import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
import org.eclipse.paho.mqttv5.common.packet.MqttReturnCode;
import org.eclipse.paho.mqttv5.common.packet.UserProperty;
-import org.jboss.logging.Logger;
import org.junit.Assume;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Fulfilled by client or Netty codec (i.e. not tested here):
@@ -101,7 +102,7 @@ import org.junit.Test;
*/
public class ConnectTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(ConnectTests.class);
+ private static final Logger log = LoggerFactory.getLogger(ConnectTests.class);
public ConnectTests(String protocol) {
super(protocol);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTestsWithSecurity.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTestsWithSecurity.java
index c58cdbe4c3..978b3273da 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTestsWithSecurity.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnectTestsWithSecurity.java
@@ -26,13 +26,10 @@ import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
import org.eclipse.paho.mqttv5.common.MqttException;
-import org.jboss.logging.Logger;
import org.junit.Test;
public class ConnectTestsWithSecurity extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(ConnectTestsWithSecurity.class);
-
public ConnectTestsWithSecurity(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java
index cd39a1d3f7..ef8b244e86 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/DisconnectTests.java
@@ -31,7 +31,6 @@ import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
import org.eclipse.paho.mqttv5.common.MqttMessage;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -55,8 +54,6 @@ import org.junit.Test;
public class DisconnectTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(DisconnectTests.class);
-
public DisconnectTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java
index 554999274c..b97b721421 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingReqTests.java
@@ -26,13 +26,10 @@ import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
-import org.jboss.logging.Logger;
import org.junit.Test;
public class PingReqTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PingReqTests.class);
-
public PingReqTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java
index 0fc5881be5..111e0ae2a0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PingRespTests.java
@@ -18,7 +18,6 @@
package org.apache.activemq.artemis.tests.integration.mqtt5.spec.controlpackets;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
/**
@@ -29,8 +28,6 @@ import org.junit.Ignore;
@Ignore
public class PingRespTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PingRespTests.class);
-
public PingRespTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubAckTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubAckTests.java
index d83aa11de4..09dd6e0e10 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubAckTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubAckTests.java
@@ -27,7 +27,6 @@ import org.apache.activemq.artemis.core.protocol.mqtt.MQTTReasonCodes;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -39,8 +38,6 @@ import org.junit.Test;
public class PubAckTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PubAckTests.class);
-
public PubAckTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubCompTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubCompTests.java
index b5ebdf265f..fa5cde7bbb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubCompTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubCompTests.java
@@ -27,7 +27,6 @@ import org.apache.activemq.artemis.core.protocol.mqtt.MQTTReasonCodes;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -39,8 +38,6 @@ import org.junit.Test;
public class PubCompTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PubCompTests.class);
-
public PubCompTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRecTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRecTests.java
index 48410fe1a3..917af3b7d3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRecTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRecTests.java
@@ -27,7 +27,6 @@ import org.apache.activemq.artemis.core.protocol.mqtt.MQTTReasonCodes;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -39,8 +38,6 @@ import org.junit.Test;
public class PubRecTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PubRecTests.class);
-
public PubRecTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRelTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRelTests.java
index 7607aebbe1..91e741b548 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRelTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PubRelTests.java
@@ -27,7 +27,6 @@ import org.apache.activemq.artemis.core.protocol.mqtt.MQTTReasonCodes;
import org.apache.activemq.artemis.tests.integration.mqtt5.MQTT5TestSupport;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -44,8 +43,6 @@ import org.junit.Test;
public class PubRelTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PubRelTests.class);
-
public PubRelTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTests.java
index 8c4c2c9112..68e98ad2be 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTests.java
@@ -45,9 +45,10 @@ import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
import org.eclipse.paho.mqttv5.common.packet.MqttPublish;
import org.eclipse.paho.mqttv5.common.packet.MqttWireMessage;
import org.eclipse.paho.mqttv5.common.packet.UserProperty;
-import org.jboss.logging.Logger;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Fulfilled by client or Netty codec (i.e. not tested here):
@@ -76,7 +77,7 @@ import org.junit.Test;
public class PublishTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PublishTests.class);
+ private static final Logger log = LoggerFactory.getLogger(PublishTests.class);
public PublishTests(String protocol) {
super(protocol);
@@ -1280,7 +1281,7 @@ public class PublishTests extends MQTT5TestSupport {
@Override
public void messageArrived(String topic, MqttMessage message) throws Exception {
int sentAs = Integer.valueOf(new String(message.getPayload(), StandardCharsets.UTF_8));
- log.info("QoS of publish: " + sentAs + "; QoS of subscription: " + qosOfSubscription + "; QoS of receive: " + message.getQos());
+ log.info("QoS of publish: {}; QoS of subscription: {}; QoS of receive: {}", sentAs, qosOfSubscription, message.getQos());
if (sentAs == 0) {
assertTrue(message.getQos() == 0);
} else if (sentAs == 1) {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTestsWithSecurity.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTestsWithSecurity.java
index ba107493ec..ac2ea1c198 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTestsWithSecurity.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/PublishTestsWithSecurity.java
@@ -25,13 +25,10 @@ import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
import org.eclipse.paho.mqttv5.common.MqttException;
-import org.jboss.logging.Logger;
import org.junit.Test;
public class PublishTestsWithSecurity extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(PublishTestsWithSecurity.class);
-
public PublishTestsWithSecurity(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubAckTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubAckTests.java
index d995d7d74c..2210c92e67 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubAckTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubAckTests.java
@@ -24,7 +24,6 @@ import org.eclipse.paho.mqttv5.client.IMqttToken;
import org.eclipse.paho.mqttv5.client.MqttAsyncClient;
import org.eclipse.paho.mqttv5.common.MqttSubscription;
import org.eclipse.paho.mqttv5.common.packet.MqttSubAck;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -36,8 +35,6 @@ import org.junit.Test;
public class SubAckTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(SubAckTests.class);
-
public SubAckTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTests.java
index a7e9ccafc1..29a8352766 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTests.java
@@ -37,7 +37,6 @@ import org.eclipse.paho.mqttv5.common.MqttMessage;
import org.eclipse.paho.mqttv5.common.MqttSubscription;
import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
import org.eclipse.paho.mqttv5.common.packet.MqttSubAck;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -52,8 +51,6 @@ import org.junit.Test;
public class SubscribeTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(SubscribeTests.class);
-
public SubscribeTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTestsWithSecurity.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTestsWithSecurity.java
index b838e4ce24..b43082f3c7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTestsWithSecurity.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/SubscribeTestsWithSecurity.java
@@ -27,13 +27,10 @@ import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
import org.eclipse.paho.mqttv5.common.MqttSubscription;
-import org.jboss.logging.Logger;
import org.junit.Test;
public class SubscribeTestsWithSecurity extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(SubscribeTestsWithSecurity.class);
-
public SubscribeTestsWithSecurity(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubAckTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubAckTests.java
index 4d12beda99..18115b9c94 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubAckTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubAckTests.java
@@ -25,7 +25,6 @@ import org.eclipse.paho.mqttv5.client.IMqttToken;
import org.eclipse.paho.mqttv5.client.MqttAsyncClient;
import org.eclipse.paho.mqttv5.common.MqttSubscription;
import org.eclipse.paho.mqttv5.common.packet.MqttUnsubAck;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -37,8 +36,6 @@ import org.junit.Test;
public class UnsubAckTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(UnsubAckTests.class);
-
public UnsubAckTests(String protocol) {
super(protocol);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubscribeTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubscribeTests.java
index 5bacf01cdd..87721bd867 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubscribeTests.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/UnsubscribeTests.java
@@ -32,7 +32,6 @@ import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.eclipse.paho.mqttv5.client.MqttClient;
import org.eclipse.paho.mqttv5.common.MqttSubscription;
-import org.jboss.logging.Logger;
import org.junit.Test;
/**
@@ -50,8 +49,6 @@ import org.junit.Test;
public class UnsubscribeTests extends MQTT5TestSupport {
- private static final Logger log = Logger.getLogger(UnsubscribeTests.class);
-
public UnsubscribeTests(String protocol) {
super(protocol);
}