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/05/26 16:55:41 UTC
[activemq-artemis] branch new-logging updated (67b2be9cec -> 672217ec43)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from 67b2be9cec fixup various compilations issues in more modules, and poking to get artemis-features build to complete
new 05470962ca update various tests to fix compilation
new 672217ec43 add TODOs and disable certain tests that need more extensive fixups, gets overall build 'completing' for next steps
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../activemq/artemis/tests/util/ActiveMQTestBase.java | 1 -
.../tests/integration/MultiThreadedAuditLoggingTest.java | 12 ++++++------
.../tests/integration/amqp/AmqpIngressTimestampTest.java | 2 +-
.../tests/integration/client/ExpireTestOnRestartTest.java | 2 +-
.../cluster/failover/MultipleServerFailoverTestBase.java | 6 ++++--
.../artemis/tests/integration/jms/client/MessageTest.java | 12 ++++++------
.../integration/jms/client/MoveMessageDuplicateIDTest.java | 4 ++--
.../tests/integration/jms/client/NewQueueRequestorTest.java | 2 +-
.../tests/integration/management/QueueControlTest.java | 2 +-
.../artemis/tests/integration/mqtt5/MQTT5TestSupport.java | 4 ++--
.../tests/integration/openwire/SimpleOpenWireTest.java | 2 +-
.../tests/integration/paging/AddressFullLoggingTest.java | 13 ++++++-------
.../tests/integration/server/NetworkHealthCheckTest.java | 13 ++++++-------
.../tests/integration/server/SimpleStartStopTest.java | 5 +++--
.../artemis/tests/integration/stomp/v11/ExtraStompTest.java | 4 ++--
.../artemis/tests/integration/stomp/v11/StompV11Test.java | 2 +-
.../artemis/tests/integration/stomp/v12/StompV12Test.java | 11 +++++++----
17 files changed, 50 insertions(+), 47 deletions(-)
[activemq-artemis] 01/02: update various tests to fix compilation
Posted by ro...@apache.org.
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
commit 05470962cad6b3d84b94cc8c60b2889136c81b51
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu May 26 17:53:46 2022 +0100
update various tests to fix compilation
---
.../apache/activemq/artemis/tests/util/ActiveMQTestBase.java | 1 -
.../tests/integration/amqp/AmqpIngressTimestampTest.java | 2 +-
.../tests/integration/client/ExpireTestOnRestartTest.java | 2 +-
.../cluster/failover/MultipleServerFailoverTestBase.java | 6 ++++--
.../artemis/tests/integration/jms/client/MessageTest.java | 12 ++++++------
.../integration/jms/client/MoveMessageDuplicateIDTest.java | 4 ++--
.../tests/integration/jms/client/NewQueueRequestorTest.java | 2 +-
.../tests/integration/management/QueueControlTest.java | 2 +-
.../tests/integration/openwire/SimpleOpenWireTest.java | 2 +-
.../artemis/tests/integration/stomp/v11/ExtraStompTest.java | 4 ++--
.../artemis/tests/integration/stomp/v11/StompV11Test.java | 2 +-
11 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 55b8c204b4..90aeefe259 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -116,7 +116,6 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactor
import org.apache.activemq.artemis.core.replication.ReplicationEndpoint;
import org.apache.activemq.artemis.core.server.ActiveMQComponent;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.MessageReference;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java
index 798aa32c45..76d357565f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java
@@ -107,7 +107,7 @@ public class AmqpIngressTimestampTest extends AmqpClientTestSupport {
receiver.flow(1);
AmqpMessage receive = receiver.receive(5, TimeUnit.SECONDS);
assertNotNull(receive);
- instanceLog.info(receive);
+ instanceLog.info("{}", receive);
Object ingressTimestampHeader = receive.getMessageAnnotation(AMQPMessageSupport.X_OPT_INGRESS_TIME);
assertNotNull(ingressTimestampHeader);
assertTrue(ingressTimestampHeader instanceof Long);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
index 2d6499a42d..ffba61d8f8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
@@ -120,7 +120,7 @@ public class ExpireTestOnRestartTest extends ActiveMQTestBase {
int extras = 0;
ClientMessage msg;
while ((msg = cons.receiveImmediate()) != null) {
- instanceLog.debug(msg);
+ instanceLog.debug("{}", msg);
extras++;
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
index 703f23295d..23dd22fdf0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
@@ -37,7 +37,6 @@ import org.apache.activemq.artemis.core.config.ha.ReplicationPrimaryPolicyConfig
import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.NodeManager;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.quorum.file.FileBasedPrimitiveManager;
@@ -48,9 +47,12 @@ import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase {
+ private static final Logger logger = LoggerFactory.getLogger(MultipleServerFailoverTestBase.class);
private DistributedPrimitiveManagerConfiguration pluggableQuorumConfiguration = null;
private DistributedPrimitiveManagerConfiguration getOrCreatePluggableQuorumConfiguration() {
@@ -271,7 +273,7 @@ public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase {
}
protected boolean waitForDistribution(SimpleString address, ActiveMQServer server, int messageCount) throws Exception {
- ActiveMQServerLogger.LOGGER.debug("waiting for distribution of messages on server " + server);
+ logger.debug("waiting for distribution of messages on server {}", server);
Queue q = (Queue) server.getPostOffice().getBinding(address).getBindable();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
index cf24290838..0cbc7c7cac 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
@@ -214,35 +214,35 @@ public class MessageTest extends JMSTestBase {
Assert.assertNull(message.getObjectProperty(MessageTest.propName3));
try {
- instanceLog.debug(message.getIntProperty(MessageTest.propName1));
+ instanceLog.debug("{}", message.getIntProperty(MessageTest.propName1));
Assert.fail("Should throw exception");
} catch (NumberFormatException e) {
// Ok
}
try {
- instanceLog.debug(message.getShortProperty(MessageTest.propName1));
+ instanceLog.debug("{}", message.getShortProperty(MessageTest.propName1));
} catch (NumberFormatException e) {
// Ok
}
try {
- instanceLog.debug(message.getByteProperty(MessageTest.propName1));
+ instanceLog.debug("{}", message.getByteProperty(MessageTest.propName1));
} catch (NumberFormatException e) {
// Ok
}
Assert.assertEquals(false, message.getBooleanProperty(MessageTest.propName1));
try {
- instanceLog.debug(message.getLongProperty(MessageTest.propName1));
+ instanceLog.debug("{}", message.getLongProperty(MessageTest.propName1));
} catch (NumberFormatException e) {
// Ok
}
try {
- instanceLog.debug(message.getFloatProperty(MessageTest.propName1));
+ instanceLog.debug("{}", message.getFloatProperty(MessageTest.propName1));
} catch (NullPointerException e) {
// Ok
}
try {
- instanceLog.debug(message.getDoubleProperty(MessageTest.propName1));
+ instanceLog.debug("{}", message.getDoubleProperty(MessageTest.propName1));
} catch (NullPointerException e) {
// Ok
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java
index 6f4b22c00f..64b24c8c44 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java
@@ -118,7 +118,7 @@ public class MoveMessageDuplicateIDTest extends JMSTestBase {
createQueue("DLQ");
Queue dlqServerQueue = server.locateQueue("DLQ");
- org.wildfly.common.Assert.assertNotNull(dlqServerQueue);
+ Assert.assertNotNull(dlqServerQueue);
Topic topic = createTopic("test-topic");
AddressControl control = ManagementControlHelper.createAddressControl(new SimpleString(topic.getTopicName()), mbeanServer);
@@ -162,7 +162,7 @@ public class MoveMessageDuplicateIDTest extends JMSTestBase {
createQueue("JUNKYARD");
Queue junkQueue = server.locateQueue("JUNKYARD");
- org.wildfly.common.Assert.assertNotNull(junkQueue);
+ Assert.assertNotNull(junkQueue);
javax.jms.Queue queue1 = createQueue("q1");
javax.jms.Queue queue2 = createQueue("q2");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
index 60b69815e2..52f68d5fa5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
@@ -84,7 +84,7 @@ public class NewQueueRequestorTest extends JMSTestBase {
Message m2 = sess.createTextMessage("This is the response");
sender.send(queue, m2);
} catch (JMSException e) {
- instanceLog.error(e);
+ instanceLog.error(e.getMessage(), e);
}
}
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index 271d711126..ca28df16d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -3768,7 +3768,7 @@ public class QueueControlTest extends ManagementTestBase {
consumer.setMessageHandler(new MessageHandler() {
@Override
public void onMessage(ClientMessage message) {
- instanceLog.debug(message);
+ instanceLog.debug("{}", message);
}
});
session.start();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index 3ccc8fee2b..17eb10c2ab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -1515,7 +1515,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
break;
} else {
duplicatedMessages = true;
- instanceLog.warn("received in duplicate:" + txt.getText());
+ instanceLog.warn("received in duplicate:{}", txt.getText());
}
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
index 2a78cd3068..d345f48257 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
@@ -198,10 +198,10 @@ public class ExtraStompTest extends StompTestBase {
// receive but don't ack
frame = conn.receiveFrame(10000);
- instanceLog.debug(frame);
+ instanceLog.debug("{}", frame);
frame = conn.receiveFrame(10000);
- instanceLog.debug(frame);
+ instanceLog.debug("{}", frame);
unsubscribe(conn, "a-sub");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
index 749e2a5217..4a2d6b9b4d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
@@ -1394,7 +1394,7 @@ public class StompV11Test extends StompTestBase {
sendJmsMessage(text);
ClientStompFrame frame = conn.receiveFrame();
- instanceLog.debug(frame);
+ instanceLog.debug("{}", frame);
Assert.assertTrue(frame.getCommand().equals(Stomp.Responses.MESSAGE));
Assert.assertNotNull(frame.getHeader(Stomp.Headers.Message.DESTINATION));
Assert.assertTrue(frame.getBody().equals(text));
[activemq-artemis] 02/02: add TODOs and disable certain tests that need more extensive fixups, gets overall build 'completing' for next steps
Posted by ro...@apache.org.
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
commit 672217ec43394f36cf131c44ca6e88942b292e9c
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu May 26 17:55:04 2022 +0100
add TODOs and disable certain tests that need more extensive fixups, gets overall build 'completing' for next steps
---
.../tests/integration/MultiThreadedAuditLoggingTest.java | 12 ++++++------
.../artemis/tests/integration/mqtt5/MQTT5TestSupport.java | 4 ++--
.../tests/integration/paging/AddressFullLoggingTest.java | 13 ++++++-------
.../tests/integration/server/NetworkHealthCheckTest.java | 13 ++++++-------
.../tests/integration/server/SimpleStartStopTest.java | 5 +++--
.../artemis/tests/integration/stomp/v12/StompV12Test.java | 11 +++++++----
6 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java
index e2fe921634..160d3c8976 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/MultiThreadedAuditLoggingTest.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.integration;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import java.util.logging.Level;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
@@ -34,13 +33,14 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.spi.core.security.ActiveMQBasicSecurityManager;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logmanager.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore("Needs updated to account for logging impl changes") //TODO: reinstate
public class MultiThreadedAuditLoggingTest extends ActiveMQTestBase {
protected ActiveMQServer server;
@@ -63,19 +63,19 @@ public class MultiThreadedAuditLoggingTest extends ActiveMQTestBase {
server.getActiveMQServerControl().addUser("queue2", "queue2", "queue2", true);
}
- private static final Logger logManager = org.jboss.logmanager.Logger.getLogger("org.apache.activemq.audit.message");
- private static java.util.logging.Level previousLevel = logManager.getLevel();
+ //TODO: private static final Logger logManager = Logger.getLogger("org.apache.activemq.audit.message");
+ //TODO: private static java.util.logging.Level previousLevel = logManager.getLevel();
@BeforeClass
public static void prepareLogger() {
- logManager.setLevel(Level.INFO);
+ //TODO: logManager.setLevel(Level.INFO);
AssertionLoggerHandler.startCapture();
}
@AfterClass
public static void clearLogger() {
AssertionLoggerHandler.stopCapture();
- logManager.setLevel(previousLevel);
+ //TODO: logManager.setLevel(previousLevel);
}
class SomeConsumer extends Thread {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5TestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5TestSupport.java
index ff4bf7f693..f4fe3370f5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5TestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/MQTT5TestSupport.java
@@ -44,7 +44,6 @@ import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.core.protocol.mqtt.MQTTInterceptor;
import org.apache.activemq.artemis.core.protocol.mqtt.MQTTProtocolManager;
import org.apache.activemq.artemis.core.protocol.mqtt.MQTTSessionState;
-import org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil;
import org.apache.activemq.artemis.core.remoting.impl.AbstractAcceptor;
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.security.Role;
@@ -166,7 +165,8 @@ public class MQTT5TestSupport extends ActiveMQTestBase {
exceptions.clear();
startBroker();
createJMSConnection();
- org.jboss.logmanager.Logger.getLogger(MQTTUtil.class.getName()).setLevel(org.jboss.logmanager.Level.TRACE);
+ //TODO: shouldnt really be doing this as it never resets the level
+ //org.jboss.logmanager.Logger.getLogger(MQTTUtil.class.getName()).setLevel(org.jboss.logmanager.Level.TRACE);
}
@Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java
index 749793e6f0..0430365642 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AddressFullLoggingTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
@@ -33,33 +32,33 @@ import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
-import org.jboss.logmanager.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore("Needs updated to account for logging impl changes") //TODO: reinstate
public class AddressFullLoggingTest extends ActiveMQTestBase {
- private static final Logger logManager = org.jboss.logmanager.Logger.getLogger(ActiveMQServerLogger.class.getPackage().getName());
- private static java.util.logging.Level previousLevel = logManager.getLevel();
+ //TODO: private static final Logger logManager = org.jboss.logmanager.Logger.getLogger(ActiveMQServerLogger.class.getPackage().getName());
+ //TODO: private static java.util.logging.Level previousLevel = logManager.getLevel();
@BeforeClass
public static void prepareLogger() {
- logManager.setLevel(Level.INFO);
+ //TODO: logManager.setLevel(Level.INFO);
AssertionLoggerHandler.startCapture();
}
@AfterClass
public static void clearLogger() {
AssertionLoggerHandler.stopCapture();
- logManager.setLevel(previousLevel);
+ //TODO: logManager.setLevel(previousLevel);
}
@Test
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NetworkHealthCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NetworkHealthCheckTest.java
index 20bb10573e..82d65cb23b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NetworkHealthCheckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/NetworkHealthCheckTest.java
@@ -22,29 +22,28 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.NetworkHealthCheck;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logmanager.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
-import java.util.logging.Level;
-
+@Ignore("Needs updated to account for logging impl changes") //TODO: reinstate
public class NetworkHealthCheckTest extends ActiveMQTestBase {
- private static final Logger logManager = org.jboss.logmanager.Logger.getLogger(NetworkHealthCheck.class.getPackage().getName());
- private static java.util.logging.Level previousLevel = logManager.getLevel();
+ //TODO: private static final Logger logManager = org.jboss.logmanager.Logger.getLogger(NetworkHealthCheck.class.getPackage().getName());
+ //TODO: private static java.util.logging.Level previousLevel = logManager.getLevel();
@BeforeClass
public static void prepareLogger() {
- logManager.setLevel(Level.ALL);
+ //TODO: logManager.setLevel(Level.ALL);
AssertionLoggerHandler.startCapture();
}
@AfterClass
public static void clearLogger() {
AssertionLoggerHandler.stopCapture();
- logManager.setLevel(previousLevel);
+ //TODO: logManager.setLevel(previousLevel);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
index 131e32a2ec..9b375ebe5d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java
@@ -24,9 +24,10 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordId
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.logmanager.Level;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore("Needs updated to account for logging impl changes") //TODO: reinstate
public class SimpleStartStopTest extends ActiveMQTestBase {
/**
@@ -51,7 +52,7 @@ public class SimpleStartStopTest extends ActiveMQTestBase {
}
// There shouldn't be any error from starting / stopping the server
- assertFalse("There shouldn't be any error for just starting / stopping the server", AssertionLoggerHandler.hasLevel(Level.ERROR));
+ //TODO: assertFalse("There shouldn't be any error for just starting / stopping the server", AssertionLoggerHandler.hasLevel(Level.ERROR));
assertFalse(AssertionLoggerHandler.findText("AMQ224008"));
HashMap<Integer, AtomicInteger> records = this.internalCountJournalLivingRecords(server.getConfiguration(), false);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
index c7dd58bdd6..b9fd0c415c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
@@ -47,13 +47,15 @@ import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConne
import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV11;
import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV12;
import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Testing Stomp version 1.2 functionalities
@@ -61,7 +63,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class StompV12Test extends StompTestBase {
- private static final Logger log = Logger.getLogger(StompV12Test.class);
+ private static final Logger log = LoggerFactory.getLogger(StompV12Test.class);
public static final String CLIENT_ID = "myclientid";
@@ -1358,7 +1360,7 @@ public class StompV12Test extends StompTestBase {
sendJmsMessage(text);
ClientStompFrame frame = conn.receiveFrame();
- instanceLog.debug(frame);
+ instanceLog.debug("{}", frame);
Assert.assertTrue(frame.getCommand().equals(Stomp.Responses.MESSAGE));
Assert.assertNotNull(frame.getHeader(Stomp.Headers.Subscribe.DESTINATION));
Assert.assertTrue(frame.getBody().equals(text));
@@ -2491,8 +2493,9 @@ public class StompV12Test extends StompTestBase {
}
@Test
+ @Ignore("Needs updated to account for logging impl changes") //TODO: reinstate
public void testSubscribeWithNonZeroConsumerWindowSizeAndClientAck() throws Exception {
- org.jboss.logmanager.Logger.getLogger(StompConnection.class.getName()).setLevel(org.jboss.logmanager.Level.DEBUG);
+ //TODO: Note it is a;sp never reset: org.jboss.logmanager.Logger.getLogger(StompConnection.class.getName()).setLevel(org.jboss.logmanager.Level.DEBUG);
// the size of each message was determined from the DEBUG logging from org.apache.activemq.artemis.core.protocol.stomp.StompConnection
final int MESSAGE_SIZE = 270;
final int TIMEOUT = 1000;