You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/05/16 19:41:13 UTC
[activemq-artemis] branch new-logging updated: jms-tests, joram tests
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic 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 f3f8112ced jms-tests, joram tests
f3f8112ced is described below
commit f3f8112ced492295c8b60064f0ab363e3cf3c623
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon May 16 15:40:24 2022 -0400
jms-tests, joram tests
Everything compiles at this point, however we are depending on LogManager, and I can't realaly remove it due to some server logger updater.
---
.../activemq/artemis/osgi/ActiveMQOsgiLogger.java | 38 ++-----
.../artemis/jms/tests/AcknowledgementTest.java | 114 +++++++++++----------
.../artemis/jms/tests/ActiveMQServerTestCase.java | 12 ++-
.../jms/tests/AutoAckMessageListenerTest.java | 20 ++--
.../artemis/jms/tests/ConnectionClosedTest.java | 8 +-
.../artemis/jms/tests/ConnectionFactoryTest.java | 12 ++-
.../activemq/artemis/jms/tests/ConnectionTest.java | 8 +-
.../artemis/jms/tests/ConsumerClosedTest.java | 8 +-
.../apache/activemq/artemis/jms/tests/JMSTest.java | 6 +-
.../activemq/artemis/jms/tests/JmsTestLogger.java | 30 ------
.../artemis/jms/tests/MessageConsumerTest.java | 104 ++++++++++---------
.../artemis/jms/tests/MessageProducerTest.java | 10 +-
.../artemis/jms/tests/PersistenceTest.java | 6 +-
.../jms/tests/TemporaryDestinationTest.java | 6 +-
.../artemis/jms/tests/TransactedSessionTest.java | 20 ++--
.../jms/tests/message/JMSExpirationHeaderTest.java | 23 +++--
.../artemis/jms/tests/message/MessageBodyTest.java | 11 +-
.../jms/tests/message/MessageHeaderTest.java | 21 ++--
.../artemis/jms/tests/message/MessageTestBase.java | 8 +-
.../message/foreign/ForeignBytesMessageTest.java | 6 +-
.../message/foreign/ForeignMapMessageTest.java | 6 +-
.../tests/message/foreign/ForeignMessageTest.java | 6 +-
.../message/foreign/ForeignObjectMessageTest.java | 6 +-
.../message/foreign/ForeignStreamMessageTest.java | 6 +-
.../artemis/jms/tests/selector/SelectorTest.java | 26 +++--
.../artemis/jms/tests/tools/ServerManagement.java | 17 +--
.../jms/tests/tools/container/InVMContext.java | 10 +-
.../InVMInitialContextFactoryBuilder.java | 11 +-
.../jms/tests/tools/container/LocalTestServer.java | 7 +-
.../artemis/jms/tests/util/JNDIUtilTest.java | 5 +-
.../artemis/jms/tests/util/ProxyAssertSupport.java | 73 ++++++-------
.../artemis/common/testjndi/TestContext.java | 6 +-
32 files changed, 357 insertions(+), 293 deletions(-)
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
index a1694578c0..86683811bb 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ActiveMQOsgiLogger.java
@@ -16,57 +16,41 @@
*/
package org.apache.activemq.artemis.osgi;
-import org.jboss.logging.BasicLogger;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
/**
* Logger code 58
*
- * each message id must be 6 digits long starting with 58, the 3rd digit donates the level so
- *
- * INF0 1
- * WARN 2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
*
* so an INFO message would be 581000 to 581999
*/
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQOsgiLogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQOsgiLogger {
/**
* * The default logger.
*/
ActiveMQOsgiLogger LOGGER = Logger.getMessageLogger(ActiveMQOsgiLogger.class, ActiveMQOsgiLogger.class.getPackage().getName());
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 581000, value = "Broker config {0} found. Tracking protocols {1}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 581000, value = "Broker config {0} found. Tracking protocols {1}", level = LogMessage.Level.INFO)
void brokerConfigFound(String name, String protocols);
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 581001, value = "Required protocol {0} was added for broker {1}. {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 581001, value = "Required protocol {0} was added for broker {1}. {2}", level = LogMessage.Level.INFO)
void protocolWasAddedForBroker(String protocol, String name, String message);
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 581002, value = "Required protocol {0} was removed for broker {1}. {2}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 581002, value = "Required protocol {0} was removed for broker {1}. {2}", level = LogMessage.Level.INFO)
void protocolWasRemovedForBroker(String protocol, String name, String message);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 582000, value = "Error starting broker: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 582000, value = "Error starting broker: {0}", level = LogMessage.Level.WARN)
void errorStartingBroker(@Cause Exception e, String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 582001, value = "Error stopping broker: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 582001, value = "Error stopping broker: {0}", level = LogMessage.Level.WARN)
void errorStoppingBroker(@Cause Exception e, String name);
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 582002, value = "Error getting dataSource provider infos.", format = Message.Format.MESSAGE_FORMAT)
+ @LogMessage(id = 582002, value = "Error getting dataSource provider infos.", level = LogMessage.Level.WARN)
void errorGettingDataSourceProviderInfo(@Cause Exception e);
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
index b931f6dec3..afa17fe0bc 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
@@ -37,11 +37,15 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
public class AcknowledgementTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(AcknowledgementTest.class);
+
/**
* Topics shouldn't hold on to messages if there are no subscribers
*/
@@ -240,7 +244,7 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Sent messages");
+ logger.trace("Sent messages");
int count = 0;
while (true) {
@@ -253,7 +257,7 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Received " + count + " messages");
+ logger.trace("Received " + count + " messages");
ProxyAssertSupport.assertEquals(count, NUM_MESSAGES);
@@ -261,14 +265,14 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Session recover called");
+ logger.trace("Session recover called");
Message m = null;
int i = 0;
for (; i < NUM_MESSAGES; i++) {
m = consumer.receive();
- log.trace("Received message " + i);
+ logger.trace("Received message " + i);
}
@@ -276,7 +280,7 @@ public class AcknowledgementTest extends JMSTestCase {
// if I don't receive enough messages, the test will timeout
- log.trace("Received " + i + " messages after recover");
+ logger.trace("Received " + i + " messages after recover");
m.acknowledge();
@@ -356,7 +360,7 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Sent messages");
+ logger.trace("Sent messages");
Message m = null;
int count = 0;
@@ -376,17 +380,17 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(0);
- log.trace("Received " + count + " messages");
+ logger.trace("Received " + count + " messages");
ProxyAssertSupport.assertEquals(count, NUM_MESSAGES);
consumerSess.recover();
- log.trace("Session recover called");
+ logger.trace("Session recover called");
m = consumer.receiveNoWait();
- log.trace("Message is:" + m);
+ logger.trace("Message is:" + m);
ProxyAssertSupport.assertNull(m);
}
@@ -418,7 +422,7 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Sent messages");
+ logger.trace("Sent messages");
int count = 0;
@@ -438,13 +442,13 @@ public class AcknowledgementTest extends JMSTestCase {
ProxyAssertSupport.assertNotNull(m);
- log.trace("Received " + count + " messages");
+ logger.trace("Received " + count + " messages");
ProxyAssertSupport.assertEquals(count, NUM_MESSAGES);
consumerSess.recover();
- log.trace("Session recover called");
+ logger.trace("Session recover called");
count = 0;
while (true) {
@@ -511,17 +515,17 @@ public class AcknowledgementTest extends JMSTestCase {
ProxyAssertSupport.assertNotNull(m);
- log.trace("Received " + count + " messages");
+ logger.trace("Received " + count + " messages");
ProxyAssertSupport.assertEquals(count, NUM_MESSAGES);
consumerSess.recover();
- log.trace("Session recover called");
+ logger.trace("Session recover called");
m = consumer.receiveNoWait();
- log.trace("Message is:" + m);
+ logger.trace("Message is:" + m);
ProxyAssertSupport.assertNull(m);
}
@@ -565,17 +569,17 @@ public class AcknowledgementTest extends JMSTestCase {
ProxyAssertSupport.assertNotNull(m);
- log.trace("Received " + count + " messages");
+ logger.trace("Received " + count + " messages");
ProxyAssertSupport.assertEquals(count, NUM_MESSAGES);
consumerSess.recover();
- log.trace("Session recover called");
+ logger.trace("Session recover called");
m = consumer.receiveNoWait();
- log.trace("Message is:" + m);
+ logger.trace("Message is:" + m);
ProxyAssertSupport.assertNull(m);
@@ -609,7 +613,7 @@ public class AcknowledgementTest extends JMSTestCase {
producer.send(m);
}
- log.trace("Sent messages");
+ logger.trace("Sent messages");
Message m = null;
for (int i = 0; i < 19; i++) {
@@ -654,7 +658,7 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Sent messages");
+ logger.trace("Sent messages");
int count = 0;
@@ -671,17 +675,17 @@ public class AcknowledgementTest extends JMSTestCase {
assertRemainingMessages(NUM_MESSAGES);
- log.trace("Received " + count + " messages");
+ logger.trace("Received " + count + " messages");
ProxyAssertSupport.assertEquals(count, NUM_MESSAGES);
consumerSess.recover();
- log.trace("Session recover called");
+ logger.trace("Session recover called");
m = consumer.receiveNoWait();
- log.trace("Message is:" + m);
+ logger.trace("Message is:" + m);
ProxyAssertSupport.assertNull(m);
@@ -696,7 +700,7 @@ public class AcknowledgementTest extends JMSTestCase {
Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sessSend.createProducer(queue1);
- log.trace("Sending messages");
+ logger.trace("Sending messages");
TextMessage tm1 = sessSend.createTextMessage("a");
TextMessage tm2 = sessSend.createTextMessage("b");
@@ -705,7 +709,7 @@ public class AcknowledgementTest extends JMSTestCase {
prod.send(tm2);
prod.send(tm3);
- log.trace("Sent messages");
+ logger.trace("Sent messages");
sessSend.close();
@@ -715,19 +719,19 @@ public class AcknowledgementTest extends JMSTestCase {
Session sessReceive = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- log.trace("Creating consumer");
+ logger.trace("Creating consumer");
MessageConsumer cons = sessReceive.createConsumer(queue1);
- log.trace("Created consumer");
+ logger.trace("Created consumer");
MessageListenerAutoAck listener = new MessageListenerAutoAck(sessReceive);
- log.trace("Setting message listener");
+ logger.trace("Setting message listener");
cons.setMessageListener(listener);
- log.trace("Set message listener");
+ logger.trace("Set message listener");
listener.waitForMessages();
@@ -782,7 +786,7 @@ public class AcknowledgementTest extends JMSTestCase {
messageReceived = (TextMessage) consumer.receiveNoWait();
if (messageReceived != null) {
- log.debug("Message received " + messageReceived.getText());
+ logger.debug("Message received " + messageReceived.getText());
}
Assert.assertNull(messageReceived);
@@ -801,7 +805,7 @@ public class AcknowledgementTest extends JMSTestCase {
Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer prod = sessSend.createProducer(queue1);
- log.trace("Sending messages");
+ logger.trace("Sending messages");
TextMessage tm1 = sessSend.createTextMessage("a");
TextMessage tm2 = sessSend.createTextMessage("b");
@@ -810,7 +814,7 @@ public class AcknowledgementTest extends JMSTestCase {
prod.send(tm2);
prod.send(tm3);
- log.trace("Sent messages");
+ logger.trace("Sent messages");
sessSend.close();
@@ -820,19 +824,19 @@ public class AcknowledgementTest extends JMSTestCase {
Session sessReceive = conn.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
- log.trace("Creating consumer");
+ logger.trace("Creating consumer");
MessageConsumer cons = sessReceive.createConsumer(queue1);
- log.trace("Created consumer");
+ logger.trace("Created consumer");
MessageListenerDupsOK listener = new MessageListenerDupsOK(sessReceive);
- log.trace("Setting message listener");
+ logger.trace("Setting message listener");
cons.setMessageListener(listener);
- log.trace("Set message listener");
+ logger.trace("Set message listener");
listener.waitForMessages();
@@ -1064,7 +1068,7 @@ public class AcknowledgementTest extends JMSTestCase {
if (count == 1) {
assertRemainingMessages(3);
if (!"a".equals(tm.getText())) {
- log.trace("Expected a but got " + tm.getText());
+ logger.trace("Expected a but got " + tm.getText());
failed = true;
latch.countDown();
}
@@ -1072,7 +1076,7 @@ public class AcknowledgementTest extends JMSTestCase {
if (count == 2) {
assertRemainingMessages(3);
if (!"b".equals(tm.getText())) {
- log.trace("Expected b but got " + tm.getText());
+ logger.trace("Expected b but got " + tm.getText());
failed = true;
latch.countDown();
}
@@ -1080,40 +1084,40 @@ public class AcknowledgementTest extends JMSTestCase {
if (count == 3) {
assertRemainingMessages(3);
if (!"c".equals(tm.getText())) {
- log.trace("Expected c but got " + tm.getText());
+ logger.trace("Expected c but got " + tm.getText());
failed = true;
latch.countDown();
}
- log.trace("calling recover");
+ logger.trace("calling recover");
sess.recover();
}
if (count == 4) {
assertRemainingMessages(3);
if (!"a".equals(tm.getText())) {
- log.trace("Expected a but got " + tm.getText());
+ logger.trace("Expected a but got " + tm.getText());
failed = true;
latch.countDown();
}
- log.trace("*** calling acknowledge");
+ logger.trace("*** calling acknowledge");
tm.acknowledge();
assertRemainingMessages(2);
- log.trace("calling recover");
+ logger.trace("calling recover");
sess.recover();
}
if (count == 5) {
assertRemainingMessages(2);
if (!"b".equals(tm.getText())) {
- log.trace("Expected b but got " + tm.getText());
+ logger.trace("Expected b but got " + tm.getText());
failed = true;
latch.countDown();
}
- log.trace("calling recover");
+ logger.trace("calling recover");
sess.recover();
}
if (count == 6) {
assertRemainingMessages(2);
if (!"b".equals(tm.getText())) {
- log.trace("Expected b but got " + tm.getText());
+ logger.trace("Expected b but got " + tm.getText());
failed = true;
latch.countDown();
}
@@ -1121,7 +1125,7 @@ public class AcknowledgementTest extends JMSTestCase {
if (count == 7) {
assertRemainingMessages(2);
if (!"c".equals(tm.getText())) {
- log.trace("Expected c but got " + tm.getText());
+ logger.trace("Expected c but got " + tm.getText());
failed = true;
latch.countDown();
}
@@ -1131,7 +1135,7 @@ public class AcknowledgementTest extends JMSTestCase {
}
} catch (Exception e) {
- log.error("Caught exception", e);
+ logger.error("Caught exception", e);
failed = true;
latch.countDown();
}
@@ -1172,7 +1176,7 @@ public class AcknowledgementTest extends JMSTestCase {
failed = true;
latch.countDown();
}
- log.trace("Rollback");
+ logger.trace("Rollback");
sess.rollback();
}
if (count == 4) {
@@ -1188,7 +1192,7 @@ public class AcknowledgementTest extends JMSTestCase {
failed = true;
latch.countDown();
}
- log.trace("commit");
+ logger.trace("commit");
sess.commit();
assertRemainingMessages(1);
}
@@ -1198,7 +1202,7 @@ public class AcknowledgementTest extends JMSTestCase {
failed = true;
latch.countDown();
}
- log.trace("recover");
+ logger.trace("recover");
sess.rollback();
}
if (count == 7) {
@@ -1207,13 +1211,13 @@ public class AcknowledgementTest extends JMSTestCase {
failed = true;
latch.countDown();
}
- log.trace("Commit");
+ logger.trace("Commit");
sess.commit();
assertRemainingMessages(0);
latch.countDown();
}
} catch (Exception e) {
- // log.error(e);
+ // logger.error(e.getMessage(), e);
failed = true;
latch.countDown();
}
@@ -1308,8 +1312,8 @@ public class AcknowledgementTest extends JMSTestCase {
long time1 = consume(cf1, queue1, messageCount);
long time2 = consume(cf2, queue2, messageCount);
- log.debug("BlockOnAcknowledge=false MessageCount=" + messageCount + " TimeToConsume=" + time1);
- log.debug("BlockOnAcknowledge=true MessageCount=" + messageCount + " TimeToConsume=" + time2);
+ logger.debug("BlockOnAcknowledge=false MessageCount=" + messageCount + " TimeToConsume=" + time1);
+ logger.debug("BlockOnAcknowledge=true MessageCount=" + messageCount + " TimeToConsume=" + time2);
Assert.assertTrue(time1 < (time2 / 2));
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
index 990c0e396d..8f72e5a1ff 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
@@ -53,6 +53,8 @@ import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @deprecated this infrastructure should not be used for new code. New tests should go into
@@ -60,13 +62,13 @@ import org.junit.runner.Description;
*/
@Deprecated
public abstract class ActiveMQServerTestCase {
+ private final Logger logger = LoggerFactory.getLogger(ActiveMQServerTestCase.class);
public static final int MAX_TIMEOUT = 1000 * 10 /* seconds */;
public static final int MIN_TIMEOUT = 1000 * 1 /* seconds */;
private static final int DRAIN_WAIT_TIME = 250;
- protected final JmsTestLogger log = JmsTestLogger.LOGGER;
/**
* Some testcases are time sensitive, and we need to make sure a GC would happen before certain scenarios
@@ -101,12 +103,12 @@ public abstract class ActiveMQServerTestCase {
public TestRule watcher = new TestWatcher() {
@Override
protected void starting(Description description) {
- log.debug(String.format("#*#*# Starting test: %s()...", description.getMethodName()));
+ logger.debug(String.format("#*#*# Starting test: %s()...", description.getMethodName()));
}
@Override
protected void finished(Description description) {
- log.debug(String.format("#*#*# Finished test: %s()...", description.getMethodName()));
+ logger.debug(String.format("#*#*# Finished test: %s()...", description.getMethodName()));
}
@Override
@@ -259,13 +261,13 @@ public abstract class ActiveMQServerTestCase {
MessageConsumer cons = sess.createConsumer(dest);
Message m = null;
conn.start();
- log.trace("Draining messages from " + dest);
+ logger.trace("Draining messages from " + dest);
while (true) {
m = cons.receive(DRAIN_WAIT_TIME);
if (m == null) {
break;
}
- log.trace("Drained message");
+ logger.trace("Drained message");
}
} finally {
if (conn != null) {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
index ec93a6d0a9..ab846b6643 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
@@ -27,12 +27,12 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AutoAckMessageListenerTest extends JMSTestCase {
-
- private static final JmsTestLogger log = JmsTestLogger.LOGGER;
-
+ private static final Logger logger = LoggerFactory.getLogger(AutoAckMessageListenerTest.class);
@Test
@@ -50,7 +50,7 @@ public class AutoAckMessageListenerTest extends JMSTestCase {
consumer.setMessageListener(listener);
// create and send messages
- log.debug("Send and receive two message");
+ logger.debug("Send and receive two message");
Message messageSent = session.createMessage();
messageSent.setBooleanProperty("last", false);
producer.send(messageSent);
@@ -60,7 +60,7 @@ public class AutoAckMessageListenerTest extends JMSTestCase {
conn.start();
// wait until message is received
- log.debug("waiting until message has been received by message listener...");
+ logger.debug("waiting until message has been received by message listener...");
latch.await(10, TimeUnit.SECONDS);
// check message listener status
@@ -97,26 +97,26 @@ public class AutoAckMessageListenerTest extends JMSTestCase {
public void onMessage(Message message) {
try {
if (message.getBooleanProperty("last") == false) {
- log.debug("Received first message.");
+ logger.debug("Received first message.");
if (message.getJMSRedelivered() == true) {
// should not re-receive this one
- log.debug("Error: received first message twice");
+ logger.debug("Error: received first message twice");
passed = false;
}
} else {
if (message.getJMSRedelivered() == false) {
// received second message for first time
- log.debug("Received second message. Calling recover()");
+ logger.debug("Received second message. Calling recover()");
session.recover();
} else {
// should be redelivered after recover
- log.debug("Received second message again as expected");
+ logger.debug("Received second message again as expected");
passed = true;
monitor.countDown();
}
}
} catch (JMSException e) {
- log.warn("Exception caught in message listener:\n" + e);
+ logger.warn("Exception caught in message listener:\n" + e);
passed = false;
monitor.countDown();
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
index 79c0703700..2ba1d0fc7c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
@@ -30,12 +30,16 @@ import javax.jms.TopicSubscriber;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* All tests related to closing a Connection.
*/
public class ConnectionClosedTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(ConnectionClosedTest.class);
+
@Test
public void testCloseOnce() throws Exception {
@@ -97,7 +101,7 @@ public class ConnectionClosedTest extends JMSTestCase {
ProxyAssertSupport.assertEquals("hello", tm.getText());
}
- log.debug("all messages received by sub2");
+ logger.debug("all messages received by sub2");
conn1.close();
@@ -140,7 +144,7 @@ public class ConnectionClosedTest extends JMSTestCase {
}
}
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
failed = e.getMessage();
}
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
index 91e466e709..2463422dec 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
@@ -44,9 +44,13 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConnectionFactoryTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(ConnectionFactoryTest.class);
+
private final Random random = new Random();
private String testClientId;
@@ -165,13 +169,13 @@ public class ConnectionFactoryTest extends JMSTestCase {
conn.close();
}
} catch (Exception e) {
- log.warn(e.toString(), e);
+ logger.warn(e.toString(), e);
}
try {
destroyTopic("TestSubscriber");
} catch (Exception e) {
- log.warn(e.toString(), e);
+ logger.warn(e.toString(), e);
}
}
@@ -283,13 +287,13 @@ public class ConnectionFactoryTest extends JMSTestCase {
conn.close();
}
} catch (Exception e) {
- log.warn(e.toString(), e);
+ logger.warn(e.toString(), e);
}
try {
ActiveMQServerTestCase.undeployConnectionFactory("TestSlowConsumersCF");
} catch (Exception e) {
- log.warn(e.toString(), e);
+ logger.warn(e.toString(), e);
}
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index e04d3f8bc1..c05888cf33 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -29,6 +29,8 @@ import javax.jms.TopicConnection;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Connection tests. Contains all connection tests, except tests relating to closing a connection,
@@ -36,7 +38,7 @@ import org.junit.Test;
*/
public class ConnectionTest extends JMSTestCase {
- private static final JmsTestLogger log = JmsTestLogger.LOGGER;
+ private static final Logger logger = LoggerFactory.getLogger(ConnectionTest.class);
@Test
@@ -134,7 +136,7 @@ public class ConnectionTest extends JMSTestCase {
connection.setClientID(clientID);
ProxyAssertSupport.fail();
} catch (javax.jms.IllegalStateException e) {
- ConnectionTest.log.trace("Caught exception ok");
+ logger.trace("Caught exception ok");
}
connection.close();
@@ -290,7 +292,7 @@ public class ConnectionTest extends JMSTestCase {
@Override
public void onException(final JMSException exception) {
exceptionReceived = exception;
- ConnectionTest.log.trace("Received exception");
+ logger.trace("Received exception");
}
}
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
index 729f58d05a..dcd8ad2559 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
@@ -23,9 +23,13 @@ import javax.jms.Session;
import javax.naming.InitialContext;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConsumerClosedTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(ConsumerClosedTest.class);
+
public static final int NUMBER_OF_MESSAGES = 10;
@@ -48,12 +52,12 @@ public class ConsumerClosedTest extends JMSTestCase {
p.send(s.createTextMessage("message" + i));
}
- log.debug("all messages sent");
+ logger.debug("all messages sent");
MessageConsumer cons = s.createConsumer(queue1);
cons.close();
- log.debug("consumer closed");
+ logger.debug("consumer closed");
// make sure that all messages are in queue
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
index 34d2bdc0d1..255dbe933a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
@@ -31,6 +31,8 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.After;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -39,6 +41,8 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
*/
public class JMSTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(JMSTest.class);
+
Connection conn = null;
@Override
@@ -262,7 +266,7 @@ public class JMSTest extends JMSTestCase {
}
}
} catch (Exception e) {
- log.error("receive failed", e);
+ logger.error("receive failed", e);
}
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JmsTestLogger.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JmsTestLogger.java
deleted file mode 100644
index 81ff1c812a..0000000000
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JmsTestLogger.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.jms.tests;
-
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.MessageLogger;
-
-@MessageLogger(projectCode = "AMQTEST")
-public interface JmsTestLogger extends BasicLogger {
-
- /**
- * The jms test logger.
- */
- JmsTestLogger LOGGER = Logger.getMessageLogger(JmsTestLogger.class, JmsTestLogger.class.getPackage().getName());
-}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
index c4dcbf968b..5dfd2f8fd8 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
@@ -50,9 +50,14 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.Wait;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageConsumerTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(MessageConsumerTest.class);
+
+
@Test
public void testReceiveWithClientAckThenCloseSession() throws Exception {
Connection conn = null;
@@ -572,7 +577,7 @@ public class MessageConsumerTest extends JMSTestCase {
connReceive.close();
- log.trace("Done test");
+ logger.trace("Done test");
} finally {
if (connSend != null) {
@@ -906,7 +911,7 @@ public class MessageConsumerTest extends JMSTestCase {
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer prod = sess.createProducer(queue1);
TextMessage tm1 = sess.createTextMessage("hello1");
- log.trace(tm1.getJMSMessageID());
+ logger.trace(tm1.getJMSMessageID());
TextMessage tm2 = sess.createTextMessage("hello2");
TextMessage tm3 = sess.createTextMessage("hello3");
prod.send(tm1);
@@ -919,16 +924,16 @@ public class MessageConsumerTest extends JMSTestCase {
TextMessage rm1 = (TextMessage) cons1.receive(1500);
ProxyAssertSupport.assertNotNull(rm1);
ProxyAssertSupport.assertEquals("hello1", rm1.getText());
- log.trace(rm1.getJMSMessageID());
+ logger.trace(rm1.getJMSMessageID());
- log.trace("rolling back");
+ logger.trace("rolling back");
// rollback should cause redelivery of messages not acked
sess.rollback();
- log.trace("rolled back");
+ logger.trace("rolled back");
TextMessage rm2 = (TextMessage) cons1.receive(1500);
ProxyAssertSupport.assertEquals("hello1", rm2.getText());
- log.trace(rm1.getJMSMessageID());
+ logger.trace(rm1.getJMSMessageID());
TextMessage rm3 = (TextMessage) cons1.receive(1500);
ProxyAssertSupport.assertEquals("hello2", rm3.getText());
@@ -1084,14 +1089,14 @@ public class MessageConsumerTest extends JMSTestCase {
cons1.close();
- log.debug("sess.recover()");
+ logger.debug("sess.recover()");
// redeliver
sess.recover();
MessageConsumer cons2 = sess.createConsumer(queue1);
- log.debug("receiving ...");
+ logger.debug("receiving ...");
TextMessage rm2 = (TextMessage) cons2.receive(1500);
ProxyAssertSupport.assertNotNull(rm2);
@@ -1314,7 +1319,7 @@ public class MessageConsumerTest extends JMSTestCase {
for (int i = 0; i < NUM_MESSAGES; i++) {
TextMessage m = (TextMessage) cons.receive(5000);
if (m == null) {
- log.error("Didn't receive all the messages");
+ logger.error("Didn't receive all the messages");
failed = true;
break;
}
@@ -1324,7 +1329,7 @@ public class MessageConsumerTest extends JMSTestCase {
}
} catch (Exception e) {
- log.error("Failed in receiving messages", e);
+ logger.error("Failed in receiving messages", e);
failed = true;
}
}
@@ -1338,13 +1343,13 @@ public class MessageConsumerTest extends JMSTestCase {
Thread t2 = new Thread(rec2);
Thread t3 = new Thread(rec3);
- log.trace("Starting threads");
+ logger.trace("Starting threads");
t1.start();
t2.start();
t3.start();
- log.trace("Sending messages to topic");
+ logger.trace("Sending messages to topic");
producerConnection.start();
Session prodSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1354,7 +1359,7 @@ public class MessageConsumerTest extends JMSTestCase {
for (int i = 0; i < NUM_MESSAGES; i++) {
Message m = prodSession.createTextMessage("testing");
prod.send(m);
- log.trace("Sent message to topic");
+ logger.trace("Sent message to topic");
}
t1.join(15000);
@@ -1596,7 +1601,7 @@ public class MessageConsumerTest extends JMSTestCase {
Thread.sleep(1000);
topicProducer.send(m);
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "Producer").start();
@@ -1642,7 +1647,7 @@ public class MessageConsumerTest extends JMSTestCase {
Thread.sleep(1000);
topicProducer.send(m1);
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "Producer").start();
@@ -1689,7 +1694,7 @@ public class MessageConsumerTest extends JMSTestCase {
Thread.sleep(1000);
topicProducer.send(m1);
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "Producer").start();
@@ -1786,7 +1791,7 @@ public class MessageConsumerTest extends JMSTestCase {
queueProducer.send(m);
}
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "ProducerTestThread").start();
@@ -1845,7 +1850,7 @@ public class MessageConsumerTest extends JMSTestCase {
topicProducer.send(m);
}
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "ProducerTestThread").start();
@@ -1887,7 +1892,7 @@ public class MessageConsumerTest extends JMSTestCase {
Thread.sleep(1000);
topicConsumer.close();
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
} finally {
latch.countDown();
}
@@ -1908,6 +1913,11 @@ public class MessageConsumerTest extends JMSTestCase {
}
}
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
/**
* to be used by testTimeoutReceiveOnClose
*/
@@ -1943,7 +1953,7 @@ public class MessageConsumerTest extends JMSTestCase {
Thread.sleep(timeToSleep);
topicConsumer.close();
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
e.printStackTrace();
}
}
@@ -1991,7 +2001,7 @@ public class MessageConsumerTest extends JMSTestCase {
t2 = System.currentTimeMillis();
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
e.printStackTrace();
}
}
@@ -2011,8 +2021,8 @@ public class MessageConsumerTest extends JMSTestCase {
// This is a really weird test - the received object is always going to be null since no message is sent!!
ActiveMQServerTestCase.forceGC(); // / If A GC need to be executed, it' s better to be executed now
- if (log.isTraceEnabled()) {
- log.trace("testTimeoutReceiveOnClose");
+ if (logger.isTraceEnabled()) {
+ logger.trace("testTimeoutReceiveOnClose");
}
Object monitor = new Object();
@@ -2109,7 +2119,7 @@ public class MessageConsumerTest extends JMSTestCase {
MessageConsumer topicConsumer = consumerSession.createConsumer(ActiveMQServerTestCase.topic1);
- log.debug("testMessageListenerOnTopicMultipleMessages");
+ logger.debug("testMessageListenerOnTopicMultipleMessages");
int NUM_MESSAGES = 10;
@@ -2131,7 +2141,7 @@ public class MessageConsumerTest extends JMSTestCase {
ProxyAssertSupport.assertEquals("body" + counter, m.getText());
}
- log.debug("testMessageListenerOnTopicMultipleMessages done");
+ logger.debug("testMessageListenerOnTopicMultipleMessages done");
} finally {
if (producerConnection != null) {
@@ -2162,7 +2172,7 @@ public class MessageConsumerTest extends JMSTestCase {
MessageProducer queueProducer = producerSession.createProducer(queue1);
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
- log.debug("testMessageListenerOnQueueMultipleMessages");
+ logger.debug("testMessageListenerOnQueueMultipleMessages");
int NUM_MESSAGES = 10;
@@ -2184,7 +2194,7 @@ public class MessageConsumerTest extends JMSTestCase {
ProxyAssertSupport.assertEquals("body" + counter, m.getText());
}
- log.debug("testMessageListenerOnTopicMultipleMessages done");
+ logger.debug("testMessageListenerOnTopicMultipleMessages done");
} finally {
if (producerConnection != null) {
@@ -2277,7 +2287,7 @@ public class MessageConsumerTest extends JMSTestCase {
ProxyAssertSupport.fail("should have thrown JMSException");
} catch (JMSException e) {
// ok
- log.trace(e.getMessage());
+ logger.trace(e.getMessage());
}
} finally {
if (consumerConnection != null) {
@@ -2288,8 +2298,8 @@ public class MessageConsumerTest extends JMSTestCase {
@Test
public void testStopConnectionDuringOnMessage() throws Exception {
- if (log.isTraceEnabled()) {
- log.trace("testStopConnectionWhileOnMessageIsExecuting");
+ if (logger.isTraceEnabled()) {
+ logger.trace("testStopConnectionWhileOnMessageIsExecuting");
}
final AtomicInteger messagesReceived = new AtomicInteger(0);
@@ -2326,12 +2336,12 @@ public class MessageConsumerTest extends JMSTestCase {
queueConsumer.setMessageListener(myListener);
- log.trace("Starting consumer connection");
+ logger.trace("Starting consumer connection");
consumerConnection.start();
final int MESSAGE_COUNT = 100;
- log.trace("Sending the first batch of messages");
+ logger.trace("Sending the first batch of messages");
for (int i = 0; i < MESSAGE_COUNT / 2; i++) {
queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
@@ -2339,20 +2349,20 @@ public class MessageConsumerTest extends JMSTestCase {
messagesReceivedLatch.await(500, TimeUnit.MILLISECONDS);
- log.trace("Stopping consumer connection");
+ logger.trace("Stopping consumer connection");
consumerConnection.stop();
int countAfterStop = messagesReceived.get();
ProxyAssertSupport.assertTrue("Should have received some messages before stopping", countAfterStop > 0);
- log.trace("Sending the second batch of messages");
+ logger.trace("Sending the second batch of messages");
for (int i = MESSAGE_COUNT / 2; i < MESSAGE_COUNT; i++) {
queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
}
ProxyAssertSupport.assertFalse("Should not receive any messages after the connection has been stopped", Wait.waitFor(() -> messagesReceived.get() > countAfterStop, 2000, 1000));
- log.trace("Restarting consumer connection");
+ logger.trace("Restarting consumer connection");
consumerConnection.start();
ProxyAssertSupport.assertTrue("Should have received all messages after restarting", Wait.waitFor(() -> messagesReceived.get() == MESSAGE_COUNT, 15000, 100));
@@ -2533,8 +2543,8 @@ public class MessageConsumerTest extends JMSTestCase {
@Test
public void testNoLocal() throws Exception {
- if (log.isTraceEnabled()) {
- log.trace("testNoLocal");
+ if (logger.isTraceEnabled()) {
+ logger.trace("testNoLocal");
}
Connection conn1 = null;
@@ -2711,7 +2721,7 @@ public class MessageConsumerTest extends JMSTestCase {
ProxyAssertSupport.assertNull(tm1);
} finally {
if (conn1 != null) {
- log.trace("closing connection");
+ logger.trace("closing connection");
conn1.close();
}
}
@@ -2824,7 +2834,7 @@ public class MessageConsumerTest extends JMSTestCase {
Message m2 = theConsumer.receive(1500);
- log.trace("m2 is " + m2);
+ logger.trace("m2 is " + m2);
ProxyAssertSupport.assertNotNull(m2);
@@ -2952,7 +2962,7 @@ public class MessageConsumerTest extends JMSTestCase {
}
Assert.assertNull(durable3.receiveNoWait());
- log.debug("received " + NUM_MESSAGES + " messages");
+ logger.debug("received " + NUM_MESSAGES + " messages");
MessageConsumer durable4 = sess3.createDurableSubscriber(ActiveMQServerTestCase.topic1, "mySubscription1");
@@ -3053,17 +3063,17 @@ public class MessageConsumerTest extends JMSTestCase {
MessageProducer prod5 = sess5.createProducer(null);
prod5.setDeliveryMode(DeliveryMode.PERSISTENT);
- log.debug("sending.1 " + NUM_MESSAGES + " messages");
+ logger.debug("sending.1 " + NUM_MESSAGES + " messages");
for (int i = 0; i < NUM_MESSAGES; i++) {
TextMessage tm2 = sess5.createTextMessage("hello");
prod5.send(ActiveMQServerTestCase.topic1, tm2);
}
- log.debug("unsubscribing mySubscription");
+ logger.debug("unsubscribing mySubscription");
durable.close();
sess5.unsubscribe("mySubscription");
- log.debug("unsubscribing done");
+ logger.debug("unsubscribing done");
conn5.close();
// Resubscribe with the same name
@@ -3428,7 +3438,7 @@ public class MessageConsumerTest extends JMSTestCase {
listener.waitForMessages();
- log.debug(listener.messageOrder);
+ logger.debug(listener.messageOrder);
ProxyAssertSupport.assertFalse(listener.messageOrder, listener.failed);
conn.close();
@@ -3782,7 +3792,7 @@ public class MessageConsumerTest extends JMSTestCase {
String message = "ok";
private void failed(final String msg) {
- log.warn(msg);
+ logger.warn(msg);
failed = true;
message = msg;
}
@@ -3852,7 +3862,7 @@ public class MessageConsumerTest extends JMSTestCase {
}
}
} catch (JMSException e) {
- log.error(e.getMessage(), e);
+ logger.error(e.getMessage(), e);
failed("Got a JMSException " + e.toString());
latch.countDown();
}
@@ -3964,7 +3974,7 @@ public class MessageConsumerTest extends JMSTestCase {
@Override
public void onMessage(final Message m) {
messages.add(m);
- log.trace("Added message " + m + " to my list");
+ logger.trace("Added message " + m + " to my list");
latch.countDown();
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
index 3ea0bc41a2..d4ee0ad680 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
@@ -44,12 +44,16 @@ import org.apache.activemq.artemis.jms.tests.message.SimpleJMSMessage;
import org.apache.activemq.artemis.jms.tests.message.SimpleJMSTextMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
public class MessageProducerTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(MessageProducerTest.class);
+
@Test
public void testSendForeignWithForeignDestinationSet() throws Exception {
Connection conn = createConnection();
@@ -188,7 +192,7 @@ public class MessageProducerTest extends JMSTestCase {
try {
prod.send(m);
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
ex = e;
}
@@ -270,7 +274,7 @@ public class MessageProducerTest extends JMSTestCase {
try {
anonProducer.send(ActiveMQServerTestCase.topic2, m1);
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "Producer Thread").start();
@@ -278,7 +282,7 @@ public class MessageProducerTest extends JMSTestCase {
Message m2 = c2.receive(3000);
ProxyAssertSupport.assertEquals(m1.getJMSMessageID(), m2.getJMSMessageID());
- log.debug("ending test");
+ logger.debug("ending test");
} finally {
pconn.close();
cconn.close();
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
index d5c5fdc43d..5a5dd1d6b6 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
@@ -25,9 +25,13 @@ import javax.jms.TextMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PersistenceTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(PersistenceTest.class);
+
/**
* Test that the messages in a persistent queue survive starting and stopping and server,
*/
@@ -394,7 +398,7 @@ public class PersistenceTest extends JMSTestCase {
TextMessage tm = s.createTextMessage("thebody");
p.send(tm);
- log.debug("message sent");
+ logger.debug("message sent");
conn.close();
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
index 5afe2127d4..6e06ac9156 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
@@ -29,9 +29,13 @@ import javax.naming.NamingException;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TemporaryDestinationTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(TemporaryDestinationTest.class);
+
@Test
@@ -288,7 +292,7 @@ public class TemporaryDestinationTest extends JMSTestCase {
Thread.sleep(500);
producer.send(m);
} catch (Exception e) {
- log.error(e);
+ logger.error(e.getMessage(), e);
}
}
}, "Producer");
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
index c63c939210..fba03f93a9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
@@ -32,9 +32,13 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TransactedSessionTest extends JMSTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(TransactedSessionTest.class);
+
@Test
public void testSimpleRollback() throws Exception {
// send a message
@@ -172,10 +176,10 @@ public class TransactedSessionTest extends JMSTestCase {
MessageConsumer consumer = sess.createConsumer(ActiveMQServerTestCase.topic1);
conn.start();
- log.debug("sending message first time");
+ logger.debug("sending message first time");
TextMessage mSent = sess.createTextMessage("igloo");
producer.send(mSent);
- log.debug("sent message first time");
+ logger.debug("sent message first time");
sess.commit();
@@ -184,10 +188,10 @@ public class TransactedSessionTest extends JMSTestCase {
sess.commit();
- log.debug("sending message again");
+ logger.debug("sending message again");
mSent.setText("rollback");
producer.send(mSent);
- log.debug("sent message again");
+ logger.debug("sent message again");
sess.commit();
@@ -499,13 +503,13 @@ public class TransactedSessionTest extends JMSTestCase {
TextMessage mSent = sess.createTextMessage("igloo");
producer.send(mSent);
- log.trace("sent1");
+ logger.trace("sent1");
sess.commit();
TextMessage mRec = (TextMessage) consumer.receive(1000);
ProxyAssertSupport.assertNotNull(mRec);
- log.trace("Got 1");
+ logger.trace("Got 1");
ProxyAssertSupport.assertNotNull(mRec);
ProxyAssertSupport.assertEquals("igloo", mRec.getText());
@@ -516,11 +520,11 @@ public class TransactedSessionTest extends JMSTestCase {
sess.commit();
- log.trace("Receiving 2");
+ logger.trace("Receiving 2");
mRec = (TextMessage) consumer.receive(1000);
ProxyAssertSupport.assertNotNull(mRec);
- log.trace("Received 2");
+ logger.trace("Received 2");
ProxyAssertSupport.assertNotNull(mRec);
ProxyAssertSupport.assertEquals("rollback", mRec.getText());
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
index 3ee903fbd6..d5205a7c57 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
@@ -27,9 +27,12 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
+ private static final Logger logger = LoggerFactory.getLogger(JMSExpirationHeaderTest.class);
private volatile boolean testFailed;
@@ -113,7 +116,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
try {
expectedMessage = queueConsumer.receive(100);
} catch (Exception e) {
- log.trace("receive() exits with an exception", e);
+ logger.trace("receive() exits with an exception", e);
} finally {
latch.countDown();
}
@@ -140,7 +143,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
expectedMessage = queueConsumer.receive(timeToWaitForReceive);
effectiveReceiveTime = System.currentTimeMillis() - t1;
} catch (Exception e) {
- log.trace("receive() exits with an exception", e);
+ logger.trace("receive() exits with an exception", e);
} finally {
receiverLatch.countDown();
}
@@ -165,12 +168,12 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
ActiveMQMessage msg = (ActiveMQMessage) m;
if (!msg.getCoreMessage().isExpired()) {
- log.error("The message " + m + " should have expired");
+ logger.error("The message " + m + " should have expired");
testFailed = true;
return;
}
} catch (Exception e) {
- log.error("This exception will fail the test", e);
+ logger.error("This exception will fail the test", e);
testFailed = true;
} finally {
senderLatch.countDown();
@@ -186,7 +189,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
ProxyAssertSupport.fail("Test failed by the sender thread. Watch for exception in logs");
}
- log.trace("planned waiting time: " + timeToWaitForReceive + " effective waiting time " + effectiveReceiveTime);
+ logger.trace("planned waiting time: " + timeToWaitForReceive + " effective waiting time " + effectiveReceiveTime);
ProxyAssertSupport.assertTrue(effectiveReceiveTime >= timeToWaitForReceive);
ProxyAssertSupport.assertTrue(effectiveReceiveTime < timeToWaitForReceive * 1.5); // well, how exactly I did come
// up with this coeficient is
@@ -224,20 +227,20 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
@Override
public void run() {
try {
- log.trace("Attempting to receive");
+ logger.trace("Attempting to receive");
expectedMessage = queueConsumer.receive();
// NOTE on close, the receive() call will return with null
- log.trace("Receive exited without exception:" + expectedMessage);
+ logger.trace("Receive exited without exception:" + expectedMessage);
if (expectedMessage == null) {
received.set(false);
}
} catch (Exception e) {
- log.trace("receive() exits with an exception", e);
+ logger.trace("receive() exits with an exception", e);
ProxyAssertSupport.fail();
} catch (Throwable t) {
- log.trace("receive() exits with a throwable", t);
+ logger.trace("receive() exits with a throwable", t);
ProxyAssertSupport.fail();
} finally {
latch.countDown();
@@ -254,7 +257,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
// wait for the reading thread to conclude
ActiveMQTestBase.waitForLatch(latch);
- log.trace("Expected message:" + expectedMessage);
+ logger.trace("Expected message:" + expectedMessage);
ProxyAssertSupport.assertFalse(received.get());
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java
index 4bffa813df..544cd5e4cb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageBodyTest.java
@@ -32,9 +32,13 @@ import java.util.HashSet;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageBodyTest extends MessageBodyTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(MessageBodyTest.class);
+
@Test
public void testSMBodyReadable() throws Exception {
byte bValue = 123;
@@ -60,7 +64,7 @@ public class MessageBodyTest extends MessageBodyTestCase {
float myFloat = Float.MAX_VALUE - 23465;
double myDouble = Double.MAX_VALUE - 72387633;
String myString = "abcdef&^*&!^ghijkl\uD5E2\uCAC7\uD2BB\uB7DD\uB7C7\uB3A3\uBCE4\uB5A5";
- log.trace("String is length:" + myString.length());
+ logger.trace("String is length:" + myString.length());
char myChar = 'q';
byte[] myBytes = new byte[]{-23, 114, -126, -12, 74, 87};
@@ -848,6 +852,11 @@ public class MessageBodyTest extends MessageBodyTestCase {
}
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
static class TestSerializable implements Serializable {
private static final long serialVersionUID = -8641359255228705573L;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index 46ecf49c7f..c0e447d191 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -61,10 +61,12 @@ import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageHeaderTest extends MessageHeaderTestBase {
-
+ private static final Logger logger = LoggerFactory.getLogger(MessageHeaderTest.class);
@Test
public void testClearMessage() throws Exception {
@@ -593,7 +595,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
@Test
public void testSendReceiveForeignMessage() throws JMSException {
- log.trace("Starting da test");
+ logger.trace("Starting da test");
SimpleJMSMessage foreignMessage = new SimpleJMSMessage();
@@ -602,22 +604,22 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
// foreign messages don't have to be serializable
ProxyAssertSupport.assertFalse(foreignMessage instanceof Serializable);
- log.trace("Sending message");
+ logger.trace("Sending message");
queueProducer.send(foreignMessage);
- log.trace("Sent message");
+ logger.trace("Sent message");
Message m2 = queueConsumer.receive(3000);
- log.trace("The message is " + m2);
+ logger.trace("The message is " + m2);
ProxyAssertSupport.assertNotNull(m2);
ProxyAssertSupport.assertEquals("aardvark", m2.getStringProperty("animal"));
- log.trace("Received message");
+ logger.trace("Received message");
- log.trace("Done that test");
+ logger.trace("Done that test");
}
@Test
@@ -735,6 +737,11 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
MessageHeaderTestBase.ensureEquivalent(receivedMessage, (ActiveMQMessage) message);
}
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
private static class ForeignDestination implements Destination, Serializable {
private static final long serialVersionUID = 5545509674580823610L;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
index 0e177069ad..af1158b339 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
@@ -29,9 +29,13 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class MessageTestBase extends ActiveMQServerTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(MessageTestBase.class);
+
protected Message message;
@@ -72,12 +76,12 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
queueProd.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
queueProd.send(message);
- log.debug("Message sent");
+ logger.debug("Message sent");
Message r = queueCons.receive(2000);
ProxyAssertSupport.assertNotNull(r);
- log.debug("Message received");
+ logger.debug("Message received");
ProxyAssertSupport.assertEquals(DeliveryMode.NON_PERSISTENT, r.getJMSDeliveryMode());
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java
index 33c8cd8520..faab4fdfae 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignBytesMessageTest.java
@@ -22,17 +22,21 @@ import javax.jms.Message;
import org.apache.activemq.artemis.jms.tests.message.SimpleJMSBytesMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the delivery/receipt of a foreign byte message
*/
public class ForeignBytesMessageTest extends ForeignMessageTest {
+ private static final Logger logger = LoggerFactory.getLogger(ForeignBytesMessageTest.class);
+
@Override
protected Message createForeignMessage() throws Exception {
SimpleJMSBytesMessage m = new SimpleJMSBytesMessage();
- log.debug("creating JMS Message type " + m.getClass().getName());
+ logger.debug("creating JMS Message type " + m.getClass().getName());
String bytes = "ActiveMQ";
m.writeBytes(bytes.getBytes());
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java
index 31e00832b3..4c3c446970 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMapMessageTest.java
@@ -22,19 +22,23 @@ import javax.jms.Message;
import org.apache.activemq.artemis.jms.tests.message.SimpleJMSMapMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the delivery/receipt of a foreign map message
*/
public class ForeignMapMessageTest extends ForeignMessageTest {
+ private static final Logger logger = LoggerFactory.getLogger(ForeignMapMessageTest.class);
+
private final String obj = new String("stringobject");
@Override
protected Message createForeignMessage() throws Exception {
SimpleJMSMapMessage m = new SimpleJMSMapMessage();
- log.debug("creating JMS Message type " + m.getClass().getName());
+ logger.debug("creating JMS Message type " + m.getClass().getName());
m.setBoolean("boolean1", true);
m.setChar("char1", 'c');
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java
index 2a43dc0063..9e57a29d91 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignMessageTest.java
@@ -28,12 +28,16 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the delivery/receipt of a foreign message
*/
public class ForeignMessageTest extends MessageTestBase {
+ private static final Logger logger = LoggerFactory.getLogger(ForeignMessageTest.class);
+
@Override
@Before
public void setUp() throws Exception {
@@ -50,7 +54,7 @@ public class ForeignMessageTest extends MessageTestBase {
protected Message createForeignMessage() throws Exception {
SimpleJMSMessage m = new SimpleJMSMessage();
- log.debug("creating JMS Message type " + m.getClass().getName());
+ logger.debug("creating JMS Message type " + m.getClass().getName());
return m;
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java
index 9fa08287ff..258c9706ae 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignObjectMessageTest.java
@@ -24,12 +24,16 @@ import org.apache.activemq.artemis.jms.tests.message.SimpleJMSObjectMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.After;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the delivery/receipt of a foreign object message
*/
public class ForeignObjectMessageTest extends ForeignMessageTest {
+ private static final Logger logger = LoggerFactory.getLogger(ForeignObjectMessageTest.class);
+
private ForeignTestObject testObj;
@Override
@@ -51,7 +55,7 @@ public class ForeignObjectMessageTest extends ForeignMessageTest {
protected Message createForeignMessage() throws Exception {
SimpleJMSObjectMessage m = new SimpleJMSObjectMessage();
- log.debug("creating JMS Message type " + m.getClass().getName());
+ logger.debug("creating JMS Message type " + m.getClass().getName());
m.setObject(testObj);
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java
index 1534c6f68d..65ce470353 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/foreign/ForeignStreamMessageTest.java
@@ -22,17 +22,21 @@ import javax.jms.StreamMessage;
import org.apache.activemq.artemis.jms.tests.message.SimpleJMSStreamMessage;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the delivery/receipt of a foreign stream message
*/
public class ForeignStreamMessageTest extends ForeignMessageTest {
+ private static final Logger logger = LoggerFactory.getLogger(ForeignStreamMessageTest.class);
+
@Override
protected Message createForeignMessage() throws Exception {
SimpleJMSStreamMessage m = new SimpleJMSStreamMessage();
- log.debug("creating JMS Message type " + m.getClass().getName());
+ logger.debug("creating JMS Message type " + m.getClass().getName());
m.writeBoolean(true);
m.writeBytes("jboss".getBytes());
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
index a5625df308..b543d30d55 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
@@ -35,12 +35,16 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
public class SelectorTest extends ActiveMQServerTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(SelectorTest.class);
+
/**
* Test case for http://jira.jboss.org/jira/browse/JBMESSAGING-105
* <br>
@@ -74,7 +78,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
prod.send(redMessage);
prod.send(blueMessage);
- log.debug("sent message");
+ logger.debug("sent message");
Message rec = redConsumer.receive();
ProxyAssertSupport.assertEquals(redMessage.getJMSMessageID(), rec.getJMSMessageID());
@@ -84,7 +88,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
redConsumer.close();
- log.debug("closed first consumer");
+ logger.debug("closed first consumer");
MessageConsumer universalConsumer = session.createConsumer(queue1);
@@ -191,7 +195,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
ProxyAssertSupport.assertEquals("john", m.getStringProperty("beatle"));
- log.debug("Got message " + j);
+ logger.debug("Got message " + j);
}
Message m = cons1.receiveNoWait();
@@ -534,7 +538,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
}
}
} catch (Exception e) {
- log.error("receive failed", e);
+ logger.error("receive failed", e);
}
}
}, "consumer thread 1").start();
@@ -553,7 +557,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
}
}
} catch (Exception e) {
- log.error("receive failed", e);
+ logger.error("receive failed", e);
}
}
}, "consumer thread 2").start();
@@ -902,38 +906,38 @@ public class SelectorTest extends ActiveMQServerTestCase {
tm.setText("1");
tm.setStringProperty("PROP1", "VALUE1");
msgProducer.send(tm);
- log.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
+ logger.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
tm = session.createTextMessage();
tm.setText("2");
tm.setStringProperty("PROP1", "VALUE1");
msgProducer.send(tm);
- log.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
+ logger.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
tm = session.createTextMessage();
tm.setText("3");
tm.setStringProperty("PROP2", "VALUE2");
msgProducer.send(tm);
- log.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
+ logger.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
tm = session.createTextMessage();
tm.setText("4");
tm.setStringProperty("PROP2", "VALUE2");
msgProducer.send(tm);
- log.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
+ logger.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
tm = session.createTextMessage();
tm.setText("5");
tm.setStringProperty("PROP1", "VALUE1");
msgProducer.send(tm);
- log.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
+ logger.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
tm = session.createTextMessage();
tm.setText("6");
tm.setStringProperty("PROP1", "VALUE1");
tm.setStringProperty("PROP2", "VALUE2");
msgProducer.send(tm);
- log.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
+ logger.debug("Sent message with id [" + tm.getJMSMessageID() + "]");
msgProducer.close();
msgProducer = null;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
index e7579bbea2..fc8ec91bc8 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
@@ -20,10 +20,11 @@ import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
import org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory;
import org.apache.activemq.artemis.jms.tests.tools.container.LocalTestServer;
import org.apache.activemq.artemis.jms.tests.tools.container.Server;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Collection of static methods to use to start/stop and interact with the in-memory JMS server. It
@@ -31,6 +32,8 @@ import org.apache.activemq.artemis.jms.tests.tools.container.Server;
*/
public class ServerManagement {
+ private static final Logger logger = LoggerFactory.getLogger(ServerManagement.class);
+
// logging levels used by the remote client to forward log output on a remote server
public static int FATAL = 0;
@@ -50,8 +53,6 @@ public class ServerManagement {
public static final String DEFAULT_TOPIC_CONTEXT = "/topic";
- private static JmsTestLogger log = JmsTestLogger.LOGGER;
-
private static List<Server> servers = new ArrayList<>();
/**
@@ -88,23 +89,23 @@ public class ServerManagement {
}
if (i > ServerManagement.servers.size()) {
- ServerManagement.log.error("server " + i +
+ logger.error("server " + i +
" has not been created or has already been killed, so it cannot be killed");
} else {
Server server = ServerManagement.servers.get(i);
- ServerManagement.log.debug("invoking kill() on server " + i);
+ logger.debug("invoking kill() on server " + i);
try {
server.kill();
} catch (Throwable t) {
// This is likely to throw an exception since the server dies before the response is received
}
- ServerManagement.log.debug("Waiting for server to die");
+ logger.debug("Waiting for server to die");
try {
while (true) {
server.ping();
- ServerManagement.log.debug("server " + i + " still alive ...");
+ logger.debug("server " + i + " still alive ...");
Thread.sleep(100);
}
} catch (Throwable e) {
@@ -113,7 +114,7 @@ public class ServerManagement {
Thread.sleep(300);
- ServerManagement.log.debug("server " + i + " killed and dead");
+ logger.debug("server " + i + " killed and dead");
}
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
index 9555be8eb6..1ff08fa2b5 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
@@ -36,14 +36,14 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class InVMContext implements Context, Serializable {
- private static final long serialVersionUID = 385743957345L;
-
- private static final JmsTestLogger log = JmsTestLogger.LOGGER;
+ private static final Logger logger = LoggerFactory.getLogger(InVMContext.class);
+ private static final long serialVersionUID = 385743957345L;
protected Map<String, Object> map;
@@ -285,7 +285,7 @@ public class InVMContext implements Context, Serializable {
}
private void internalBind(String name, final Object obj, final boolean rebind) throws NamingException {
- InVMContext.log.debug("Binding " + name + " obj " + obj + " rebind " + rebind);
+ InVMContext.logger.debug("Binding " + name + " obj " + obj + " rebind " + rebind);
name = trimSlashes(name);
int i = name.lastIndexOf("/");
InVMContext c = this;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
index fe49674c1a..7ad512a488 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
@@ -21,12 +21,13 @@ import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.InitialContextFactoryBuilder;
import java.util.Hashtable;
-import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class InVMInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
+ private static final Logger logger = LoggerFactory.getLogger(InVMInitialContextFactoryBuilder.class);
- private static final JmsTestLogger log = JmsTestLogger.LOGGER;
@@ -47,17 +48,17 @@ public class InVMInitialContextFactoryBuilder implements InitialContextFactoryBu
try {
c = Class.forName(icfName);
} catch (ClassNotFoundException e) {
- InVMInitialContextFactoryBuilder.log.error("\"" + icfName + "\" cannot be loaded", e);
+ logger.error("\"" + icfName + "\" cannot be loaded", e);
throw new NamingException("\"" + icfName + "\" cannot be loaded");
}
try {
icf = (InitialContextFactory) c.newInstance();
} catch (InstantiationException e) {
- InVMInitialContextFactoryBuilder.log.error(c.getName() + " cannot be instantiated", e);
+ logger.error(c.getName() + " cannot be instantiated", e);
throw new NamingException(c.getName() + " cannot be instantiated");
} catch (IllegalAccessException e) {
- InVMInitialContextFactoryBuilder.log.error(c.getName() + " instantiation generated an IllegalAccessException", e);
+ logger.error(c.getName() + " instantiation generated an IllegalAccessException", e);
throw new NamingException(c.getName() + " instantiation generated an IllegalAccessException");
}
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
index 8b54d5c521..c67a915d13 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
@@ -46,12 +46,15 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.artemis.jms.server.JMSServerManager;
import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LocalTestServer implements Server, Runnable {
+ private static final Logger logger = LoggerFactory.getLogger(LocalTestServer.class);
+
private boolean started = false;
private final HashMap<String, List<String>> allBindings = new HashMap<>();
@@ -98,7 +101,7 @@ public class LocalTestServer implements Server, Runnable {
boolean deleted = LocalTestServer.deleteDirectory(dir);
- JmsTestLogger.LOGGER.info("Deleted dir: " + dir.getAbsolutePath() + " deleted: " + deleted);
+ logger.info("Deleted dir: " + dir.getAbsolutePath() + " deleted: " + deleted);
}
javax.management.MBeanServer beanServer = java.lang.management.ManagementFactory.getPlatformMBeanServer();
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
index bc8fa0cf3d..ccaf259554 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
@@ -23,9 +23,12 @@ import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase;
import org.apache.activemq.artemis.utils.JNDIUtil;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JNDIUtilTest extends ActiveMQServerTestCase {
+ private static final Logger logger = LoggerFactory.getLogger(JNDIUtilTest.class);
private InitialContext ic;
@@ -88,7 +91,7 @@ public class JNDIUtilTest extends ActiveMQServerTestCase {
ic = getInitialContext();
- log.debug("setup done");
+ logger.debug("setup done");
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java
index f852d396b8..80948a3aa0 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/ProxyAssertSupport.java
@@ -16,7 +16,8 @@
*/
package org.apache.activemq.artemis.jms.tests.util;
-import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Assert;
/**
@@ -24,13 +25,13 @@ import org.junit.Assert;
*/
public class ProxyAssertSupport {
- private static JmsTestLogger log = JmsTestLogger.LOGGER;
+ private static final Logger logger = LoggerFactory.getLogger(ProxyAssertSupport.class);
public static void assertTrue(final java.lang.String string, final boolean b) {
try {
Assert.assertTrue(string, b);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -39,7 +40,7 @@ public class ProxyAssertSupport {
try {
Assert.assertTrue(b);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -48,7 +49,7 @@ public class ProxyAssertSupport {
try {
Assert.assertFalse(string, b);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -57,7 +58,7 @@ public class ProxyAssertSupport {
try {
Assert.assertFalse(b);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -66,7 +67,7 @@ public class ProxyAssertSupport {
try {
Assert.fail(string);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -75,7 +76,7 @@ public class ProxyAssertSupport {
try {
Assert.fail();
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -86,7 +87,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, object, object1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -95,7 +96,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(object, object1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -106,7 +107,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, string1, string2);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -115,7 +116,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, string1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -124,7 +125,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, v, v1, v2);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -133,7 +134,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(v, v1, v2);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -142,7 +143,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, v, v1, v2);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -151,7 +152,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(v, v1, v2);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -160,7 +161,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, l, l1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -169,7 +170,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(l, l1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -178,7 +179,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, b, b1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -187,7 +188,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(b, b1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -196,7 +197,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, b, b1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -205,7 +206,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(b, b1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -214,7 +215,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, c, c1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -223,7 +224,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(c, c1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -232,7 +233,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, i, i1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -241,7 +242,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(i, i1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -250,7 +251,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(string, i, i1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -259,7 +260,7 @@ public class ProxyAssertSupport {
try {
Assert.assertEquals(i, i1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -268,7 +269,7 @@ public class ProxyAssertSupport {
try {
Assert.assertNotNull(object);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -277,7 +278,7 @@ public class ProxyAssertSupport {
try {
Assert.assertNotNull(string, object);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -286,7 +287,7 @@ public class ProxyAssertSupport {
try {
Assert.assertNull(object);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -295,7 +296,7 @@ public class ProxyAssertSupport {
try {
Assert.assertNull(string, object);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -306,7 +307,7 @@ public class ProxyAssertSupport {
try {
Assert.assertSame(string, object, object1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -315,7 +316,7 @@ public class ProxyAssertSupport {
try {
Assert.assertSame(object, object1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -326,7 +327,7 @@ public class ProxyAssertSupport {
try {
Assert.assertNotSame(string, object, object1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
@@ -335,7 +336,7 @@ public class ProxyAssertSupport {
try {
Assert.assertNotSame(object, object1);
} catch (AssertionError e) {
- ProxyAssertSupport.log.warn("AssertionFailure::" + e.toString(), e);
+ logger.warn("AssertionFailure::" + e.toString(), e);
throw e;
}
}
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContext.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContext.java
index 23b0768231..e7f1fc84af 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContext.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContext.java
@@ -39,6 +39,8 @@ import java.util.Map;
import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
import org.apache.activemq.artemis.jndi.NameParserImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A read-only Context
@@ -63,6 +65,8 @@ import org.apache.activemq.artemis.jndi.NameParserImpl;
@SuppressWarnings("unchecked")
public class TestContext implements Context, Serializable {
+ private static final Logger logger = LoggerFactory.getLogger(TestContext.class);
+
public static final String SEPARATOR = "/";
protected static final NameParser NAME_PARSER = new NameParserImpl();
private static final long serialVersionUID = -5754338187296859149L;
@@ -103,7 +107,7 @@ public class TestContext implements Context, Serializable {
try {
internalBind(binding.getKey(), binding.getValue());
} catch (Throwable e) {
- ActiveMQClientLogger.LOGGER.error("Failed to bind " + binding.getKey() + "=" + binding.getValue(), e);
+ logger.error("Failed to bind " + binding.getKey() + "=" + binding.getValue(), e);
}
}
}