From commits-return-59969-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Thu Apr 23 03:09:34 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id A9948180181 for ; Thu, 23 Apr 2020 05:09:31 +0200 (CEST) Received: (qmail 33888 invoked by uid 500); 23 Apr 2020 03:09:30 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 33740 invoked by uid 99); 23 Apr 2020 03:09:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2020 03:09:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 4EA9D8B6C7; Thu, 23 Apr 2020 03:09:28 +0000 (UTC) Date: Thu, 23 Apr 2020 03:09:29 +0000 To: "commits@activemq.apache.org" Subject: [activemq-artemis] 02/04: ARTEMIS-2732 Cleanup on testsuite logging MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: clebertsuconic@apache.org In-Reply-To: <158761136709.29364.435936140586131554@gitbox.apache.org> References: <158761136709.29364.435936140586131554@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: activemq-artemis X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 3541ebf2181aa8383942d039564fc8332b639cdc X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200423030928.4EA9D8B6C7@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit 3541ebf2181aa8383942d039564fc8332b639cdc Author: Clebert Suconic AuthorDate: Tue Apr 21 17:24:14 2020 -0400 ARTEMIS-2732 Cleanup on testsuite logging --- .travis.yml | 2 +- .../activemq/artemis/utils/ByteUtilTest.java | 8 +- .../utils/DefaultSensitiveStringCodecTest.java | 9 +- .../artemis/utils/MaskPasswordResolvingTest.java | 1 - .../activemq/artemis/utils/NetworkHealthTest.java | 1 - .../apache/activemq/artemis/utils/RetryRule.java | 4 +- .../activemq/artemis/utils/URIParserTest.java | 5 - .../utils/critical/CriticalAnalyzerTest.java | 4 - .../api/core/TransportConfigurationTest.java | 2 - .../activemq/artemis/message/CoreMessageTest.java | 7 +- .../util/TimeAndCounterIDGeneratorTest.java | 4 - .../artemis/core/io/aio/FileIOUtilTest.java | 3 - .../integration/EmbeddedRestActiveMQJMSTest.java | 8 +- .../artemis/rest/test/AutoAckQueueTest.java | 22 ++-- .../artemis/rest/test/AutoAckTopicTest.java | 10 +- .../artemis/rest/test/ClientAckQueueTest.java | 94 +++++++------- .../artemis/rest/test/ClientAckTopicTest.java | 79 ++++++------ .../artemis/rest/test/CreateDestinationTest.java | 22 ++-- .../activemq/artemis/rest/test/DupQueueTest.java | 32 ++--- .../activemq/artemis/rest/test/Embedded.java | 8 +- .../activemq/artemis/rest/test/EmbeddedTest.java | 8 +- .../artemis/rest/test/EmbeddedTestServer.java | 8 +- .../artemis/rest/test/FindDestinationTest.java | 12 +- .../apache/activemq/artemis/rest/test/JMSTest.java | 18 +-- .../artemis/rest/test/MessagePropertiesTest.java | 5 +- .../artemis/rest/test/MessageTestBase.java | 2 +- .../rest/test/PersistentPushQueueConsumerTest.java | 15 ++- .../rest/test/PersistentPushTopicConsumerTest.java | 14 ++- .../artemis/rest/test/PushQueueConsumerTest.java | 12 +- .../artemis/rest/test/PushTopicConsumerTest.java | 23 ++-- .../activemq/artemis/rest/test/RawAckTest.java | 4 +- .../artemis/rest/test/RepostingQueueTest.java | 122 +++++++++--------- .../artemis/rest/test/RepostingTopicTest.java | 140 +++++++++++---------- .../artemis/rest/test/RoundtripTimeTest.java | 10 +- .../activemq/artemis/rest/test/SelectorTest.java | 14 ++- .../activemq/artemis/rest/test/SessionTest.java | 26 ++-- .../activemq/artemis/rest/test/TransformTest.java | 16 +-- .../apache/activemq/artemis/rest/test/XmlTest.java | 4 +- .../artemis/rest/topic/RepostingTopicTest.java | 140 +++++++++++---------- .../artemis/selector/SelectorParserTest.java | 5 +- .../core/config/impl/ConfigurationImplTest.java | 7 +- .../LoggingConfigurationFileReloaderTest.java | 95 +++++++------- .../security/jaas/JAASSecurityManagerTest.java | 4 +- .../core/server/files/FileStoreMonitorTest.java | 11 +- .../server/impl/ScheduledDeliveryHandlerTest.java | 5 +- .../core/transaction/impl/TransactionImplTest.java | 10 +- .../artemis/tests/util/ActiveMQTestBase.java | 34 ++--- .../activemq/artemis/uri/AcceptorParserTest.java | 8 +- pom.xml | 11 +- .../verifyTopologyChangeMessage.groovy | 2 - .../main/resources/hqsoak/receiveMessages.groovy | 2 - .../src/main/resources/hqsoak/sendMessages.groovy | 3 - .../jmsReplyToQueue/receiveMessages.groovy | 2 - .../jmsReplyToQueue/sendMessagesAddress.groovy | 3 - .../jmsReplyToTempQueue/receiveMessages.groovy | 2 - .../jmsReplyToTempQueue/sendMessagesAddress.groovy | 3 - .../jmsReplyToTempTopic/receiveMessages.groovy | 2 - .../jmsReplyToTempTopic/sendMessagesAddress.groovy | 5 - .../jmsReplyToTopic/receiveMessages.groovy | 2 - .../jmsReplyToTopic/sendMessagesAddress.groovy | 3 - .../tests/compatibility/HornetQSoakTest.java | 1 - .../{logging.properties => logging-CI.properties} | 36 +++--- tests/config/logging.properties | 25 ++-- .../tests/extras/byteman/BMFailoverTest.java | 6 +- .../byteman/ConcurrentDeliveryCancelTest.java | 24 ++-- .../extras/byteman/FileLockNodeManagerTest.java | 4 +- .../artemis/tests/extras/byteman/GroupingTest.java | 6 +- .../byteman/LargeMessageReplicationTest.java | 5 +- .../artemis/tests/extras/byteman/LatencyTest.java | 2 +- .../LoggingActiveMQServerPluginOpenWireTest.java | 6 +- .../byteman/ManagementExceptionHandlingTest.java | 4 +- .../tests/extras/byteman/OrphanedConsumerTest.java | 4 +- .../tests/extras/byteman/PagingLeakTest.java | 10 +- ...RaceOnSyncLargeMessageOverReplication2Test.java | 6 +- .../RaceOnSyncLargeMessageOverReplicationTest.java | 6 +- .../extras/byteman/ScaleDownFailoverTest.java | 4 +- .../extras/byteman/StartStopDeadlockTest.java | 6 +- .../analyzer/FileSystemSyncBlockedTest.java | 4 +- .../tests/extras/jms/bridge/BridgeTestBase.java | 5 - .../jms/bridge/FailingTransactionManager.java | 4 - .../extras/jms/bridge/JMSBridgeClusteredTest.java | 4 +- .../jms/bridge/JMSBridgeReconnectionTest.java | 40 +++--- .../tests/extras/jms/bridge/JMSBridgeTest.java | 52 ++++---- .../MDBMultipleHandlersServerDisconnectTest.java | 19 ++- .../tests/integration/DuplicateDetectionTest.java | 29 ++--- .../tests/integration/IntegrationTestLogger.java | 30 ----- .../integration/SimpleNotificationService.java | 1 - .../tests/integration/addressing/AnycastTest.java | 6 +- .../integration/addressing/MulticastTest.java | 6 +- .../integration/amqp/AmqpDLQReceiverTest.java | 16 +-- .../integration/amqp/AmqpDurableReceiverTest.java | 2 +- .../integration/amqp/AmqpFlowControlTest.java | 1 - .../amqp/AmqpFullyQualifiedNameTest.java | 4 +- .../amqp/AmqpInboundConnectionTest.java | 2 +- .../integration/amqp/AmqpLargeMessageTest.java | 12 +- .../amqp/AmqpPresettledReceiverTest.java | 12 +- .../amqp/AmqpProtocolHeaderHandlingTest.java | 3 - .../integration/amqp/AmqpReceiverDrainTest.java | 3 +- .../tests/integration/amqp/AmqpReceiverTest.java | 3 - .../amqp/AmqpReceiverWithFiltersTest.java | 2 +- .../tests/integration/amqp/AmqpSecurityTest.java | 7 +- .../integration/amqp/AmqpSendReceiveTest.java | 40 +++--- .../tests/integration/amqp/AmqpSenderTest.java | 8 -- .../tests/integration/amqp/AmqpSessionTest.java | 3 +- .../integration/amqp/AmqpTempDestinationTest.java | 4 +- .../integration/amqp/AmqpTransactionTest.java | 24 ++-- .../amqp/JMSConnectionWithSecurityTest.java | 26 ++-- .../integration/amqp/JMSMessageConsumerTest.java | 16 +-- .../integration/amqp/JMSMessageTypesTest.java | 22 ++-- .../amqp/JMSTemporaryDestinationTest.java | 4 +- .../tests/integration/amqp/JMSTransactionTest.java | 6 +- .../integration/amqp/QueueAutoCreationTest.java | 8 +- .../integration/amqp/SaslKrb5LDAPSecurityTest.java | 7 +- .../tests/integration/amqp/TopicDurableTests.java | 26 ++-- .../integration/amqp/interop/AmqpCoreTest.java | 6 +- .../largemessages/InterruptedAMQPLargeMessage.java | 4 +- .../tests/integration/cli/AddressCommandTest.java | 8 +- .../tests/integration/cli/QueueCommandTest.java | 4 +- .../tests/integration/client/AckBatchSizeTest.java | 2 +- .../tests/integration/client/AcknowledgeTest.java | 7 +- .../integration/client/ActiveMQCrashTest.java | 8 +- .../client/AutoCreateJmsDestinationTest.java | 7 +- .../tests/integration/client/AutogroupIdTest.java | 6 - .../tests/integration/client/BlockingSendTest.java | 2 +- .../integration/client/ConsumerFilterTest.java | 12 +- .../integration/client/ConsumerRoundRobinTest.java | 8 +- .../integration/client/ConsumerStuckTest.java | 18 +-- .../tests/integration/client/ConsumerTest.java | 16 +-- .../integration/client/ConsumerWindowSizeTest.java | 20 +-- .../tests/integration/client/CoreClientTest.java | 5 - .../integration/client/DeadLetterAddressTest.java | 5 - .../client/ExpireTestOnRestartTest.java | 2 +- .../integration/client/ExpiryAddressTest.java | 5 - .../integration/client/ExpiryLargeMessageTest.java | 10 +- .../integration/client/FailureDeadlockTest.java | 6 +- .../FlowControlOnIgnoreLargeMessageBodyTest.java | 30 ++--- .../integration/client/FullQualifiedQueueTest.java | 12 +- .../tests/integration/client/HangConsumerTest.java | 6 +- .../tests/integration/client/HeuristicXATest.java | 16 +-- .../client/IncompatibleVersionTest.java | 9 +- .../client/InterruptedLargeMessageTest.java | 22 ++-- .../integration/client/JMSMessageCounterTest.java | 4 +- .../tests/integration/client/JMSOrderTest.java | 2 - .../client/JMSPagingFileDeleteTest.java | 27 ++-- .../integration/client/JmsNettyNioStressTest.java | 2 - .../client/LargeMessageCompressTest.java | 2 - .../tests/integration/client/LargeMessageTest.java | 11 +- .../integration/client/MessageConcurrencyTest.java | 4 +- .../client/MessageConsumerRollbackTest.java | 1 - .../integration/client/MessageGroupingTest.java | 7 +- .../integration/client/MessageHandlerTest.java | 5 - .../integration/client/MessagePriorityTest.java | 6 +- .../tests/integration/client/MixRoutingTest.java | 4 +- .../client/MultipleThreadFilterOneTest.java | 2 +- .../tests/integration/client/NIOvsOIOTest.java | 8 +- .../client/ProducerFlowControlTest.java | 7 +- .../tests/integration/client/ProducerTest.java | 2 +- .../integration/client/RedeliveryConsumerTest.java | 7 +- .../tests/integration/client/RequestorTest.java | 3 - .../client/SelfExpandingBufferTest.java | 11 +- .../tests/integration/client/SendAckFailTest.java | 8 +- .../integration/client/SessionStopStartTest.java | 10 +- .../client/SimpleSendMultipleQueuesTest.java | 4 +- .../integration/client/TemporaryQueueTest.java | 9 +- .../integration/clientcrash/ClientCrashTest.java | 10 +- .../integration/clientcrash/ClientExitTest.java | 4 +- .../tests/integration/clientcrash/CrashClient.java | 10 +- .../integration/clientcrash/CrashClient2.java | 9 +- .../integration/clientcrash/DummyInterceptor.java | 4 +- .../integration/clientcrash/DummyInterceptorB.java | 4 +- .../integration/clientcrash/GracefulClient.java | 6 +- .../clientcrash/PendingDeliveriesTest.java | 1 - .../integration/cluster/NodeManagerAction.java | 1 - .../cluster/bridge/BridgeReconnectTest.java | 28 ++--- .../cluster/bridge/BridgeStartTest.java | 17 --- .../integration/cluster/bridge/BridgeTest.java | 18 ++- .../ProtocolsMessageLoadBalancingTest.java | 4 +- .../distribution/AutoDeleteDistributedTest.java | 13 +- .../distribution/ClusterConnectionConfigTest.java | 2 - .../cluster/distribution/ClusterTestBase.java | 42 +++---- .../distribution/ClusterWithBackupTest.java | 49 +++----- .../distribution/ClusteredGroupingTest.java | 41 +++--- .../distribution/ClusteredMessageCounterTest.java | 10 -- .../ExclusiveDivertWithClusterTest.java | 3 - .../LargeMessageRedistributionTest.java | 3 - .../distribution/MessageRedistributionTest.java | 21 ++-- .../NettyFileStorageSymmetricClusterTest.java | 4 - ...leStorageSymmetricClusterWithDiscoveryTest.java | 3 - .../distribution/OneWayChainClusterTest.java | 37 +++--- .../distribution/OnewayTwoNodeClusterTest.java | 10 +- .../RemoteBindingWithoutLoadBalancingTest.java | 3 - .../distribution/SimpleSymmetricClusterTest.java | 25 ++-- .../cluster/distribution/SymmetricClusterTest.java | 26 ++-- .../SymmetricClusterWithBackupTest.java | 11 -- .../SymmetricClusterWithDiscoveryTest.java | 3 - .../distribution/TwoWayTwoNodeClusterTest.java | 16 +-- .../cluster/distribution/URISimpleClusterTest.java | 3 - .../cluster/failover/AsynchronousFailoverTest.java | 40 +++--- .../CheckRetryIntervalBackupManagerTest.java | 4 +- .../failover/ClusterWithBackupFailoverTest.java | 8 +- .../ClusterWithBackupFailoverTestBase.java | 7 +- .../cluster/failover/FailBackAutoTest.java | 19 +-- .../cluster/failover/FailoverListenerTest.java | 12 +- .../failover/FailoverOnFlowControlTest.java | 5 +- .../integration/cluster/failover/FailoverTest.java | 34 +++-- .../failover/MultipleBackupsFailoverTestBase.java | 5 +- .../MultipleLivesMultipleBackupsFailoverTest.java | 2 +- .../failover/NettyAsynchronousReattachTest.java | 3 - .../cluster/failover/NettyReplicationStopTest.java | 4 - .../failover/NetworkFailureFailoverTest.java | 32 ++--- .../cluster/failover/PagingFailoverTest.java | 1 - .../failover/ReplicatedDistributionTest.java | 2 +- .../failover/ReplicatedPagedFailoverTest.java | 2 - .../cluster/failover/SharedStoreBackupTest.java | 2 - .../SingleLiveMultipleBackupsFailoverTest.java | 21 +--- .../MultiThreadRandomReattachTestBase.java | 20 +-- .../MultiThreadReattachSupportTestBase.java | 11 +- .../cluster/reattach/OrderReattachTest.java | 5 +- .../cluster/reattach/RandomReattachTest.java | 31 +++-- .../integration/cluster/reattach/ReattachTest.java | 9 +- .../cluster/restart/ClusterRestartTest.java | 22 ++-- .../cluster/topology/TopologyClusterTestBase.java | 7 +- .../integration/critical/CriticalCrashTest.java | 2 - .../ShutdownOnCriticalIOErrorMoveNextTest.java | 2 - .../crossprotocol/AMQPToJMSCoreTest.java | 1 - .../crossprotocol/MessageIDMultiProtocolTest.java | 4 +- .../RequestReplyMultiProtocolTest.java | 4 +- .../integration/discovery/DiscoveryBaseTest.java | 2 - .../tests/integration/discovery/DiscoveryTest.java | 4 +- .../tests/integration/divert/DivertTest.java | 4 +- .../divert/ReplicationWithDivertTest.java | 2 - .../tests/integration/interceptors/Incoming.java | 1 - .../integration/interceptors/InterceptorTest.java | 10 +- .../tests/integration/interceptors/Outgoing.java | 5 +- .../jms/ActiveMQConnectionFactoryTest.java | 6 - .../tests/integration/jms/FloodServerTest.java | 14 +-- .../jms/ManualReconnectionToSingleServerTest.java | 12 +- .../integration/jms/client/CreateQueueTest.java | 5 +- .../tests/integration/jms/client/GroupingTest.java | 1 - .../tests/integration/jms/client/MessageTest.java | 15 +-- .../jms/client/NewQueueRequestorTest.java | 6 +- .../jms/client/NoLocalSubscriberTest.java | 6 - ...ssionClosedOnRemotingConnectionFailureTest.java | 3 - .../jms/cluster/JMSFailoverListenerTest.java | 11 +- .../integration/jms/cluster/JMSFailoverTest.java | 15 +-- .../jms/cluster/MultipleThreadsOpeningTest.java | 4 +- .../jms/cluster/TemporaryQueueClusterTest.java | 6 - .../integration/jms/cluster/TopicClusterTest.java | 1 - .../integration/jms/consumer/JmsConsumerTest.java | 13 +- .../jms/jms2client/InvalidDestinationTest.java | 1 - .../integration/jms/jms2client/JmsContextTest.java | 3 - .../jms/jms2client/SharedConsumerTest.java | 2 - .../jms/largemessage/JMSLargeMessageTest.java | 8 +- .../jms/server/JMSServerDeployerTest.java | 4 +- .../jms/server/JMSServerStartStopTest.java | 5 +- .../integration/jms/server/management/JMSUtil.java | 1 - .../integration/journal/NIOJournalCompactTest.java | 28 ++--- .../integration/journal/NIOJournalImplTest.java | 5 - .../journal/NIONoBufferJournalImplTest.java | 5 - .../integration/journal/RelativePathTest.java | 4 - .../journal/ValidateTransactionHealthTest.java | 11 +- .../integration/karaf/ArtemisFeatureTest.java | 10 +- .../largemessage/LargeMessageTestBase.java | 5 +- .../management/ActiveMQServerControlTest.java | 18 ++- .../integration/management/AddressControlTest.java | 2 - .../integration/management/DummyLoginModule.java | 1 - .../management/ManagementHelperTest.java | 10 +- .../management/ManagementWithPagingServerTest.java | 4 - .../integration/management/NotificationTest.java | 14 --- .../integration/management/QueueControlTest.java | 16 +-- .../management/SSLSecurityNotificationTest.java | 10 -- .../management/SecurityNotificationTest.java | 10 -- .../imported/MQTTInterceptorPropertiesTest.java | 3 - .../imported/MQTTRejectingInterceptorTest.java | 1 - .../tests/integration/mqtt/imported/MQTTTest.java | 36 +++--- .../integration/mqtt/imported/MQTTTestSupport.java | 16 ++- .../integration/mqtt/imported/PahoMQTTTest.java | 10 +- .../integration/openwire/BasicOpenWireTest.java | 4 - .../integration/openwire/DisableAdvisoryTest.java | 4 - .../integration/openwire/FQQNOpenWireTest.java | 3 +- .../LargeMessageQueueAutoCreationTest.java | 1 - .../openwire/OpenWireDivertExclusiveTest.java | 2 - .../openwire/OpenWireDivertNonExclusiveTest.java | 2 - .../integration/openwire/OpenWireTestBase.java | 1 - .../integration/openwire/SecurityOpenWireTest.java | 1 - .../integration/openwire/SimpleOpenWireTest.java | 60 +-------- .../openwire/amq/JMSConsumer11Test.java | 9 -- .../integration/openwire/amq/JMSConsumer2Test.java | 5 - .../integration/openwire/amq/JMSConsumer3Test.java | 2 - .../integration/openwire/amq/JMSConsumer5Test.java | 3 - .../integration/openwire/amq/JMSConsumer7Test.java | 3 - .../openwire/amq/JMSDurableTopicRedeliverTest.java | 3 - .../integration/openwire/amq/JMSUsecase1Test.java | 1 - .../openwire/amq/JmsAutoAckListenerTest.java | 1 - .../amq/JmsCreateConsumerInOnMessageTest.java | 2 - .../amq/JmsDurableTopicSendReceiveTest.java | 1 - .../openwire/amq/JmsQueueBrowserTest.java | 12 -- .../openwire/amq/JmsResourceProvider.java | 1 - .../openwire/amq/JmsSendReceiveTestSupport.java | 10 -- .../openwire/amq/JmsTopicRedeliverTest.java | 15 --- .../openwire/amq/JmsTopicRequestReplyTest.java | 16 --- .../openwire/amq/JmsTopicSelectorTest.java | 8 -- .../openwire/amq/JmsTopicSendReceiveTest.java | 11 +- .../openwire/amq/JmsTransactionTestSupport.java | 32 ----- .../amq/MessageListenerRedeliveryTest.java | 9 -- .../amq/ProducerFlowControlSendFailTest.java | 1 - .../openwire/amq/ProducerFlowControlTest.java | 2 - .../openwire/amq/RedeliveryPolicyTest.java | 4 - .../cluster/MessageRedistributionTest.java | 1 - .../cluster/TemporaryQueueClusterTest.java | 5 - .../openwire/interop/GeneralInteropTest.java | 6 - .../management/OpenWireManagementTest.java | 1 - .../integration/paging/AddressFullLoggingTest.java | 17 ++- .../tests/integration/paging/PagingTest.java | 91 +++++--------- .../paging/PagingWithFailoverAndCountersTest.java | 10 +- .../paging/TestDeadlockOnPurgePagingTest.java | 3 - .../integration/persistence/RestartSMTest.java | 4 +- .../tests/integration/plugin/StompPluginTest.java | 3 - .../integration/ra/ActiveMQMessageHandlerTest.java | 3 +- .../tests/integration/ra/ResourceAdapterTest.java | 1 - .../remoting/NetworkAddressTestBase.java | 3 - .../tests/integration/remoting/PingTest.java | 12 +- .../tests/integration/remoting/ReconnectTest.java | 1 - .../integration/rest/RestDeserializationTest.java | 1 - .../integration/scheduling/DelayedMessageTest.java | 5 - .../scheduling/MultipliedDelayedMessageTest.java | 8 +- .../scheduling/ScheduledMessageTest.java | 5 - .../security/NettySecurityClientTest.java | 4 - .../tests/integration/security/SecurityTest.java | 3 - .../tests/integration/security/SimpleClient.java | 1 - .../server/AddressQueueDeleteDelayTest.java | 8 +- .../integration/server/FileLockTimeoutTest.java | 3 +- .../artemis/tests/integration/server/LVQTest.java | 2 +- .../integration/server/PredefinedQueueTest.java | 9 +- .../server/RetroactiveAddressFailoverTest.java | 3 - .../integration/server/ScaleDown3NodeTest.java | 24 ++-- .../integration/server/ScaleDownDirectTest.java | 2 - .../integration/server/ScaleDownRemoveSFTest.java | 2 +- .../integration/server/SimpleStartStopTest.java | 4 - .../integration/spring/SpringIntegrationTest.java | 5 - .../ssl/CoreClientOverOneWaySSLTest.java | 2 - .../ssl/CoreClientOverTwoWayOpenSSLServerTest.java | 1 - .../ssl/CoreClientOverTwoWayOpenSSLTest.java | 1 - .../ssl/CoreClientOverTwoWaySSLTest.java | 1 - .../tests/integration/ssl/SSLProviderTest.java | 2 - .../integration/ssl/SSLProviderTwoWayTest.java | 7 +- .../artemis/tests/integration/ssl/SSLTestBase.java | 1 - .../tests/integration/stomp/FQQNStompTest.java | 5 +- .../stomp/StompPropertiesInterceptorTest.java | 1 - .../artemis/tests/integration/stomp/StompTest.java | 4 +- .../tests/integration/stomp/StompTestBase.java | 6 +- .../integration/stomp/StompTestMultiThreaded.java | 2 - .../stomp/StompWithLargeMessagesTest.java | 9 +- .../stomp/util/AbstractStompClientConnection.java | 4 - .../stomp/util/StompClientConnectionV10.java | 5 +- .../integration/stomp/v11/ExtraStompTest.java | 4 +- .../tests/integration/stomp/v11/StompV11Test.java | 68 +++++----- .../tests/integration/stomp/v12/StompV12Test.java | 55 ++++---- .../tests/integration/xa/BasicXaRecoveryTest.java | 14 +-- .../artemis/tests/integration/xa/BasicXaTest.java | 10 +- .../tests/integration/xa/SessionFailureXATest.java | 3 - .../tests/integration/xa/XaTimeoutTest.java | 2 +- .../artemis/tests/util/JMSClusteredTestBase.java | 3 - 363 files changed, 1619 insertions(+), 2376 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6839d8c..7f9fad6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: # By setting anything to org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED we are disabling libaio loading on the testsuite script: - set -e -- mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Pfast-tests -Pextra-tests -B install -q +- mvn -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Pfast-tests -Pextra-tests -Ptests-CI -B install -q - cd examples - mvn install -Prelease install -B -q diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java index 929ccf8..f95d227 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java @@ -21,6 +21,7 @@ import java.nio.ReadOnlyBufferException; import java.util.Arrays; import io.netty.util.internal.PlatformDependent; +import org.jboss.logging.Logger; import org.junit.Assert; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -30,6 +31,8 @@ import org.junit.Test; public class ByteUtilTest { + private static Logger log = Logger.getLogger(ByteUtilTest.class); + @Test public void testBytesToString() { byte[] byteArray = new byte[]{0, 1, 2, 3}; @@ -43,14 +46,13 @@ public class ByteUtilTest { public void testNonASCII() { assertEquals("aA", ByteUtil.toSimpleString(new byte[]{97, 0, 65, 0})); assertEquals(ByteUtil.NON_ASCII_STRING, ByteUtil.toSimpleString(new byte[]{0, 97, 0, 65})); - - System.out.println(ByteUtil.toSimpleString(new byte[]{0, 97, 0, 65})); + log.debug(ByteUtil.toSimpleString(new byte[]{0, 97, 0, 65})); } @Test public void testMaxString() { byte[] byteArray = new byte[20 * 1024]; - System.out.println(ByteUtil.maxString(ByteUtil.bytesToHex(byteArray, 2), 150)); + log.debug(ByteUtil.maxString(ByteUtil.bytesToHex(byteArray, 2), 150)); } void testEquals(String string1, String string2) { diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java index 393558d..9a97454 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.artemis.utils; +import org.jboss.logging.Logger; import org.junit.Test; import java.util.HashMap; @@ -28,6 +29,8 @@ import static org.junit.Assert.fail; public class DefaultSensitiveStringCodecTest { + private static final Logger log = Logger.getLogger(DefaultSensitiveStringCodecTest.class); + @Test public void testDefaultAlgorithm() throws Exception { SensitiveDataCodec codec = PasswordMaskingUtil.getDefaultCodec(); @@ -43,7 +46,7 @@ public class DefaultSensitiveStringCodecTest { String plainText = "some_password"; String maskedText = codec.encode(plainText); - System.out.println("encoded value: " + maskedText); + log.debug("encoded value: " + maskedText); //one way can't decode try { @@ -67,10 +70,10 @@ public class DefaultSensitiveStringCodecTest { String plainText = "some_password"; String maskedText = codec.encode(plainText); - System.out.println("encoded value: " + maskedText); + log.debug("encoded value: " + maskedText); String decoded = codec.decode(maskedText); - System.out.println("encoded value: " + maskedText); + log.debug("encoded value: " + maskedText); assertEquals("decoded result not match: " + decoded, decoded, plainText); } diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/MaskPasswordResolvingTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/MaskPasswordResolvingTest.java index 5a99ccc..ba688fc 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/MaskPasswordResolvingTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/MaskPasswordResolvingTest.java @@ -61,7 +61,6 @@ public class MaskPasswordResolvingTest { @Test public void testPasswordResolving() throws Exception { String resolved = PasswordMaskingUtil.resolveMask(maskPassword, password, codec); - System.out.println("resolved: " + resolved); checkResult(resolved); } diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java index 221a97c..156eb24 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/NetworkHealthTest.java @@ -152,7 +152,6 @@ public class NetworkHealthTest { public void run() { super.run(); latch.countDown(); - System.out.println("Check"); } }); check.addComponent(component); diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/RetryRule.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/RetryRule.java index 6792b5a..50c1073 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/RetryRule.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/RetryRule.java @@ -79,10 +79,10 @@ public class RetryRule implements MethodRule { currentException = null; try { base.evaluate(); - logger.info("RETRY " + (retryNr + 1) + " of " + retries + " on " + target.getClass() + "::" + method.getName() + " succeeded"); + logger.warn("RETRY " + (retryNr + 1) + " of " + retries + " on " + target.getClass() + "::" + method.getName() + " succeeded"); break; } catch (Throwable t2) { - logger.info("RETRY " + (retryNr + 1) + " of " + retries + " on " + target.getClass() + "::" + method.getName() + " failed ", t2); + logger.warn("RETRY " + (retryNr + 1) + " of " + retries + " on " + target.getClass() + "::" + method.getName() + " failed ", t2); currentException = t2; } } diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java index 74a39fa..4316c9e 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/URIParserTest.java @@ -94,7 +94,6 @@ public class URIParserTest { FruitParser parser = new FruitParser(); Fruit fruit = (Fruit) parser.newObject(new URI("fruit://some:guy@port?color=green&fluentName=something"), null); - System.out.println("fruit:" + fruit); Assert.assertEquals("fruit", fruit.getName()); Assert.assertEquals("green", fruit.getColor()); Assert.assertEquals("something", fruit.getFluentName()); @@ -104,22 +103,18 @@ public class URIParserTest { public void testQueryConversion() throws Exception { Map query = new HashMap<>(); String queryString = URISupport.createQueryString(query); - System.out.println("queryString1: " + queryString); Assert.assertTrue(queryString.isEmpty()); query.put("key1", "value1"); queryString = URISupport.createQueryString(query); - System.out.println("queryString2: " + queryString); Assert.assertEquals("key1=value1", queryString); query.put("key3", "value3"); queryString = URISupport.createQueryString(query); - System.out.println("queryString3: " + queryString); Assert.assertEquals("key1=value1&key3=value3", queryString); query.put("key2", "value2"); queryString = URISupport.createQueryString(query); - System.out.println("queryString4: " + queryString); Assert.assertEquals("key1=value1&key2=value2&key3=value3", queryString); } diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerTest.java index 96d9f27..a20f55a 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerTest.java @@ -56,7 +56,6 @@ public class CriticalAnalyzerTest { analyzer.start(); analyzer.addAction((CriticalComponent comp) -> { - System.out.println("component " + comp + " received"); latch.countDown(); }); @@ -72,7 +71,6 @@ public class CriticalAnalyzerTest { analyzer = new CriticalAnalyzerImpl().setTimeout(10, TimeUnit.MILLISECONDS).setCheckTime(5, TimeUnit.MILLISECONDS); analyzer.addAction((CriticalComponent comp) -> { - System.out.println("component " + comp + " received"); latch.countDown(); }); @@ -119,7 +117,6 @@ public class CriticalAnalyzerTest { analyzer = new CriticalAnalyzerImpl().setTimeout(10, TimeUnit.MILLISECONDS).setCheckTime(5, TimeUnit.MILLISECONDS); analyzer.addAction((CriticalComponent comp) -> { - System.out.println("component " + comp + " received"); latch.countDown(); }); @@ -143,7 +140,6 @@ public class CriticalAnalyzerTest { analyzer = new CriticalAnalyzerImpl().setTimeout(10, TimeUnit.MILLISECONDS).setCheckTime(5, TimeUnit.MILLISECONDS); analyzer.addAction((CriticalComponent comp) -> { - System.out.println("component " + comp + " received"); latch.countDown(); }); diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java index 1b7a479..b97cd7d 100644 --- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/TransportConfigurationTest.java @@ -41,13 +41,11 @@ public class TransportConfigurationTest { HashMap configMap2 = new HashMap<>(); configMap2.put("host", "localhost"); - System.out.println("Equals::" + configMap1.equals(configMap2)); configuration = new TransportConfiguration("SomeClass", configMap1, null); configuration2 = new TransportConfiguration("SomeClass", configMap2, null); Assert.assertEquals(configuration, configuration2); Assert.assertEquals(configuration.hashCode(), configuration2.hashCode()); - System.out.println("Equals::" + configMap1.equals(configMap2)); configuration = new TransportConfiguration("SomeClass", configMap1, "name1"); configuration2 = new TransportConfiguration("SomeClass", configMap2, "name2"); Assert.assertNotEquals(configuration, configuration2); diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java index 5ba2a5b..0735e1e 100644 --- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java @@ -31,7 +31,6 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRec import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; import org.apache.activemq.artemis.reader.TextMessageUtil; import org.apache.activemq.artemis.utils.Base64; -import org.apache.activemq.artemis.utils.ByteUtil; import org.apache.activemq.artemis.utils.UUID; import org.junit.Assert; import org.junit.Before; @@ -104,7 +103,7 @@ public class CoreMessageTest { ActiveMQBuffer buffer = sendMessage.encode(null); byte[] byteArray = buffer.byteBuf().array(); - System.out.println("Sending " + ByteUtil.bytesToHex(buffer.toByteBuffer().array(), 1) + ", bytes = " + byteArray.length); + //System.out.println("Sending " + ByteUtil.bytesToHex(buffer.toByteBuffer().array(), 1) + ", bytes = " + byteArray.length); buffer.readerIndex(5); @@ -215,9 +214,7 @@ public class CoreMessageTest { @Test public void testSaveReceiveLimitedBytes() { CoreMessage empty = new CoreMessage().initBuffer(100); - System.out.println("R " + empty.getBodyBuffer().readerIndex() + " W " + empty.getBodyBuffer().writerIndex()); empty.getBodyBuffer().writeByte((byte)7); - System.out.println("R " + empty.getBodyBuffer().readerIndex() + " W " + empty.getBodyBuffer().writerIndex()); ByteBuf buffer = Unpooled.buffer(200); empty.sendBuffer(buffer, 0); @@ -227,8 +224,6 @@ public class CoreMessageTest { Assert.assertEquals((byte)7, empty2.getBodyBuffer().readByte()); - System.out.println("Readable :: " + empty2.getBodyBuffer().readerIndex() + " writer :" + empty2.getBodyBuffer().writerIndex()); - try { empty2.getBodyBuffer().readByte(); Assert.fail("should throw exception"); diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java index 812cafc..cd55e92 100644 --- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java +++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java @@ -77,8 +77,6 @@ public class TimeAndCounterIDGeneratorTest extends Assert { final TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator(); - System.out.println("Time = " + TimeAndCounterIDGeneratorTest.hex(System.currentTimeMillis()) + ", " + seq); - final int NUMBER_OF_THREADS = 100; final int NUMBER_OF_IDS = 10; @@ -143,8 +141,6 @@ public class TimeAndCounterIDGeneratorTest extends Assert { public void testWrapID() throws Throwable { TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator(); - System.out.println("Current Time = " + TimeAndCounterIDGeneratorTest.hex(System.currentTimeMillis()) + " " + seq); - seq.setInternalDate(System.currentTimeMillis() + 10000L); // 10 seconds in the future seq.setInternalID(TimeAndCounterIDGenerator.ID_MASK); // 1 ID about to explode diff --git a/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java b/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java index 4c8aba4..981d119 100644 --- a/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java +++ b/artemis-journal/src/test/java/org/apache/activemq/artemis/core/io/aio/FileIOUtilTest.java @@ -42,7 +42,6 @@ public class FileIOUtilTest { @Test public void testCopy() throws Exception { - System.out.println("Data at " + temporaryFolder.getRoot()); SequentialFileFactory factory = new NIOSequentialFileFactory(temporaryFolder.getRoot(), 100); SequentialFile file = factory.createSequentialFile("file1.bin"); file.open(); @@ -78,8 +77,6 @@ public class FileIOUtilTest { file.close(); file2.close(); - System.out.println("Test result::"); - } } diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMSTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMSTest.java index 88ac35f..dfea8b9 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMSTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMSTest.java @@ -31,6 +31,7 @@ import org.apache.activemq.artemis.rest.test.TransformTest; import org.apache.activemq.artemis.rest.test.Util; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -43,6 +44,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; public class EmbeddedRestActiveMQJMSTest { + private static final Logger log = Logger.getLogger(EmbeddedRestActiveMQJMSTest.class); private static EmbeddedRestActiveMQ server; private static ConnectionFactory factory; @@ -67,12 +69,12 @@ public class EmbeddedRestActiveMQJMSTest { response.releaseConnection(); assertEquals(200, response.getStatus()); Link sender = response.getLinkHeader().getLinkByTitle("create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = response.getLinkHeader().getLinkByTitle("pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); consumeNext = response.getLinkHeader().getLinkByTitle("consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); } @AfterClass diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java index e7ef1fd..10bbeff 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckQueueTest.java @@ -18,6 +18,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -26,6 +27,7 @@ import org.junit.Assert; import org.junit.Test; public class AutoAckQueueTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(AutoAckQueueTest.class); @Test public void testSuccessFirst() throws Exception { @@ -42,18 +44,18 @@ public class AutoAckQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); - System.out.println("create-with-id: " + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id")); + log.debug("pull: " + consumers); + log.debug("create-with-id: " + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id")); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println("create-next: " + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next")); + log.debug("create-next: " + getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "create-next")); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); @@ -64,19 +66,19 @@ public class AutoAckQueueTest extends MessageTestBase { Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); - System.out.println(consumeNext); + log.debug(consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = session.request().delete(); res.releaseConnection(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java index 1635a44..91012b0 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/AutoAckTopicTest.java @@ -17,6 +17,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -25,6 +26,7 @@ import org.junit.Assert; import org.junit.Test; public class AutoAckTopicTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(AutoAckTopicTest.class); @Test public void testSuccessFirst() throws Exception { @@ -50,7 +52,7 @@ public class AutoAckTopicTest extends MessageTestBase { Assert.assertNotNull(sub1); Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); - System.out.println("consumeNext1: " + consumeNext1); + log.debug("consumeNext1: " + consumeNext1); res = subscriptions.request().post(); res.releaseConnection(); @@ -59,7 +61,7 @@ public class AutoAckTopicTest extends MessageTestBase { Assert.assertNotNull(sub2); Link consumeNext2 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext2); - System.out.println("consumeNext2: " + consumeNext2); + log.debug("consumeNext2: " + consumeNext2); res = sender.request().body("text/plain", "1").post(); res.releaseConnection(); @@ -169,11 +171,11 @@ public class AutoAckTopicTest extends MessageTestBase { ClientRequest request = new ClientRequest(url); ClientResponse response = request.post(); response.releaseConnection(); - System.out.println("NPS response: " + response.getStatus()); + log.debug("NPS response: " + response.getStatus()); Assert.assertEquals(201, response.getStatus()); isFinished = true; } catch (Exception e) { - System.out.println("Exception " + e); + log.debug("Exception " + e); failed = true; } } diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java index 2cccbd1..9febf01 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java @@ -20,6 +20,7 @@ import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.apache.activemq.artemis.rest.util.Constants; import org.apache.activemq.artemis.rest.util.CustomHeaderLinkStrategy; import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -30,6 +31,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class ClientAckQueueTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(ClientAckQueueTest.class); @BeforeClass public static void setup() throws Exception { @@ -58,12 +60,12 @@ public class ClientAckQueueTest extends MessageTestBase { ClientResponse response = Util.head(request); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); { ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -74,12 +76,12 @@ public class ClientAckQueueTest extends MessageTestBase { res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); // test timeout Thread.sleep(2000); @@ -87,25 +89,25 @@ public class ClientAckQueueTest extends MessageTestBase { ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(412, ackRes.getStatus()); - System.out.println("**** Successfully failed ack"); + log.debug("**** Successfully failed ack"); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); } { ClientResponse res = consumeNext.request().header(Constants.WAIT_HEADER, "2").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); if (ackRes.getStatus() != 204) { - System.out.println(ackRes.getEntity(String.class)); + log.debug(ackRes.getEntity(String.class)); } ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -132,62 +134,62 @@ public class ClientAckQueueTest extends MessageTestBase { ClientResponse response = Util.head(request); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull-consumers: " + consumers); + log.debug("pull-consumers: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("acknowledge-next: " + consumeNext); + log.debug("acknowledge-next: " + consumeNext); String data = Integer.toString(start); - System.out.println("Sending: " + data); + log.debug("Sending: " + data); ClientResponse res = sender.request().body("text/plain", data).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println("call acknowledge-next"); + log.debug("call acknowledge-next"); res = consumeNext.request().post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("sending next..."); + log.debug("sending next..."); String data2 = Integer.toString(start); - System.out.println("Sending: " + data2); + log.debug("Sending: " + data2); res = sender.request().body("text/plain", data2).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println(consumeNext); + log.debug(consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = consumeNext.request().post(String.class); res.releaseConnection(); - System.out.println(res.getStatus()); + log.debug(res.getStatus()); Assert.assertEquals(204, session.request().delete().getStatus()); } @@ -210,18 +212,18 @@ public class ClientAckQueueTest extends MessageTestBase { ClientResponse response = Util.head(request); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println(consumeNext); + log.debug(consumeNext); res = sender.request().body("text/plain", Integer.toString(start)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); @@ -230,7 +232,7 @@ public class ClientAckQueueTest extends MessageTestBase { Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -249,7 +251,7 @@ public class ClientAckQueueTest extends MessageTestBase { Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -259,7 +261,7 @@ public class ClientAckQueueTest extends MessageTestBase { Assert.assertEquals(Integer.toString(start++), res.getEntity()); res.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -268,7 +270,7 @@ public class ClientAckQueueTest extends MessageTestBase { res = consumeNext.request().post(); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); - System.out.println(session); + log.debug(session); res = session.request().delete(); res.releaseConnection(); Assert.assertEquals(204, res.getStatus()); @@ -292,12 +294,12 @@ public class ClientAckQueueTest extends MessageTestBase { ClientResponse response = Util.head(request); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); @@ -307,17 +309,17 @@ public class ClientAckQueueTest extends MessageTestBase { res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("before close session consumeNext: " + consumeNext); + log.debug("before close session consumeNext: " + consumeNext); // test reconnect with a disconnected acknowledge-next Assert.assertEquals(204, session.request().delete().getStatus()); @@ -330,14 +332,14 @@ public class ClientAckQueueTest extends MessageTestBase { res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "consumer"); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("session: " + session); + log.debug("session: " + session); // test reconnect with disconnected acknowledge @@ -348,7 +350,7 @@ public class ClientAckQueueTest extends MessageTestBase { res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Assert.assertEquals(204, session.request().delete().getStatus()); @@ -361,7 +363,7 @@ public class ClientAckQueueTest extends MessageTestBase { res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java index 5194c35..a84a6d1 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java @@ -20,6 +20,7 @@ import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.apache.activemq.artemis.rest.util.Constants; import org.apache.activemq.artemis.rest.util.CustomHeaderLinkStrategy; import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -30,6 +31,8 @@ import org.junit.Test; public class ClientAckTopicTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(ClientAckTopicTest.class); + @BeforeClass public static void setup() throws Exception { TopicDeployment deployment1 = new TopicDeployment("testQueue", true); @@ -59,7 +62,7 @@ public class ClientAckTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false").formParameter("durable", "true").post(); response.releaseConnection(); @@ -68,7 +71,7 @@ public class ClientAckTopicTest extends MessageTestBase { Assert.assertNotNull(sub1); Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); { ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -79,39 +82,39 @@ public class ClientAckTopicTest extends MessageTestBase { res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); // test timeout Thread.sleep(2000); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); if (ackRes.getStatus() == 500) { - System.out.println("Failure: " + ackRes.getEntity(String.class)); + log.debug("Failure: " + ackRes.getEntity(String.class)); } ackRes.releaseConnection(); Assert.assertEquals(412, ackRes.getStatus()); - System.out.println("**** Successfully failed ack"); + log.debug("**** Successfully failed ack"); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); } { ClientResponse res = consumeNext.request().header(Constants.WAIT_HEADER, "2").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); if (ackRes.getStatus() != 204) { - System.out.println(ackRes.getEntity(String.class)); + log.debug(ackRes.getEntity(String.class)); } ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -127,7 +130,7 @@ public class ClientAckTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false").formParameter("durable", "true").post(); @@ -136,42 +139,42 @@ public class ClientAckTopicTest extends MessageTestBase { Link sub1 = response.getLocationLink(); Assert.assertNotNull(sub1); Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println("call ack next"); + log.debug("call ack next"); res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("sending next..."); + log.debug("sending next..."); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println(consumeNext); + log.debug(consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -187,7 +190,7 @@ public class ClientAckTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false").formParameter("durable", "false").post(); @@ -196,42 +199,42 @@ public class ClientAckTopicTest extends MessageTestBase { Link sub1 = response.getLocationLink(); Assert.assertNotNull(sub1); Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println("call ack next"); + log.debug("call ack next"); res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); Link session = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), ackRes, "acknowledge-next"); - System.out.println("sending next..."); + log.debug("sending next..."); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println(consumeNext); + log.debug(consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); res.releaseConnection(); Assert.assertEquals(200, res.getStatus()); ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); Assert.assertNotNull(ack); getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -247,7 +250,7 @@ public class ClientAckTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link subscriptions = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "pull-subscriptions"); response = subscriptions.request().formParameter("autoAck", "false").formParameter("durable", "true").post(); response.releaseConnection(); @@ -255,13 +258,13 @@ public class ClientAckTopicTest extends MessageTestBase { Link sub1 = response.getLocationLink(); Assert.assertNotNull(sub1); Link consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); consumeNext = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledge-next"); - System.out.println(consumeNext); + log.debug(consumeNext); res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); @@ -270,7 +273,7 @@ public class ClientAckTopicTest extends MessageTestBase { Assert.assertEquals(Integer.toString(1), res.getEntity()); res.releaseConnection(); Link ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); ClientResponse ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -289,7 +292,7 @@ public class ClientAckTopicTest extends MessageTestBase { Assert.assertEquals(Integer.toString(2), res.getEntity()); res.releaseConnection(); ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -299,7 +302,7 @@ public class ClientAckTopicTest extends MessageTestBase { Assert.assertEquals(Integer.toString(3), res.getEntity()); res.releaseConnection(); ack = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); ackRes = ack.request().formParameter("acknowledge", "true").post(); ackRes.releaseConnection(); Assert.assertEquals(204, ackRes.getStatus()); @@ -307,7 +310,7 @@ public class ClientAckTopicTest extends MessageTestBase { res = consumeNext.request().post(); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); - System.out.println(sub1); + log.debug(sub1); res = sub1.request().delete(); res.releaseConnection(); Assert.assertEquals(204, res.getStatus()); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java index f5dc9f4..ce64495 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/CreateDestinationTest.java @@ -17,6 +17,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -26,6 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; public class CreateDestinationTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(CreateDestinationTest.class); @BeforeClass public static void reg() { @@ -39,19 +41,19 @@ public class CreateDestinationTest extends MessageTestBase { ClientResponse cRes = create.body("application/activemq.jms.queue+xml", queueConfig).post(); cRes.releaseConnection(); Assert.assertEquals(201, cRes.getStatus()); - System.out.println("Location: " + cRes.getLocationLink()); + log.debug("Location: " + cRes.getLocationLink()); ClientRequest request = cRes.getLocationLink().request(); ClientResponse response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); @@ -62,23 +64,23 @@ public class CreateDestinationTest extends MessageTestBase { Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = sender.request().body("text/plain", Integer.toString(2)).post(); res.releaseConnection(); Assert.assertEquals(201, res.getStatus()); - System.out.println(consumeNext); + log.debug(consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = session.request().delete(); res.releaseConnection(); @@ -108,7 +110,7 @@ public class CreateDestinationTest extends MessageTestBase { Assert.assertNotNull(sub1); Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); - System.out.println("consumeNext1: " + consumeNext1); + log.debug("consumeNext1: " + consumeNext1); res = subscriptions.request().post(); res.releaseConnection(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java index fe34d5c..1167631 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/DupQueueTest.java @@ -18,6 +18,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -27,6 +28,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class DupQueueTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(DupQueueTest.class); @Test public void testDup() throws Exception { @@ -42,18 +44,18 @@ public class DupQueueTest extends MessageTestBase { ClientResponse response = request.head(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); Assert.assertEquals(307, res.getStatus()); sender = res.getLocationLink(); res.releaseConnection(); - System.out.println("create-next: " + sender); + log.debug("create-next: " + sender); Assert.assertNotNull(sender); res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); @@ -71,17 +73,17 @@ public class DupQueueTest extends MessageTestBase { Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); res.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = consumeNext.request().post(String.class); res.releaseConnection(); @@ -105,12 +107,12 @@ public class DupQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create-with-id"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().pathParameter("id", "1").body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); @@ -128,18 +130,18 @@ public class DupQueueTest extends MessageTestBase { Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, res.getStatus()); Assert.assertEquals("2", res.getEntity(String.class)); res.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consume-next"); - System.out.println("consumeNext: " + consumeNext); + log.debug("consumeNext: " + consumeNext); res = consumeNext.request().post(String.class); res.releaseConnection(); Assert.assertEquals(503, res.getStatus()); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java index 67a7a53..0346a58 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Embedded.java @@ -24,10 +24,12 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.rest.MessageServiceConfiguration; import org.apache.activemq.artemis.rest.MessageServiceManager; +import org.jboss.logging.Logger; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; import org.jboss.resteasy.test.TestPortProvider; public class Embedded { + private static final Logger log = Logger.getLogger(Embedded.class); protected MessageServiceManager manager = new MessageServiceManager(null); protected MessageServiceConfiguration config = new MessageServiceConfiguration(); @@ -36,7 +38,7 @@ public class Embedded { public Embedded() { int port = TestPortProvider.getPort(); - System.out.println("default port is: " + port); + log.debug("default port is: " + port); tjws.setPort(port); tjws.setRootResourcePath(""); tjws.setSecurityDomain(null); @@ -67,7 +69,7 @@ public class Embedded { } public void start() throws Exception { - System.out.println("\nStarting Embedded"); + log.debug("\nStarting Embedded"); if (activeMQServer == null) { Configuration configuration = new ConfigurationImpl().setPersistenceEnabled(false).setSecurityEnabled(false).addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); @@ -83,7 +85,7 @@ public class Embedded { } public void stop() throws Exception { - System.out.println("\nStopping Embedded"); + log.debug("\nStopping Embedded"); manager.stop(); tjws.stop(); activeMQServer.stop(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java index 07d6980..9900b17 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java @@ -30,6 +30,7 @@ import org.apache.activemq.artemis.rest.HttpHeaderProperty; import org.apache.activemq.artemis.rest.integration.EmbeddedRestActiveMQ; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -40,6 +41,7 @@ import org.junit.BeforeClass; import org.junit.Test; public class EmbeddedTest { + private static final Logger log = Logger.getLogger(EmbeddedTest.class); public static EmbeddedRestActiveMQ server; @@ -93,12 +95,12 @@ public class EmbeddedTest { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = response.getLinkHeader().getLinkByTitle("create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = response.getLinkHeader().getLinkByTitle("pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = response.getLinkHeader().getLinkByTitle("consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); // test that Accept header is used to set content-type { diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTestServer.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTestServer.java index e2b4eb1..68fb062 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTestServer.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTestServer.java @@ -26,10 +26,12 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.rest.MessageServiceConfiguration; import org.apache.activemq.artemis.rest.MessageServiceManager; +import org.jboss.logging.Logger; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; import org.jboss.resteasy.test.TestPortProvider; class EmbeddedTestServer { + private static final Logger log = Logger.getLogger(EmbeddedTestServer.class); protected MessageServiceManager manager = new MessageServiceManager(null); protected MessageServiceConfiguration config = new MessageServiceConfiguration(); @@ -38,7 +40,7 @@ class EmbeddedTestServer { EmbeddedTestServer() { int port = TestPortProvider.getPort(); - System.out.println("default port is: " + port); + log.debug("default port is: " + port); tjws.setPort(port); tjws.setRootResourcePath(""); tjws.setSecurityDomain(null); @@ -65,7 +67,7 @@ class EmbeddedTestServer { } public void start() throws Exception { - System.out.println("\nStarting EmbeddedTestServer"); + log.debug("\nStarting EmbeddedTestServer"); if (activeMQServer == null) { Configuration configuration = new ConfigurationImpl().setPersistenceEnabled(false).setSecurityEnabled(false).addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); @@ -84,7 +86,7 @@ class EmbeddedTestServer { } public void stop() throws Exception { - System.out.println("\nStopping EmbeddedTestServer"); + log.debug("\nStopping EmbeddedTestServer"); manager.stop(); tjws.stop(); activeMQServer.stop(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java index 7faa5c4..ecf8723 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/FindDestinationTest.java @@ -20,6 +20,7 @@ import org.apache.activemq.artemis.api.core.QueueConfiguration; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.impl.AddressInfo; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -28,6 +29,7 @@ import org.junit.Assert; import org.junit.Test; public class FindDestinationTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(FindDestinationTest.class); @Test public void testFindQueue() throws Exception { @@ -41,12 +43,12 @@ public class FindDestinationTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); ClientResponse res = sender.request().body("text/plain", Integer.toString(1)).post(); res.releaseConnection(); @@ -57,7 +59,7 @@ public class FindDestinationTest extends MessageTestBase { Assert.assertEquals("1", res.getEntity(String.class)); res.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), res, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Assert.assertEquals(204, session.request().delete().getStatus()); } @@ -82,7 +84,7 @@ public class FindDestinationTest extends MessageTestBase { Assert.assertNotNull(sub1); Link consumeNext1 = getLinkByTitle(manager.getTopicManager().getLinkStrategy(), res, "consume-next"); Assert.assertNotNull(consumeNext1); - System.out.println("consumeNext1: " + consumeNext1); + log.debug("consumeNext1: " + consumeNext1); res = subscriptions.request().post(); Assert.assertEquals(201, res.getStatus()); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java index 77d88d1..8e64a9b 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/JMSTest.java @@ -35,6 +35,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; import org.apache.activemq.artemis.rest.HttpHeaderProperty; import org.apache.activemq.artemis.rest.Jms; import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -45,6 +46,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class JMSTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(JMSTest.class); public static ConnectionFactory connectionFactory; @@ -107,7 +109,7 @@ public class JMSTest extends MessageTestBase { public static Destination createDestination(String dest) { ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(dest); - System.out.println("SimpleAddress: " + destination.getSimpleAddress()); + log.debug("SimpleAddress: " + destination.getSimpleAddress()); return destination; } @@ -152,7 +154,7 @@ public class JMSTest extends MessageTestBase { public void testJmsConsumer() throws Exception { String queueName = "testQueue2"; String prefixedQueueName = ActiveMQDestination.createQueueAddressFromName(queueName).toString(); - System.out.println("Queue name: " + prefixedQueueName); + log.debug("Queue name: " + prefixedQueueName); QueueDeployment deployment = new QueueDeployment(); deployment.setDuplicatesAllowed(true); deployment.setDurableSend(false); @@ -172,9 +174,9 @@ public class JMSTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); // test that Accept header is used to set content-type { @@ -199,7 +201,7 @@ public class JMSTest extends MessageTestBase { public void testJmsProducer() throws Exception { String queueName = "testQueue"; String prefixedQueueName = ActiveMQDestination.createQueueAddressFromName(queueName).toString(); - System.out.println("Queue name: " + prefixedQueueName); + log.debug("Queue name: " + prefixedQueueName); QueueDeployment deployment = new QueueDeployment(); deployment.setDuplicatesAllowed(true); deployment.setDurableSend(false); @@ -211,12 +213,12 @@ public class JMSTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); // test that Accept header is used to set content-type { diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessagePropertiesTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessagePropertiesTest.java index 21263d6..2701d58 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessagePropertiesTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessagePropertiesTest.java @@ -22,6 +22,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.rest.HttpHeaderProperty; import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -38,7 +39,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class MessagePropertiesTest extends MessageTestBase { - + private static final Logger log = Logger.getLogger(MessagePropertiesTest.class); public static class Listener implements MessageHandler { @@ -76,7 +77,7 @@ public class MessagePropertiesTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); { response = sender.request().body("text/plain", "val") diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java index 9fc817f..8327999 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/MessageTestBase.java @@ -65,7 +65,7 @@ public class MessageTestBase { String href = (String) response.getHeaders().getFirst(headerName); if (href == null) return null; - //System.out.println(headerName + ": " + href); + //log.debug(headerName + ": " + href); Link l = new Link(title, null, href, null, null); try { l.setExecutor((ClientExecutor) executorField.get(response)); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java index 0eb3e2f..7e70703 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushQueueConsumerTest.java @@ -26,6 +26,7 @@ import org.apache.activemq.artemis.rest.MessageServiceManager; import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -41,6 +42,8 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; */ public class PersistentPushQueueConsumerTest { + private static final Logger log = Logger.getLogger(PersistentPushQueueConsumerTest.class); + public static MessageServiceManager manager; protected static ResteasyDeployment deployment; public static ActiveMQServer activeMQServer; @@ -81,19 +84,19 @@ public class PersistentPushQueueConsumerTest { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-consumers"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/" + testName + "forwardQueue")); response = request.head(); response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("poller: " + consumeNext); + log.debug("poller: " + consumeNext); PushRegistration reg = new PushRegistration(); reg.setDurable(true); @@ -161,9 +164,9 @@ public class PersistentPushQueueConsumerTest { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-consumers"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); PushRegistration reg = new PushRegistration(); reg.setDurable(true); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java index 00dc54e..8fe1a10 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PersistentPushTopicConsumerTest.java @@ -34,6 +34,7 @@ import org.apache.activemq.artemis.rest.MessageServiceManager; import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -50,6 +51,7 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; * Test durable queue push consumers */ public class PersistentPushTopicConsumerTest { + private static final Logger log = Logger.getLogger(PersistentPushTopicConsumerTest.class); public static ActiveMQServer server; public static MessageServiceManager manager; @@ -100,9 +102,9 @@ public class PersistentPushTopicConsumerTest { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); PushTopicRegistration reg = new PushTopicRegistration(); reg.setDurable(true); @@ -156,9 +158,9 @@ public class PersistentPushTopicConsumerTest { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = MessageTestBase.getLinkByTitle(manager.getTopicManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); String sub1 = generateURL("/subscribers/1"); String sub2 = generateURL("/subscribers/2"); @@ -211,7 +213,7 @@ public class PersistentPushTopicConsumerTest { @POST @Consumes("text/plain") public void postOne(String msg) { - System.out.println("in subscribers 1!!!!!!!!!! " + msg); + log.debug("in subscribers 1!!!!!!!!!! " + msg); subscriber1 = msg; latch.countDown(); } @@ -220,7 +222,7 @@ public class PersistentPushTopicConsumerTest { @POST @Consumes("text/plain") public void postTwo(String msg) { - System.out.println("in subscribers 2!!!!!!!!!! " + msg); + log.debug("in subscribers 2!!!!!!!!!! " + msg); subscriber2 = msg; latch.countDown(); } diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java index 077e81e..42c07f7 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java @@ -25,6 +25,7 @@ import org.apache.activemq.artemis.rest.queue.push.ActiveMQPushStrategy; import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -34,6 +35,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class PushQueueConsumerTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(PushQueueConsumerTest.class); enum PushRegistrationType { CLASS, BRIDGE, URI, TEMPLATE @@ -50,7 +52,7 @@ public class PushQueueConsumerTest extends MessageTestBase { // The name of the queue used for the test should match the name of the test String queue = "testBridge"; String queueToPushTo = "pushedFrom-" + queue; - System.out.println("\n" + queue); + log.debug("\n" + queue); deployQueue(queue); deployQueue(queueToPushTo); @@ -92,7 +94,7 @@ public class PushQueueConsumerTest extends MessageTestBase { // The name of the queue used for the test should match the name of the test String queue = "testClass"; String queueToPushTo = "pushedFrom-" + queue; - System.out.println("\n" + queue); + log.debug("\n" + queue); deployQueue(queue); deployQueue(queueToPushTo); @@ -127,7 +129,7 @@ public class PushQueueConsumerTest extends MessageTestBase { // The name of the queue used for the test should match the name of the test String queue = "testTemplate"; String queueToPushTo = "pushedFrom-" + queue; - System.out.println("\n" + queue); + log.debug("\n" + queue); deployQueue(queue); deployQueue(queueToPushTo); @@ -197,7 +199,7 @@ public class PushQueueConsumerTest extends MessageTestBase { // The name of the queue used for the test should match the name of the test String queue = "testUri"; String queueToPushTo = "pushedFrom-" + queue; - System.out.println("\n" + queue); + log.debug("\n" + queue); deployQueue(queue); deployQueue(queueToPushTo); @@ -229,7 +231,7 @@ public class PushQueueConsumerTest extends MessageTestBase { // The name of the queue used for the test should match the name of the test String queue = "testUriWithMultipleSessions"; String queueToPushTo = "pushedFrom-" + queue; - System.out.println("\n" + queue); + log.debug("\n" + queue); deployQueue(queue); deployQueue(queueToPushTo); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java index 104189d..4189eac 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java @@ -25,6 +25,7 @@ import org.apache.activemq.artemis.rest.queue.push.ActiveMQPushStrategy; import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -36,6 +37,8 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class PushTopicConsumerTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(PushTopicConsumerTest.class); + @BeforeClass public static void setup() throws Exception { // TopicDeployment deployment = new TopicDeployment(); @@ -69,9 +72,9 @@ public class PushTopicConsumerTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/testBridgeForwardQueue")); response = request.head(); @@ -128,9 +131,9 @@ public class PushTopicConsumerTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/testClassForwardQueue")); response = request.head(); @@ -187,9 +190,9 @@ public class PushTopicConsumerTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); request = new ClientRequest(generateURL("/queues/testTemplateForwardQueue")); response = request.head(); @@ -279,9 +282,9 @@ public class PushTopicConsumerTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); PushTopicRegistration reg = new PushTopicRegistration(); reg.setDurable(false); @@ -323,9 +326,9 @@ public class PushTopicConsumerTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link pushSubscriptions = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push subscriptions: " + pushSubscriptions); + log.debug("push subscriptions: " + pushSubscriptions); PushTopicRegistration reg = new PushTopicRegistration(); reg.setDurable(false); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java index e9468ff..f8ad954 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java @@ -37,6 +37,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.impl.AddressInfo; +import org.jboss.logging.Logger; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -46,6 +47,7 @@ import org.junit.Test; * Play with ActiveMQ */ public class RawAckTest { + private static final Logger log = Logger.getLogger(RawAckTest.class); protected static ActiveMQServer activeMQServer; static ServerLocator serverLocator; @@ -99,7 +101,7 @@ public class RawAckTest { byte[] bytes = new byte[size]; message.getBodyBuffer().readBytes(bytes); String str = new String(bytes); - System.out.println(str); + log.debug(str); message.acknowledge(); message = consumer.receive(1); if (message != null) { diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java index 714ff2d..1959fac 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingQueueTest.java @@ -18,6 +18,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -41,6 +42,7 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; * ack with an old ack link */ public class RepostingQueueTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(RepostingQueueTest.class); @BeforeClass public static void setup() throws Exception { @@ -56,12 +58,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -72,9 +74,9 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -98,9 +100,9 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -124,12 +126,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -140,10 +142,10 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Link firstConsumeNext = consumeNext; - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -154,9 +156,9 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -168,7 +170,7 @@ public class RepostingQueueTest extends MessageTestBase { response = firstConsumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); response = session.request().delete(); @@ -184,12 +186,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -200,18 +202,18 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); // test timeout here response = consumeNext.request().post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -234,12 +236,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -250,9 +252,9 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -263,7 +265,7 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -286,7 +288,7 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -304,12 +306,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -320,9 +322,9 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -333,7 +335,7 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, response.getStatus()); @@ -352,7 +354,7 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -370,12 +372,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -386,18 +388,18 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); response = ack.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, response.getStatus()); @@ -416,7 +418,7 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -434,12 +436,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -450,18 +452,18 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); response = ack.request().formParameter("acknowledge", "false").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -484,7 +486,7 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -502,12 +504,12 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -518,15 +520,15 @@ public class RepostingQueueTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Link oldAck = ack; - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -536,11 +538,11 @@ public class RepostingQueueTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = oldAck.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); response = ack.request().formParameter("acknowledge", "true").post(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java index 28b9132..9dcd827 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RepostingTopicTest.java @@ -18,6 +18,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -41,6 +42,7 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; * ack with an old ack link */ public class RepostingTopicTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(RepostingTopicTest.class); @BeforeClass public static void setup() throws Exception { @@ -56,9 +58,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); @@ -74,7 +76,7 @@ public class RepostingTopicTest extends MessageTestBase { response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = consumeNext.request().post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); @@ -99,9 +101,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("name", "bill").formParameter("durable", "true").post(); response.releaseConnection(); @@ -119,7 +121,7 @@ public class RepostingTopicTest extends MessageTestBase { response = consumers.request().formParameter("name", "bill").formParameter("durable", "true").post(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); @@ -144,9 +146,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); @@ -164,7 +166,7 @@ public class RepostingTopicTest extends MessageTestBase { response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); @@ -183,12 +185,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -199,9 +201,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -225,9 +227,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -251,12 +253,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -267,10 +269,10 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Link firstConsumeNext = consumeNext; - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -281,9 +283,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -295,7 +297,7 @@ public class RepostingTopicTest extends MessageTestBase { response = firstConsumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); response = session.request().delete(); @@ -311,12 +313,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -327,18 +329,18 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); // test timeout here response = consumeNext.request().post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -361,12 +363,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -377,9 +379,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -390,7 +392,7 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -413,7 +415,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -431,12 +433,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -447,9 +449,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -460,7 +462,7 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, response.getStatus()); @@ -479,7 +481,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -497,12 +499,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -513,18 +515,18 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); response = ack.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, response.getStatus()); @@ -543,7 +545,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -561,12 +563,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -577,18 +579,18 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); response = ack.request().formParameter("acknowledge", "false").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -611,7 +613,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -629,12 +631,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -645,15 +647,15 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Link oldAck = ack; - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); Link firstConsumeNext = consumeNext; response = sender.request().body("text/plain", Integer.toString(2)).post(); @@ -664,11 +666,11 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = oldAck.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java index 389a9ea..d2dffb7 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java @@ -17,6 +17,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -26,6 +27,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class RoundtripTimeTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(RoundtripTimeTest.class); @Test public void testSuccessFirst() throws Exception { @@ -41,12 +43,12 @@ public class RoundtripTimeTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); long start = System.currentTimeMillis(); int num = 100; @@ -55,7 +57,7 @@ public class RoundtripTimeTest extends MessageTestBase { response.releaseConnection(); } long end = System.currentTimeMillis() - start; - System.out.println(num + " iterations took " + end + "ms"); + log.debug(num + " iterations took " + end + "ms"); for (int i = 0; i < num; i++) { response = consumeNext.request().post(String.class); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java index 245d25c..111d26a 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java @@ -33,6 +33,7 @@ import org.apache.activemq.artemis.rest.HttpHeaderProperty; import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink; import org.apache.activemq.artemis.rest.topic.PushTopicRegistration; import org.apache.activemq.artemis.rest.topic.TopicDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -43,6 +44,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class SelectorTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(SelectorTest.class); public static ConnectionFactory connectionFactory; public static String topicName = "testTopic"; @@ -51,7 +53,7 @@ public class SelectorTest extends MessageTestBase { @BeforeClass public static void setup() throws Exception { connectionFactory = new ActiveMQJMSConnectionFactory(manager.getQueueManager().getServerLocator()); - System.out.println("Queue name: " + prefixedTopicName); + log.debug("Queue name: " + prefixedTopicName); TopicDeployment deployment = new TopicDeployment(); deployment.setDuplicatesAllowed(true); deployment.setDurableSend(false); @@ -120,7 +122,7 @@ public class SelectorTest extends MessageTestBase { public static Destination createDestination(String dest) { ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(dest); - System.out.println("SimpleAddress: " + destination.getSimpleAddress()); + log.debug("SimpleAddress: " + destination.getSimpleAddress()); return destination; } @@ -175,7 +177,7 @@ public class SelectorTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions"); - System.out.println("push: " + consumers); + log.debug("push: " + consumers); PushTopicRegistration oneReg = new PushTopicRegistration(); oneReg.setDurable(false); @@ -247,16 +249,16 @@ public class SelectorTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("autoAck", "true").formParameter("selector", "MyTag = '1'").post(); response.releaseConnection(); Link consumeOne = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consumeOne: " + consumeOne); + log.debug("consumeOne: " + consumeOne); response = consumers.request().formParameter("autoAck", "true").formParameter("selector", "MyTag = '2'").post(); response.releaseConnection(); Link consumeTwo = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consumeTwo: " + consumeTwo); + log.debug("consumeTwo: " + consumeTwo); // test that Accept header is used to set content-type { diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java index c19288f..a107351 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java @@ -19,6 +19,7 @@ package org.apache.activemq.artemis.rest.test; import org.apache.activemq.artemis.rest.queue.QueueDeployment; import org.apache.activemq.artemis.rest.topic.TopicDeployment; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -29,6 +30,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class SessionTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(SessionTest.class); @BeforeClass public static void setup() throws Exception { @@ -50,15 +52,15 @@ public class SessionTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -104,15 +106,15 @@ public class SessionTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -160,15 +162,15 @@ public class SessionTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); Link ack = null; response = sender.request().body("text/plain", Integer.toString(1)).post(); @@ -236,15 +238,15 @@ public class SessionTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link session = response.getLocationLink(); response = session.request().head(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); Link ack = null; response = sender.request().body("text/plain", Integer.toString(1)).post(); diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java index dcb67bd..3ccac8d 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java @@ -28,6 +28,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.rest.ActiveMQ; import org.apache.activemq.artemis.rest.queue.QueueDeployment; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -38,6 +39,7 @@ import org.junit.Test; import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class TransformTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(TransformTest.class); @BeforeClass public static void setup() throws Exception { @@ -122,12 +124,12 @@ public class TransformTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); // test that Accept header is used to set content-type { @@ -188,7 +190,7 @@ public class TransformTest extends MessageTestBase { @Override public void onMessage(ClientMessage clientMessage) { - System.out.println("onMessage!"); + log.debug("onMessage!"); try { order = ActiveMQ.getEntity(clientMessage, Order.class); } catch (Exception e) { @@ -217,12 +219,12 @@ public class TransformTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("consume-next: " + consumeNext); + log.debug("consume-next: " + consumeNext); // test that Accept header is used to set content-type { diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java index 726e16e..3fd0e62 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java @@ -20,9 +20,11 @@ import javax.xml.bind.JAXBContext; import java.io.StringReader; import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration; +import org.jboss.logging.Logger; import org.junit.Test; public class XmlTest { + private static final Logger log = Logger.getLogger(XmlTest.class); @Test public void testPush() throws Exception { @@ -40,6 +42,6 @@ public class XmlTest { JAXBContext ctx = JAXBContext.newInstance(PushRegistration.class); PushRegistration reg = (PushRegistration) ctx.createUnmarshaller().unmarshal(new StringReader(xml)); - System.out.println(reg); + log.debug(reg); } } diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/topic/RepostingTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/topic/RepostingTopicTest.java index 504f17a..5a1e1d3 100644 --- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/topic/RepostingTopicTest.java +++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/topic/RepostingTopicTest.java @@ -19,6 +19,7 @@ package org.apache.activemq.artemis.rest.topic; import org.apache.activemq.artemis.rest.test.MessageTestBase; import org.apache.activemq.artemis.rest.test.Util; import org.apache.activemq.artemis.rest.util.Constants; +import org.jboss.logging.Logger; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -42,6 +43,7 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; * ack with an old ack link */ public class RepostingTopicTest extends MessageTestBase { + private static final Logger log = Logger.getLogger(RepostingTopicTest.class); @BeforeClass public static void setup() throws Exception { @@ -57,9 +59,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); @@ -75,7 +77,7 @@ public class RepostingTopicTest extends MessageTestBase { response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = consumeNext.request().post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); @@ -100,9 +102,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("name", "bill").formParameter("durable", "true").post(); response.releaseConnection(); @@ -120,7 +122,7 @@ public class RepostingTopicTest extends MessageTestBase { response = consumers.request().formParameter("name", "bill").formParameter("durable", "true").post(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); Assert.assertEquals(200, response.getStatus()); Assert.assertEquals("1", response.getEntity(String.class)); @@ -145,9 +147,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); @@ -165,7 +167,7 @@ public class RepostingTopicTest extends MessageTestBase { response = consumers.request().formParameter("name", "bill").post(); response.releaseConnection(); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = consumeNext.request().header("Accept-Wait", "2").post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); @@ -184,12 +186,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -200,9 +202,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -226,9 +228,9 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -252,12 +254,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -268,10 +270,10 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); Link firstConsumeNext = consumeNext; - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -282,9 +284,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -296,7 +298,7 @@ public class RepostingTopicTest extends MessageTestBase { response = firstConsumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); response = session.request().delete(); @@ -312,12 +314,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, true); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("resource consume-next: " + consumeNext); + log.debug("resource consume-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -328,18 +330,18 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 1st consumeNext: " + consumeNext); + log.debug("session 1st consumeNext: " + consumeNext); // test timeout here response = consumeNext.request().post(String.class); response.releaseConnection(); Assert.assertEquals(503, response.getStatus()); session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next"); - System.out.println("session 2nd consumeNext: " + consumeNext); + log.debug("session 2nd consumeNext: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(3)).post(); response.releaseConnection(); @@ -362,12 +364,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -378,9 +380,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -391,7 +393,7 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -414,7 +416,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -432,12 +434,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -448,9 +450,9 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -461,7 +463,7 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, response.getStatus()); @@ -480,7 +482,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -498,12 +500,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -514,18 +516,18 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "false").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); response = ack.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = consumeNext.request().header(Constants.WAIT_HEADER, "10").post(String.class); Assert.assertEquals(200, response.getStatus()); @@ -544,7 +546,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -562,12 +564,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -578,18 +580,18 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); response = ack.request().formParameter("acknowledge", "false").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(2)).post(); response.releaseConnection(); @@ -612,7 +614,7 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("2", response.getEntity(String.class)); response.releaseConnection(); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); @@ -630,12 +632,12 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create"); - System.out.println("create: " + sender); + log.debug("create: " + sender); Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions"); - System.out.println("pull: " + consumers); + log.debug("pull: " + consumers); response = Util.setAutoAck(consumers, false); Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("resource acknowledge-next: " + consumeNext); + log.debug("resource acknowledge-next: " + consumeNext); response = sender.request().body("text/plain", Integer.toString(1)).post(); response.releaseConnection(); @@ -646,15 +648,15 @@ public class RepostingTopicTest extends MessageTestBase { Assert.assertEquals("1", response.getEntity(String.class)); response.releaseConnection(); Link session = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consumer"); - System.out.println("session: " + session); + log.debug("session: " + session); Link ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); Link oldAck = ack; - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = ack.request().formParameter("acknowledge", "true").post(); response.releaseConnection(); Assert.assertEquals(204, response.getStatus()); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); - System.out.println("session 1st acknowledge-next: " + consumeNext); + log.debug("session 1st acknowledge-next: " + consumeNext); Link firstConsumeNext = consumeNext; response = sender.request().body("text/plain", Integer.toString(2)).post(); @@ -665,11 +667,11 @@ public class RepostingTopicTest extends MessageTestBase { response.releaseConnection(); Assert.assertEquals(200, response.getStatus()); ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement"); - System.out.println("ack: " + ack); + log.debug("ack: " + ack); response = oldAck.request().formParameter("acknowledge", "true").post(); Assert.assertEquals(412, response.getStatus()); - System.out.println(response.getEntity(String.class)); + log.debug(response.getEntity(String.class)); response.releaseConnection(); consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next"); diff --git a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java index d234ae1..e4fff54 100755 --- a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java +++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java @@ -23,6 +23,7 @@ import org.apache.activemq.artemis.selector.filter.LogicExpression; import org.apache.activemq.artemis.selector.filter.PropertyExpression; import org.apache.activemq.artemis.selector.filter.XPathExpression; import org.apache.activemq.artemis.selector.impl.SelectorParser; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; @@ -31,8 +32,10 @@ import org.junit.Test; */ public class SelectorParserTest { + private static final Logger log = Logger.getLogger(SelectorParserTest.class); + public void info(String msg) { - System.out.println(msg); + log.debug(msg); } @Test diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java index 9cba923..55f401e 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java @@ -30,12 +30,15 @@ import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.server.plugin.impl.LoggingActiveMQServerPlugin; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class ConfigurationImplTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(ConfigurationImplTest.class); + protected Configuration conf; @Test @@ -532,7 +535,7 @@ public class ConfigurationImplTest extends ActiveMQTestBase { tempFolder = new File(tempFolder.getAbsolutePath()); tempFolder.mkdirs(); - System.out.println("TempFolder = " + tempFolder.getAbsolutePath()); + log.debug("TempFolder = " + tempFolder.getAbsolutePath()); ConfigurationImpl configuration = new ConfigurationImpl(); configuration.setJournalDirectory(tempFolder.getAbsolutePath()); @@ -550,7 +553,7 @@ public class ConfigurationImplTest extends ActiveMQTestBase { tempFolder = new File(tempFolder.getAbsolutePath()); tempFolder.mkdirs(); - System.out.println("TempFolder = " + tempFolder.getAbsolutePath()); + log.debug("TempFolder = " + tempFolder.getAbsolutePath()); configuration.setNodeManagerLockDirectory(tempFolder.getAbsolutePath()); File lockLocation = configuration.getNodeManagerLockLocation(); Assert.assertTrue(lockLocation.exists()); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/LoggingConfigurationFileReloaderTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/LoggingConfigurationFileReloaderTest.java index 9f111c6..54ab8d9 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/LoggingConfigurationFileReloaderTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/reload/LoggingConfigurationFileReloaderTest.java @@ -5,9 +5,9 @@ * 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. @@ -17,59 +17,53 @@ package org.apache.activemq.artemis.core.reload; -import java.util.Collections; -import java.util.List; import java.util.logging.LogManager; import org.apache.activemq.artemis.core.server.LoggingConfigurationFileReloader; import org.apache.activemq.artemis.utils.ClassloadingUtil; +import org.apache.activemq.artemis.utils.SpawnedVMSupport; import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class LoggingConfigurationFileReloaderTest { + private static final LogManager logManager = LogManager.getLogManager(); + private static final Logger root = Logger.getLogger(""); + private static final Logger test1 = Logger.getLogger("test1"); + private static final Logger test2 = Logger.getLogger("test2"); + private static final Logger test3 = Logger.getLogger("test3"); + + public static void main(String[] args) { + try { + LoggingConfigurationFileReloaderTest test = new LoggingConfigurationFileReloaderTest(); + test.doTestA(); + System.exit(0); + } catch (Throwable e) { + System.exit(1); + } + } + @Test - public void test() throws Exception { - LogManager logManager = LogManager.getLogManager(); + public void testA() throws Exception { + Process p = SpawnedVMSupport.spawnVM(LoggingConfigurationFileReloaderTest.class.getName()); + Assert.assertEquals(0, p.waitFor()); + } - List loggerNames = Collections.list(logManager.getLoggerNames()); - assertFalse(loggerNames.contains("test1")); - assertFalse(loggerNames.contains("test2")); - assertFalse(loggerNames.contains("test3")); + public void doTestA() throws Exception { - // everything defaults to INFO - final Logger root = Logger.getLogger(""); - assertTrue(root.isEnabled(Logger.Level.ERROR)); - assertTrue(root.isEnabled(Logger.Level.WARN)); - assertTrue(root.isEnabled(Logger.Level.INFO)); - assertFalse(root.isEnabled(Logger.Level.DEBUG)); - assertFalse(root.isEnabled(Logger.Level.TRACE)); - - final Logger test1 = Logger.getLogger("test1"); - assertTrue(test1.isEnabled(Logger.Level.ERROR)); - assertTrue(test1.isEnabled(Logger.Level.WARN)); - assertTrue(test1.isEnabled(Logger.Level.INFO)); - assertFalse(test1.isEnabled(Logger.Level.DEBUG)); - assertFalse(test1.isEnabled(Logger.Level.TRACE)); - - final Logger test2 = Logger.getLogger("test2"); - assertTrue(test2.isEnabled(Logger.Level.ERROR)); - assertTrue(test2.isEnabled(Logger.Level.WARN)); - assertTrue(test2.isEnabled(Logger.Level.INFO)); - assertFalse(test2.isEnabled(Logger.Level.DEBUG)); - assertFalse(test2.isEnabled(Logger.Level.TRACE)); + /** This is making sure we won't mess with the configuration for other tests */ + validateInitialLoggers(); LoggingConfigurationFileReloader loggingConfigurationFileReloader = new LoggingConfigurationFileReloader(); loggingConfigurationFileReloader.reload(ClassloadingUtil.findResource("reload-logging-1.properties")); - loggerNames = Collections.list(logManager.getLoggerNames()); - assertTrue(loggerNames.contains("test1")); - assertTrue(loggerNames.contains("test2")); - assertFalse(loggerNames.contains("test3")); - assertTrue(root.isEnabled(Logger.Level.ERROR)); assertTrue(root.isEnabled(Logger.Level.WARN)); assertFalse(root.isEnabled(Logger.Level.INFO)); @@ -90,11 +84,6 @@ public class LoggingConfigurationFileReloaderTest { loggingConfigurationFileReloader.reload(ClassloadingUtil.findResource("reload-logging-2.properties")); - loggerNames = Collections.list(logManager.getLoggerNames()); - assertTrue(loggerNames.contains("test1")); - assertTrue(loggerNames.contains("test2")); - assertTrue(loggerNames.contains("test3")); - assertTrue(root.isEnabled(Logger.Level.ERROR)); assertFalse(root.isEnabled(Logger.Level.WARN)); assertFalse(root.isEnabled(Logger.Level.INFO)); @@ -107,11 +96,33 @@ public class LoggingConfigurationFileReloaderTest { assertFalse(test1.isEnabled(Logger.Level.DEBUG)); assertFalse(test1.isEnabled(Logger.Level.TRACE)); - final Logger test3 = Logger.getLogger("test3"); assertTrue(test3.isEnabled(Logger.Level.ERROR)); assertTrue(test3.isEnabled(Logger.Level.WARN)); assertTrue(test3.isEnabled(Logger.Level.INFO)); assertTrue(test3.isEnabled(Logger.Level.DEBUG)); assertFalse(test3.isEnabled(Logger.Level.TRACE)); } + + @Test + public void testB() { + validateInitialLoggers(); + } + + public void validateInitialLoggers() { + // everything defaults to INFO + assertTrue(root.isEnabled(Logger.Level.ERROR)); + assertTrue(root.isEnabled(Logger.Level.WARN)); + assertFalse(root.isEnabled(Logger.Level.DEBUG)); + assertFalse(root.isEnabled(Logger.Level.TRACE)); + + assertTrue(test1.isEnabled(Logger.Level.ERROR)); + assertTrue(test1.isEnabled(Logger.Level.WARN)); + assertFalse(test1.isEnabled(Logger.Level.DEBUG)); + assertFalse(test1.isEnabled(Logger.Level.TRACE)); + + assertTrue(test2.isEnabled(Logger.Level.ERROR)); + assertTrue(test2.isEnabled(Logger.Level.WARN)); + assertFalse(test2.isEnabled(Logger.Level.DEBUG)); + assertFalse(test2.isEnabled(Logger.Level.TRACE)); + } } \ No newline at end of file diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/JAASSecurityManagerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/JAASSecurityManagerTest.java index 6707ad2..3b56174 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/JAASSecurityManagerTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/JAASSecurityManagerTest.java @@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.security.jaas; import org.apache.activemq.artemis.core.security.CheckType; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; +import org.jboss.logging.Logger; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -40,6 +41,7 @@ import static org.junit.Assert.assertNotNull; @RunWith(Parameterized.class) public class JAASSecurityManagerTest { + private static final Logger log = Logger.getLogger(JAASSecurityManagerTest.class); @Parameterized.Parameters(name = "newLoader=({0})") public static Collection data() { @@ -70,7 +72,7 @@ public class JAASSecurityManagerTest { @Test public void testLoginClassloading() throws Exception { ClassLoader existingLoader = Thread.currentThread().getContextClassLoader(); - System.out.println("loader: " + existingLoader); + log.debug("loader: " + existingLoader); try { if (usingNewLoader) { URLClassLoader simulatedLoader = new URLClassLoader(new URL[]{tmpDir.getRoot().toURI().toURL()}, null); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitorTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitorTest.java index ff28e04..8936271 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitorTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitorTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ReusableLatch; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -37,6 +38,8 @@ import org.junit.Test; public class FileStoreMonitorTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(FileStoreMonitorTest.class); + private ScheduledExecutorService scheduledExecutorService; private ExecutorService executorService; @@ -76,19 +79,19 @@ public class FileStoreMonitorTest extends ActiveMQTestBase { @Override public void tick(long usableSpace, long totalSpace) { tick.incrementAndGet(); - System.out.println("tick:: usableSpace: " + usableSpace + ", totalSpace:" + totalSpace); + log.debug("tick:: usableSpace: " + usableSpace + ", totalSpace:" + totalSpace); } @Override public void over(long usableSpace, long totalSpace) { over.incrementAndGet(); - System.out.println("over:: usableSpace: " + usableSpace + ", totalSpace:" + totalSpace); + log.debug("over:: usableSpace: " + usableSpace + ", totalSpace:" + totalSpace); } @Override public void under(long usableSpace, long totalSpace) { under.incrementAndGet(); - System.out.println("under:: usableSpace: " + usableSpace + ", totalSpace:" + totalSpace); + log.debug("under:: usableSpace: " + usableSpace + ", totalSpace:" + totalSpace); } }; FileStoreMonitor storeMonitor = new FileStoreMonitor(scheduledExecutorService, executorService, 100, TimeUnit.MILLISECONDS, 0.999, null); @@ -120,7 +123,7 @@ public class FileStoreMonitorTest extends ActiveMQTestBase { storeMonitor.addCallback(new FileStoreMonitor.Callback() { @Override public void tick(long usableSpace, long totalSpace) { - System.out.println("Tick"); + log.debug("Tick"); latch.countDown(); } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java index 988fa49..6eda103 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java @@ -59,11 +59,14 @@ import org.apache.activemq.artemis.utils.UUID; import org.apache.activemq.artemis.utils.collections.LinkedListIterator; import org.apache.activemq.artemis.utils.critical.CriticalComponentImpl; import org.apache.activemq.artemis.utils.critical.EmptyCriticalAnalyzer; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; public class ScheduledDeliveryHandlerTest extends Assert { + private static final Logger log = Logger.getLogger(ScheduledDeliveryHandlerTest.class); + @Test public void testScheduleRandom() throws Exception { ScheduledDeliveryHandlerImpl handler = new ScheduledDeliveryHandlerImpl(null, new FakeQueueForScheduleUnitTest(0)); @@ -279,7 +282,7 @@ public class ScheduledDeliveryHandlerTest extends Assert { assertTrue(ref.getScheduledDeliveryTime() >= lastTime); } else { if (ref.getScheduledDeliveryTime() < lastTime) { - System.out.println("^^^fail at " + ref.getScheduledDeliveryTime()); + log.debug("^^^fail at " + ref.getScheduledDeliveryTime()); } } lastTime = ref.getScheduledDeliveryTime(); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java index defda9d..a3ee0e2 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java @@ -63,10 +63,12 @@ import org.apache.activemq.artemis.core.transaction.ResourceManager; import org.apache.activemq.artemis.core.transaction.Transaction; import org.apache.activemq.artemis.core.transaction.TransactionOperation; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; public class TransactionImplTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(TransactionImplTest.class); @Test public void testTimeoutAndThenCommitWithARollback() throws Exception { @@ -94,7 +96,7 @@ public class TransactionImplTest extends ActiveMQTestBase { @Override public void afterCommit(Transaction tx) { - System.out.println("commit..."); + log.debug("commit..."); commit.incrementAndGet(); } @@ -105,7 +107,7 @@ public class TransactionImplTest extends ActiveMQTestBase { @Override public void afterRollback(Transaction tx) { - System.out.println("rollback..."); + log.debug("rollback..."); rollback.incrementAndGet(); } @@ -162,7 +164,7 @@ public class TransactionImplTest extends ActiveMQTestBase { @Override public void afterCommit(Transaction tx) { - System.out.println("commit..."); + log.debug("commit..."); commit.incrementAndGet(); } @@ -173,7 +175,7 @@ public class TransactionImplTest extends ActiveMQTestBase { @Override public void afterRollback(Transaction tx) { - System.out.println("rollback..."); + log.debug("rollback..."); rollback.incrementAndGet(); } 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 91128a0..8209f0a 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 @@ -164,6 +164,12 @@ import org.junit.runner.Description; */ public abstract class ActiveMQTestBase extends Assert { + private static final Logger log = Logger.getLogger(ActiveMQTestBase.class); + + private static final Logger baseLog = Logger.getLogger(ActiveMQTestBase.class); + + protected final Logger instanceLog = Logger.getLogger(this.getClass()); + static { Env.setTestEnv(true); } @@ -206,7 +212,6 @@ public abstract class ActiveMQTestBase extends Assert { private static final String SEND_CALL_NUMBER = "sendCallNumber"; private static final String OS_TYPE = System.getProperty("os.name").toLowerCase(); private static final int DEFAULT_UDP_PORT; - private static final ActiveMQServerLogger log = ActiveMQServerLogger.LOGGER; protected static final long WAIT_TIMEOUT = 30000; @@ -240,12 +245,12 @@ public abstract class ActiveMQTestBase extends Assert { public TestRule watcher = new TestWatcher() { @Override protected void starting(Description description) { - log.info(String.format("**** start #test %s() ***", description.getMethodName())); + baseLog.info(String.format("**** start #test %s() ***", description.getMethodName())); } @Override protected void finished(Description description) { - log.info(String.format("**** end #test %s() ***", description.getMethodName())); + baseLog.info(String.format("**** end #test %s() ***", description.getMethodName())); } }; @@ -271,7 +276,7 @@ public abstract class ActiveMQTestBase extends Assert { } protected T serialClone(Object object) throws Exception { - System.out.println("object::" + object); + log.debug("object::" + object); ByteArrayOutputStream bout = new ByteArrayOutputStream(); ObjectOutputStream obOut = new ObjectOutputStream(bout); obOut.writeObject(object); @@ -1088,16 +1093,16 @@ public abstract class ActiveMQTestBase extends Assert { } else if (prop.getPropertyType() == Double.class || prop.getPropertyType() == Double.TYPE) { value = RandomUtil.randomDouble(); } else { - System.out.println("Can't validate property of type " + prop.getPropertyType() + " on " + prop.getName()); + log.debug("Can't validate property of type " + prop.getPropertyType() + " on " + prop.getName()); value = null; } if (value != null && prop.getWriteMethod() != null && prop.getReadMethod() == null) { - System.out.println("WriteOnly property " + prop.getName() + " on " + pojo.getClass()); + log.debug("WriteOnly property " + prop.getName() + " on " + pojo.getClass()); } else if (value != null && prop.getWriteMethod() != null && prop.getReadMethod() != null && !ignoreSet.contains(prop.getName())) { - System.out.println("Validating " + prop.getName() + " type = " + prop.getPropertyType()); + log.debug("Validating " + prop.getName() + " type = " + prop.getPropertyType()); prop.getWriteMethod().invoke(pojo, value); Assert.assertEquals("Property " + prop.getName(), value, prop.getReadMethod().invoke(pojo)); @@ -1300,7 +1305,7 @@ public abstract class ActiveMQTestBase extends Assert { } if (!server.isStarted()) { - log.info(threadDump("Server didn't start")); + baseLog.info(threadDump("Server didn't start")); fail("server didn't start: " + server); } @@ -1322,7 +1327,7 @@ public abstract class ActiveMQTestBase extends Assert { } if (server.isStarted()) { - log.info(threadDump("Server didn't start")); + baseLog.info(threadDump("Server didn't start")); fail("Server didn't start: " + server); } } @@ -1821,9 +1826,6 @@ public abstract class ActiveMQTestBase extends Assert { } AtomicInteger getType(byte key) { - if (key == 0) { - System.out.println("huh?"); - } Integer ikey = (int) key; AtomicInteger value = recordsType.get(ikey); if (value == null) { @@ -1939,7 +1941,7 @@ public abstract class ActiveMQTestBase extends Assert { ")" + ")"; - log.error(msg); + baseLog.error(msg); return false; } @@ -2033,7 +2035,7 @@ public abstract class ActiveMQTestBase extends Assert { int invmSize = InVMRegistry.instance.size(); if (invmSize > 0) { InVMRegistry.instance.clear(); - log.info(threadDump("Thread dump")); + baseLog.info(threadDump("Thread dump")); fail("invm registry still had acceptors registered"); } @@ -2050,14 +2052,14 @@ public abstract class ActiveMQTestBase extends Assert { try { ServerLocatorImpl.clearThreadPools(); } catch (Throwable e) { - log.info(threadDump(e.getMessage())); + baseLog.info(threadDump(e.getMessage())); System.err.println(threadDump(e.getMessage())); } try { NettyConnector.clearThreadPools(); } catch (Exception e) { - log.info(threadDump(e.getMessage())); + baseLog.info(threadDump(e.getMessage())); System.err.println(threadDump(e.getMessage())); } } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/uri/AcceptorParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/uri/AcceptorParserTest.java index 0d8e206..84bd013 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/uri/AcceptorParserTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/uri/AcceptorParserTest.java @@ -25,17 +25,19 @@ import org.apache.activemq.artemis.core.config.ConfigurationUtils; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.utils.ConfigurationHelper; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; public class AcceptorParserTest { + private static final Logger log = Logger.getLogger(AcceptorParserTest.class); @Test public void testAcceptor() throws Exception { List configs = ConfigurationUtils.parseAcceptorURI("test", "tcp://localhost:8080?tcpSendBufferSize=1048576&tcpReceiveBufferSize=1048576&protocols=openwire&banana=x"); for (TransportConfiguration config : configs) { - System.out.println("config:" + config); + log.debug("config:" + config); Assert.assertTrue(config.getExtraParams().get("banana").equals("x")); } } @@ -60,8 +62,8 @@ public class AcceptorParserTest { List configs = ConfigurationUtils.parseAcceptorURI("test", "tcp://0.0.0.0:5672?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;virtualTopicConsumerWildcards=Consumer.*.%3E%3B2"); for (TransportConfiguration config : configs) { - System.out.println("config:" + config); - System.out.println(config.getExtraParams().get("virtualTopicConsumerWildcards")); + log.debug("config:" + config); + log.debug(config.getExtraParams().get("virtualTopicConsumerWildcards")); Assert.assertTrue(config.getExtraParams().get("virtualTopicConsumerWildcards").equals("Consumer.*.>;2")); } } diff --git a/pom.xml b/pom.xml index dfe3afb..bc02240 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,7 @@ scp://people.apache.org/x1/www/activemq.apache.org false + logging.properties 1.0.1 4.0.6 @@ -175,7 +176,7 @@ --> -Dorg.apache.activemq.artemis.utils.RetryRule.retry=${retryTests} -Dbrokerconfig.maxDiskUsage=100 -Dorg.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_QUIET_PERIOD=0 -Dorg.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants.DEFAULT_SHUTDOWN_TIMEOUT=0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager - -Dlogging.configuration="file:${activemq.basedir}/tests/config/logging.properties" + -Dlogging.configuration="file:${activemq.basedir}/tests/config/${logging.config}" -Djava.library.path="${activemq.basedir}/target/bin/lib/linux-x86_64:${activemq.basedir}/target/bin/lib/linux-i686" -Djgroups.bind_addr=localhost -Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost -Djava.net.preferIPv4Stack=true -Dbasedir=${basedir} @@ -1024,6 +1025,14 @@ + + tests-CI + + + logging-CI.properties + + + tests diff --git a/tests/compatibility-tests/src/main/resources/hqclienttopologytest/verifyTopologyChangeMessage.groovy b/tests/compatibility-tests/src/main/resources/hqclienttopologytest/verifyTopologyChangeMessage.groovy index 78da87d..cbb79fa 100644 --- a/tests/compatibility-tests/src/main/resources/hqclienttopologytest/verifyTopologyChangeMessage.groovy +++ b/tests/compatibility-tests/src/main/resources/hqclienttopologytest/verifyTopologyChangeMessage.groovy @@ -45,8 +45,6 @@ Session session = connection.createSession(true, Session.SESSION_TRANSACTED); try { latch.await(5, TimeUnit.SECONDS); - System.out.println("Count is " + latch.getCount()); - System.out.println("Retrieved transport params: " + transportParams); // cluster topology message should arrive immediately after connecting GroovyRun.assertEquals(0, (int) latch.getCount()); diff --git a/tests/compatibility-tests/src/main/resources/hqsoak/receiveMessages.groovy b/tests/compatibility-tests/src/main/resources/hqsoak/receiveMessages.groovy index de2d37a..2fe8dd5 100644 --- a/tests/compatibility-tests/src/main/resources/hqsoak/receiveMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/hqsoak/receiveMessages.groovy @@ -65,7 +65,6 @@ for (int i = 0; i < consumers; i++) { void run() { try { int threadid = running.incrementAndGet(); - System.out.println("Running " + threadid) Connection connection = cf.createConnection(); connection.setClientID(clientType + threadid) Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -100,6 +99,5 @@ if (!latchStarted.await(10, TimeUnit.SECONDS)) { System.err.prntln("Could not start consumers") errorsConsumer.incrementAndGet() } -System.out.println("Running::" + clientType + "::" + running) return running; diff --git a/tests/compatibility-tests/src/main/resources/hqsoak/sendMessages.groovy b/tests/compatibility-tests/src/main/resources/hqsoak/sendMessages.groovy index 08b05a9..4d2849c 100644 --- a/tests/compatibility-tests/src/main/resources/hqsoak/sendMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/hqsoak/sendMessages.groovy @@ -43,9 +43,6 @@ if (legacyOption) { topicName = "topic"; } -System.out.println("topicName = " + topicName); - - if (clientType.startsWith("ARTEMIS")) { // Can't depend directly on artemis, otherwise it wouldn't compile in hornetq GroovyRun.evaluate("clients/artemisClient.groovy", "serverArg", "ARTEMIS"); diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/receiveMessages.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/receiveMessages.groovy index 2eb9fc5..1f7ce3d 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/receiveMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/receiveMessages.groovy @@ -38,10 +38,8 @@ connection.start() Message message = queueConsumer.receive(5000); GroovyRun.assertNotNull(message) session.commit(); -System.out.println("Received " + message + " from: " + myQueue); queueConsumer.close(); -System.out.println("Sending message to: " + message.getJMSReplyTo()); MessageProducer producer = session.createProducer(message.getJMSReplyTo()); message = session.createMessage(); producer.send(message); diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/sendMessagesAddress.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/sendMessagesAddress.groovy index fd6baf8..e97113b 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/sendMessagesAddress.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToQueue/sendMessagesAddress.groovy @@ -41,15 +41,12 @@ MessageProducer queueProducer = session.createProducer(myQueue) queueProducer.setDeliveryMode(DeliveryMode.PERSISTENT); Message message = session.createMessage(); message.setJMSReplyTo(temporaryQueue); -System.out.println("Sending " + message + " to: " + myQueue); queueProducer.send(message); session.commit(); -System.out.println("Receiving message from: " + temporaryQueue); message = consumer.receive(10000); GroovyRun.assertNotNull(message); session.commit(); -System.out.println("Received message: " + message); connection.close(); senderLatch.countDown(); \ No newline at end of file diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/receiveMessages.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/receiveMessages.groovy index a7a1157..9c2f96f 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/receiveMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/receiveMessages.groovy @@ -38,10 +38,8 @@ connection.start() Message message = queueConsumer.receive(5000); GroovyRun.assertNotNull(message) session.commit(); -System.out.println("Received " + message + " from: " + myQueue); queueConsumer.close(); -System.out.println("Sending message to: " + message.getJMSReplyTo()); MessageProducer producer = session.createProducer(message.getJMSReplyTo()); message = session.createMessage(); producer.send(message); diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/sendMessagesAddress.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/sendMessagesAddress.groovy index 968b8ad..df82693 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/sendMessagesAddress.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToTempQueue/sendMessagesAddress.groovy @@ -41,15 +41,12 @@ MessageProducer queueProducer = session.createProducer(myQueue) queueProducer.setDeliveryMode(DeliveryMode.PERSISTENT); Message message = session.createMessage(); message.setJMSReplyTo(temporaryQueue); -System.out.println("Sending " + message + " to: " + myQueue); queueProducer.send(message); session.commit(); -System.out.println("Receiving message from: " + temporaryQueue); message = consumer.receive(10000); GroovyRun.assertNotNull(message); session.commit(); -System.out.println("Received message: " + message); connection.close(); senderLatch.countDown(); \ No newline at end of file diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/receiveMessages.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/receiveMessages.groovy index 5c7f300..e60a654 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/receiveMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/receiveMessages.groovy @@ -41,11 +41,9 @@ connection.start() for (int i = 0; i < 5; i++) { Message message = queueConsumer.receive(5000); GroovyRun.assertNotNull(message) - System.out.println("Received " + message + " from: " + myQueue); GroovyRun.assertEquals("myQueue", ((Queue)message.getJMSDestination()).getQueueName()); - System.out.println("Sending message to: " + message.getJMSReplyTo()); MessageProducer producer = session.createProducer(message.getJMSReplyTo()); message = session.createMessage(); producer.send(message); diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/sendMessagesAddress.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/sendMessagesAddress.groovy index d54cda2..f346668 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/sendMessagesAddress.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToTempTopic/sendMessagesAddress.groovy @@ -36,11 +36,9 @@ Queue myQueue = session.createQueue("myQueue"); GroovyRun.assertEquals("myQueue", myQueue.getQueueName()); -System.out.println("myQueue::" + myQueue); TemporaryTopic replyTopic = session.createTemporaryTopic(); MessageConsumer consumer = session.createConsumer(replyTopic); -System.out.println("Temporary Topic " + replyTopic); MessageProducer queueProducer = session.createProducer(myQueue) @@ -53,14 +51,12 @@ sendMessage(session.createMessage(), replyTopic, myQueue, queueProducer); session.commit(); -System.out.println("Receiving message from: " + replyTopic); for (int i = 0; i < 5; i++) { message = consumer.receive(10000); GroovyRun.assertNotNull(message); } GroovyRun.assertNull(consumer.receiveNoWait()); session.commit(); -System.out.println("Received message: " + message); connection.close(); senderLatch.countDown(); @@ -68,6 +64,5 @@ senderLatch.countDown(); void sendMessage(Message message, TemporaryTopic replyTopic, Queue myQueue, MessageProducer queueProducer) { message.setJMSReplyTo(replyTopic); - System.out.println("Sending " + message + " to: " + myQueue); queueProducer.send(message); } \ No newline at end of file diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/receiveMessages.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/receiveMessages.groovy index 6883f4e..8c4b131 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/receiveMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/receiveMessages.groovy @@ -38,10 +38,8 @@ connection.start() Message message = queueConsumer.receive(5000); GroovyRun.assertNotNull(message) session.commit(); -System.out.println("Received " + message + " from: " + myQueue); queueConsumer.close(); -System.out.println("Sending message to: " + message.getJMSReplyTo()); MessageProducer producer = session.createProducer(message.getJMSReplyTo()); message = session.createMessage(); producer.send(message); diff --git a/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/sendMessagesAddress.groovy b/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/sendMessagesAddress.groovy index 02f6137..e851e63 100644 --- a/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/sendMessagesAddress.groovy +++ b/tests/compatibility-tests/src/main/resources/jmsReplyToTopic/sendMessagesAddress.groovy @@ -41,15 +41,12 @@ MessageProducer queueProducer = session.createProducer(myQueue) queueProducer.setDeliveryMode(DeliveryMode.PERSISTENT); Message message = session.createMessage(); message.setJMSReplyTo(replyTopic); -System.out.println("Sending " + message + " to: " + myQueue); queueProducer.send(message); session.commit(); -System.out.println("Receiving message from: " + replyTopic); message = consumer.receive(10000); GroovyRun.assertNotNull(message); session.commit(); -System.out.println("Received message: " + message); connection.close(); senderLatch.countDown(); \ No newline at end of file diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java index eefa6a9..7467a43 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java @@ -99,7 +99,6 @@ public class HornetQSoakTest extends ClasspathBase { AtomicInteger runningConsumer1XArtemis = (AtomicInteger) evaluate(artemis1XClassLoader, "hqsoak/receiveMessages.groovy", "ARTEMIS1X", "" + numberOfConsumersArtemis, "" + totalMessagePerQueue); AtomicInteger runningConsumerHornetQ = (AtomicInteger) evaluate(hornetqClassLoader, "hqsoak/receiveMessages.groovy", "HORNETQ", "" + numberOfConsumersHornetQ, "" + totalMessagePerQueue); - System.out.println("Running producers"); AtomicInteger ranArtemisProducer = (AtomicInteger) evaluate(artemisClassLoader, "hqsoak/sendMessages.groovy", "ARTEMIS", "" + threadsProducerArtemis, "" + numberOfMessagesArtemis); AtomicInteger ranHornetQProducer = (AtomicInteger) evaluate(hornetqClassLoader, "hqsoak/sendMessages.groovy", "HORNETQ", "" + threadsProducerHornetQ, "" + numberOfMessagesHornetQ); diff --git a/tests/config/logging.properties b/tests/config/logging-CI.properties similarity index 74% copy from tests/config/logging.properties copy to tests/config/logging-CI.properties index ba74983..55188df 100644 --- a/tests/config/logging.properties +++ b/tests/config/logging-CI.properties @@ -15,29 +15,35 @@ # limitations under the License. # + +# This is the logger used only on CI environments + # Additional logger names to configure (root logger is always configured) # Root logger option loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests,org.apache.activemq.audit # Root logger level -logger.level=INFO +logger.level=WARN # ActiveMQ Artemis logger levels -logger.org.apache.activemq.artemis.core.server.level=INFO -logger.org.apache.activemq.artemis.journal.level=INFO -logger.org.apache.activemq.artemis.utils.level=INFO -logger.org.apache.activemq.artemis.jms.level=INFO -logger.org.apache.activemq.artemis.ra.level=INFO -logger.org.apache.activemq.artemis.tests.unit.level=INFO +logger.org.apache.activemq.artemis.core.server.level=WARN +logger.org.apache.activemq.artemis.journal.level=WARN +logger.org.apache.activemq.artemis.utils.level=WARN +logger.org.apache.activemq.artemis.jms.level=WARN +logger.org.apache.activemq.artemis.ra.level=WARN + logger.org.apache.activemq.artemis.tests.integration.level=INFO +logger.org.apache.activemq.artemis.tests.level=INFO +logger.org.apache.activemq.artemis.tests.unit.level=INFO logger.org.apache.activemq.artemis.jms.tests.level=INFO + # Root logger handlers logger.handlers=CONSOLE,TEST #logger.handlers=CONSOLE,FILE # to enable audit change the level to INFO logger.org.apache.activemq.audit.level=ERROR -logger.org.apache.activemq.audit.handlers=AUDIT_FILE +logger.org.apache.activemq.audit.handlers=CONSOLE,FILE logger.org.apache.activemq.audit.useParentHandlers=false # Console handler configuration @@ -64,17 +70,3 @@ handler.TEST.formatter=PATTERN formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter formatter.PATTERN.properties=pattern formatter.PATTERN.pattern=[%t] %d{HH:mm:ss,SSS} %-5p [%c] %s%E%n - -#Audit logger -handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.AUDIT_FILE.level=INFO -handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName -handler.AUDIT_FILE.suffix=.yyyy-MM-dd -handler.AUDIT_FILE.append=true -handler.AUDIT_FILE.autoFlush=true -handler.AUDIT_FILE.fileName=target/audit.log -handler.AUDIT_FILE.formatter=AUDIT_PATTERN - -formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter -formatter.AUDIT_PATTERN.properties=pattern -formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n diff --git a/tests/config/logging.properties b/tests/config/logging.properties index ba74983..6ec83e9 100644 --- a/tests/config/logging.properties +++ b/tests/config/logging.properties @@ -27,9 +27,12 @@ logger.org.apache.activemq.artemis.journal.level=INFO logger.org.apache.activemq.artemis.utils.level=INFO logger.org.apache.activemq.artemis.jms.level=INFO logger.org.apache.activemq.artemis.ra.level=INFO -logger.org.apache.activemq.artemis.tests.unit.level=INFO -logger.org.apache.activemq.artemis.tests.integration.level=INFO -logger.org.apache.activemq.artemis.jms.tests.level=INFO + +logger.org.apache.activemq.artemis.tests.integration.level=DEBUG +logger.org.apache.activemq.artemis.tests.level=DEBUG +logger.org.apache.activemq.artemis.tests.unit.level=DEBUG +logger.org.apache.activemq.artemis.jms.tests.level=DEBUG + # Root logger handlers logger.handlers=CONSOLE,TEST @@ -37,7 +40,7 @@ logger.handlers=CONSOLE,TEST # to enable audit change the level to INFO logger.org.apache.activemq.audit.level=ERROR -logger.org.apache.activemq.audit.handlers=AUDIT_FILE +logger.org.apache.activemq.audit.handlers=CONSOLE,FILE logger.org.apache.activemq.audit.useParentHandlers=false # Console handler configuration @@ -64,17 +67,3 @@ handler.TEST.formatter=PATTERN formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter formatter.PATTERN.properties=pattern formatter.PATTERN.pattern=[%t] %d{HH:mm:ss,SSS} %-5p [%c] %s%E%n - -#Audit logger -handler.AUDIT_FILE=org.jboss.logmanager.handlers.PeriodicRotatingFileHandler -handler.AUDIT_FILE.level=INFO -handler.AUDIT_FILE.properties=suffix,append,autoFlush,fileName -handler.AUDIT_FILE.suffix=.yyyy-MM-dd -handler.AUDIT_FILE.append=true -handler.AUDIT_FILE.autoFlush=true -handler.AUDIT_FILE.fileName=target/audit.log -handler.AUDIT_FILE.formatter=AUDIT_PATTERN - -formatter.AUDIT_PATTERN=org.jboss.logmanager.formatters.PatternFormatter -formatter.AUDIT_PATTERN.properties=pattern -formatter.AUDIT_PATTERN.pattern=%d [AUDIT](%t) %s%E%n diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java index e6d29c6..3e97dfc 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BMFailoverTest.java @@ -46,6 +46,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -53,6 +54,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class BMFailoverTest extends FailoverTestBase { + private static final Logger log = Logger.getLogger(BMFailoverTest.class); private ServerLocator locator; private ClientSessionFactoryInternal sf; @@ -198,7 +200,7 @@ public class BMFailoverTest extends FailoverTestBase { assertNotNull(m); - System.out.println("********************" + m.getIntProperty("counter")); + log.debug("********************" + m.getIntProperty("counter")); //the mdb would ack the message before calling onMessage() m.acknowledge(); @@ -232,7 +234,7 @@ public class BMFailoverTest extends FailoverTestBase { //the mdb would ack the message before calling onMessage() m.acknowledge(); - System.out.println("********************" + m.getIntProperty("counter")); + log.debug("********************" + m.getIntProperty("counter")); xaSessionRec.getXAResource().end(xidRec, XAResource.TMSUCCESS); xaSessionRec.getXAResource().prepare(xidRec); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java index 44150cb..548e0a6 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java @@ -45,6 +45,7 @@ import org.apache.activemq.artemis.utils.ReusableLatch; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,6 +55,7 @@ import org.junit.runner.RunWith; */ @RunWith(BMUnitRunner.class) public class ConcurrentDeliveryCancelTest extends JMSTestBase { + private static final Logger log = Logger.getLogger(ConcurrentDeliveryCancelTest.class); // used to wait the thread to align at the same place and create the race private static final ReusableLatch latchEnter = new ReusableLatch(2); @@ -89,7 +91,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { action = "org.apache.activemq.artemis.tests.extras.byteman.ConcurrentDeliveryCancelTest.enterCancel();")}) public void testConcurrentCancels() throws Exception { - System.out.println(server.getConfiguration().getJournalLocation().toString()); + log.debug(server.getConfiguration().getJournalLocation().toString()); server.getAddressSettingsRepository().clear(); AddressSettings settings = new AddressSettings(); settings.setMaxDeliveryAttempts(-1); @@ -98,9 +100,9 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { cf.setReconnectAttempts(0); cf.setRetryInterval(10); - System.out.println("....."); + log.debug("....."); for (ServerSession srvSess : server.getSessions()) { - System.out.println(srvSess); + log.debug(srvSess); } String queueName = RandomUtil.randomString(); @@ -142,14 +144,14 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { Assert.assertNotNull(consumer.receiveNoWait()); } - System.out.println("....."); + log.debug("....."); final List serverSessions = new LinkedList<>(); // We will force now the failure simultaneously from several places for (ServerSession srvSess : server.getSessions()) { if (srvSess.getMetaData("theSession") != null) { - System.out.println(srvSess); + log.debug(srvSess); serverSessions.add(srvSess); } } @@ -166,9 +168,9 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { @Override public void run() { try { - System.out.println(Thread.currentThread().getName() + " closing consumer"); + log.debug(Thread.currentThread().getName() + " closing consumer"); consumer.close(); - System.out.println(Thread.currentThread().getName() + " closed consumer"); + log.debug(Thread.currentThread().getName() + " closed consumer"); } catch (Exception e) { e.printStackTrace(); } @@ -179,7 +181,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { @Override public void run() { for (ServerSession sess : serverSessions) { - System.out.println("Thread " + Thread.currentThread().getName() + " starting"); + log.debug("Thread " + Thread.currentThread().getName() + " starting"); try { // A session.close could sneak in through failover or some other scenarios. // a call to RemotingConnection.fail wasn't replicating the issue. @@ -188,7 +190,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { } catch (Exception e) { e.printStackTrace(); } - System.out.println("Thread " + Thread.currentThread().getName() + " done"); + log.debug("Thread " + Thread.currentThread().getName() + " done"); } } }); @@ -239,10 +241,10 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase { for (int i = 0; i < numberOfMessages; i++) { AtomicInteger count = mapCount.get(i); if (count == null) { - System.out.println("Message " + i + " not received"); + log.debug("Message " + i + " not received"); failed = true; } else if (count.get() > 1) { - System.out.println("Message " + i + " received " + count.get() + " times"); + log.debug("Message " + i + " received " + count.get() + " times"); failed = true; } } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/FileLockNodeManagerTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/FileLockNodeManagerTest.java index 16d4bbc..519cb63 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/FileLockNodeManagerTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/FileLockNodeManagerTest.java @@ -24,12 +24,14 @@ import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class FileLockNodeManagerTest { + private static final Logger log = Logger.getLogger(FileLockNodeManagerTest.class); private static final int TIMEOUT_TOLERANCE = 50; @@ -59,7 +61,7 @@ public class FileLockNodeManagerTest { protected void assertMeasuredTimeoutFor(long lockAcquisitionTimeout) throws Exception { long realTimeout = measureLockAcquisisionTimeout(lockAcquisitionTimeout); - System.out.println(String.format("lockAcquisisionTimeout: %d ms, measured timeout: %d ms", lockAcquisitionTimeout, realTimeout)); + log.debug(String.format("lockAcquisisionTimeout: %d ms, measured timeout: %d ms", lockAcquisitionTimeout, realTimeout)); Assert.assertTrue(String.format("Timeout %d ms was larger than expected %d ms", realTimeout, lockAcquisitionTimeout + TIMEOUT_TOLERANCE), lockAcquisitionTimeout + TIMEOUT_TOLERANCE >= realTimeout); Assert.assertTrue(String.format("Timeout %d ms was lower than expected %d ms", realTimeout, lockAcquisitionTimeout), diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java index 137eb82..477d5da 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/GroupingTest.java @@ -32,6 +32,7 @@ import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,6 +42,7 @@ import org.junit.runner.RunWith; */ @RunWith(BMUnitRunner.class) public class GroupingTest extends JMSTestBase { + private static final Logger log = Logger.getLogger(GroupingTest.class); private Queue queue; static boolean pause = false; @@ -149,12 +151,12 @@ public class GroupingTest extends JMSTestBase { public static void pause() { if (pause) { try { - System.out.println("pausing after rollback"); + log.debug("pausing after rollback"); Thread.sleep(500); } catch (InterruptedException e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } - System.out.println("finished pausing after rollback"); + log.debug("finished pausing after rollback"); } } } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageReplicationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageReplicationTest.java index 9af81b8..7c75971 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageReplicationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageReplicationTest.java @@ -42,13 +42,14 @@ import org.apache.activemq.artemis.tests.integration.cluster.failover.FailoverTe import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class LargeMessageReplicationTest extends FailoverTestBase { - + private static final Logger log = Logger.getLogger(LargeMessageReplicationTest.class); private static final String DIVERT_ADDRESS = "jms.queue.testQueue"; private static final String DIVERT_FORWARD_ADDRESS = "jms.queue.divertedQueue"; @@ -184,7 +185,7 @@ public class LargeMessageReplicationTest extends FailoverTestBase { } private static void copyThread() { - System.out.println("_************************ " + Thread.currentThread().getId()); + log.debug("_************************ " + Thread.currentThread().getId()); copyThread.set(Thread.currentThread().getId()); } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java index 5257833..d855990 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LatencyTest.java @@ -40,7 +40,7 @@ public class LatencyTest extends ActiveMQTestBase { targetClass = "org.jboss.netty.bootstrap.ClientBootstrap", targetMethod = "connect", targetLocation = "ENTRY", - action = "System.out.println(\"netty connecting\")"), @BMRule( + action = "log.debug(\"netty connecting\")"), @BMRule( name = "sleep OioWorker.run", targetClass = "org.jboss.netty.channel.socket.oio.OioWorker", targetMethod = "run", diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LoggingActiveMQServerPluginOpenWireTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LoggingActiveMQServerPluginOpenWireTest.java index b71b0df..a7ffc4c 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LoggingActiveMQServerPluginOpenWireTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LoggingActiveMQServerPluginOpenWireTest.java @@ -26,6 +26,7 @@ import org.apache.activemq.artemis.core.server.plugin.impl.LoggingActiveMQServer import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,6 +40,7 @@ import org.junit.runner.RunWith; */ @RunWith(BMUnitRunner.class) public class LoggingActiveMQServerPluginOpenWireTest extends LoggingActiveMQServerPluginTest { + private static final Logger log = Logger.getLogger(LoggingActiveMQServerPluginOpenWireTest.class); /** * Aim: test queue creation are logged when plugin configured with @@ -157,8 +159,8 @@ public class LoggingActiveMQServerPluginOpenWireTest extends LoggingActiveMQServ Thread.sleep(500); - for (String log : unexpectedLogs) { - System.out.println(" others events logged >>>>" + log); + for (String logline : unexpectedLogs) { + log.debug(" others events logged >>>>" + logline); } assertEquals("created connections", 2, createdConnectionLogs.size()); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ManagementExceptionHandlingTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ManagementExceptionHandlingTest.java index fe1d9d3..3712f45 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ManagementExceptionHandlingTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ManagementExceptionHandlingTest.java @@ -30,6 +30,7 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,6 +38,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class ManagementExceptionHandlingTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(ManagementExceptionHandlingTest.class); protected ActiveMQServer server = null; @@ -89,7 +91,7 @@ public class ManagementExceptionHandlingTest extends ActiveMQTestBase { public void testAddressControl() throws Exception { server.getActiveMQServerControl().createAddress("test.address", "ANYCAST"); MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - System.out.println("server is " + mbs); + log.debug("server is " + mbs); ObjectName objectName = new ObjectName("org.apache.activemq.artemis:broker=\"localhost\",component=addresses,address=\"test.address\""); Object[] params = new Object[] {new HashMap(), 3, "aGVsbG8=", true, null, null}; String[] signature = new String[] {"java.util.Map", "int", "java.lang.String", "boolean", "java.lang.String", "java.lang.String"}; diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java index a162570..01b6589 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java @@ -109,7 +109,7 @@ public class OrphanedConsumerTest extends ActiveMQTestBase { targetMethod = "close", targetLocation = "AT EXIT", condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()", - action = "System.out.println(\"throwing stuff\");throw new InterruptedException()"), @BMRule( + action = "log.debug(\"throwing stuff\");throw new InterruptedException()"), @BMRule( name = "closeEnter", targetClass = "org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl", targetMethod = "close", @@ -136,7 +136,7 @@ public class OrphanedConsumerTest extends ActiveMQTestBase { targetMethod = "close", targetLocation = "AT EXIT", condition = "org.apache.activemq.artemis.tests.extras.byteman.OrphanedConsumerTest.isConditionActive()", - action = "System.out.println(\"throwing stuff\");throw new InterruptedException()"), @BMRule( + action = "log.debug(\"throwing stuff\");throw new InterruptedException()"), @BMRule( name = "closeEnter", targetClass = "org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl", targetMethod = "close", diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java index 834b88a..da3294d 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java @@ -39,6 +39,7 @@ import org.apache.activemq.artemis.tests.util.Wait; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,6 +47,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class PagingLeakTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(PagingLeakTest.class); private static final AtomicInteger pagePosInstances = new AtomicInteger(0); @@ -76,7 +78,7 @@ public class PagingLeakTest extends ActiveMQTestBase { targetLocation = "ENTRY", action = "org.apache.activemq.artemis.tests.extras.byteman.PagingLeakTest.deletePosition()")}) public void testValidateLeak() throws Throwable { - System.out.println("location::" + getBindingsDir()); + log.debug("location::" + getBindingsDir()); List positions = new ArrayList<>(); @@ -166,7 +168,7 @@ public class PagingLeakTest extends ActiveMQTestBase { } if (i % 1000 == 0) { - System.out.println("Consumed " + i + " events in " + (System.currentTimeMillis() - lastTime)); + log.debug("Consumed " + i + " events in " + (System.currentTimeMillis() - lastTime)); lastTime = System.currentTimeMillis(); } } @@ -194,7 +196,7 @@ public class PagingLeakTest extends ActiveMQTestBase { producer.send(msg); if (i == 100) { - System.out.println("Starting consumers!!!"); + log.debug("Starting consumers!!!"); consumer1.start(); consumer2.start(); } @@ -205,7 +207,7 @@ public class PagingLeakTest extends ActiveMQTestBase { } - System.out.println("Sent " + numberOfMessages); + log.debug("Sent " + numberOfMessages); consumer1.join(); consumer2.join(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java index 3888a3e..3d3dc71 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java @@ -41,6 +41,7 @@ import org.apache.activemq.artemis.utils.ReusableLatch; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -53,6 +54,7 @@ import org.junit.runner.RunWith; */ @RunWith(BMUnitRunner.class) public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(RaceOnSyncLargeMessageOverReplication2Test.class); public static int messageChunkCount = 0; @@ -84,7 +86,7 @@ public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase public void setUp() throws Exception { super.setUp(); - System.out.println("Tmp::" + getTemporaryDir()); + log.debug("Tmp::" + getTemporaryDir()); flagChunkEntered.setCount(1); flagChunkWait.setCount(1); @@ -211,7 +213,7 @@ public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase t.join(5000); - System.out.println("Thread joined"); + log.debug("Thread joined"); Assert.assertFalse(t.isAlive()); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java index 162c4d1..e5d60b3 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java @@ -40,6 +40,7 @@ import org.apache.activemq.artemis.utils.ReusableLatch; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -51,6 +52,7 @@ import org.junit.runner.RunWith; */ @RunWith(BMUnitRunner.class) public class RaceOnSyncLargeMessageOverReplicationTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(RaceOnSyncLargeMessageOverReplicationTest.class); private static ActiveMQServer backupServer; private static ActiveMQServer liveServer; @@ -75,7 +77,7 @@ public class RaceOnSyncLargeMessageOverReplicationTest extends ActiveMQTestBase public void setUp() throws Exception { super.setUp(); - System.out.println("Tmp::" + getTemporaryDir()); + log.debug("Tmp::" + getTemporaryDir()); flagArrived.setCount(1); flagWait.setCount(1); @@ -196,7 +198,7 @@ public class RaceOnSyncLargeMessageOverReplicationTest extends ActiveMQTestBase t.join(5000); - System.out.println("Thread joined"); + log.debug("Thread joined"); Assert.assertFalse(t.isAlive()); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java index 20b9aab..4ccb6f9 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownFailoverTest.java @@ -26,6 +26,7 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -33,6 +34,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class ScaleDownFailoverTest extends ClusterTestBase { + private static final Logger log = Logger.getLogger(ScaleDownFailoverTest.class); protected static int stopCount = 0; private static ActiveMQServer[] staticServers; @@ -159,7 +161,7 @@ public class ScaleDownFailoverTest extends ClusterTestBase { if (transportConfiguration.getParams().get(TransportConstants.PORT_PROP_NAME).equals(tc.getParams().get(TransportConstants.PORT_PROP_NAME))) { activeMQServer.stop(); stopCount++; - System.out.println("Stopping server listening at: " + tc.getParams().get(TransportConstants.PORT_PROP_NAME)); + log.debug("Stopping server listening at: " + tc.getParams().get(TransportConstants.PORT_PROP_NAME)); } } } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java index 03f3e19..995e7ab 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StartStopDeadlockTest.java @@ -31,6 +31,7 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,6 +40,7 @@ import org.junit.runner.RunWith; */ @RunWith(BMUnitRunner.class) public class StartStopDeadlockTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(StartStopDeadlockTest.class); /* * simple test to make sure connect still works with some network latency built into netty @@ -52,7 +54,7 @@ public class StartStopDeadlockTest extends ActiveMQTestBase { targetMethod = "initialisePart2", targetLocation = "ENTRY", condition = "incrementCounter(\"server-Init\") == 2", - action = "System.out.println(\"server backup init\"), waitFor(\"start-init\")"), @BMRule( + action = "log.debug(\"server backup init\"), waitFor(\"start-init\")"), @BMRule( name = "JMSServer.stop wait-init", targetClass = "org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl", targetMethod = "stop", @@ -91,7 +93,7 @@ public class StartStopDeadlockTest extends ActiveMQTestBase { try { align.countDown(); startLatch.await(); - System.out.println("Crashing...."); + log.debug("Crashing...."); serverLive.fail(true); } catch (Exception e) { errors.incrementAndGet(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/critical/analyzer/FileSystemSyncBlockedTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/critical/analyzer/FileSystemSyncBlockedTest.java index 5506da6..c717f9f 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/critical/analyzer/FileSystemSyncBlockedTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/critical/analyzer/FileSystemSyncBlockedTest.java @@ -24,12 +24,14 @@ import javax.jms.Session; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) public class FileSystemSyncBlockedTest extends CriticalAnalyzerFaultInjectionTestBase { + private static final Logger log = Logger.getLogger(FileSystemSyncBlockedTest.class); @BMRules(rules = {@BMRule(name = "Simulate Slow Disk Sync", targetClass = "org.apache.activemq.artemis.core.io.nio.NIOSequentialFile", targetMethod = "sync", targetLocation = "ENTRY", condition = "!flagged(\"testSlowDiskSync\")", // Once the server shutdowns we stop applying this rule. action = "waitFor(\"testSlowDiskSync\")"), @BMRule( @@ -57,7 +59,7 @@ public class FileSystemSyncBlockedTest extends CriticalAnalyzerFaultInjectionTes // if you have more than 100 components, then you have a leak! Assert.assertTrue(server.getStorageManager().getJournalSequentialFileFactory().getCriticalAnalyzer().getNumberOfComponents() < 10); - System.out.println("Number of components:" + server.getStorageManager().getJournalSequentialFileFactory().getCriticalAnalyzer().getNumberOfComponents()); + log.debug("Number of components:" + server.getStorageManager().getJournalSequentialFileFactory().getCriticalAnalyzer().getNumberOfComponents()); } } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java index 6b02791..9721f45 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java @@ -58,7 +58,6 @@ import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; import org.apache.activemq.artemis.jms.client.ActiveMQMessage; import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; @@ -66,8 +65,6 @@ import org.junit.Before; public abstract class BridgeTestBase extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - protected ConnectionFactoryFactory cff0, cff1; protected ConnectionFactoryFactory cff0xa, cff1xa; @@ -396,8 +393,6 @@ public abstract class BridgeTestBase extends ActiveMQTestBase { // but you still might get some depending on how/where the crash occurred } - BridgeTestBase.log.trace("Check complete"); - } finally { if (conn != null) { conn.close(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/FailingTransactionManager.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/FailingTransactionManager.java index e124b06..5e96101 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/FailingTransactionManager.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/FailingTransactionManager.java @@ -31,12 +31,9 @@ import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; public class FailingTransactionManager implements TransactionManager { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private final TransactionManager tm; private int calls; private final int limit; @@ -126,7 +123,6 @@ public class FailingTransactionManager implements TransactionManager { } else { int fails = failures.incrementAndGet(); RollbackException ex = new RollbackException("Expected rollback for test"); - log.tracef(ex, "We are about to fail commit for %s th time", fails); throw ex; } } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java index fc8b166..d13f7b7 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeClusteredTest.java @@ -24,6 +24,7 @@ import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory; import org.apache.activemq.artemis.jms.bridge.DestinationFactory; import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode; import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; @@ -33,6 +34,7 @@ import org.junit.Test; * Tests of jms bridge using HA connection factories. */ public class JMSBridgeClusteredTest extends ClusteredBridgeTestBase { + private static final Logger log = Logger.getLogger(JMSBridgeClusteredTest.class); private ServerGroup sourceServer; private ServerGroup targetServer; @@ -103,7 +105,7 @@ public class JMSBridgeClusteredTest extends ClusteredBridgeTestBase { //start the bridge bridge.start(); - System.out.println("started bridge"); + log.debug("started bridge"); final int NUM_MESSAGES = batchSize / 2; diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java index 4d101cc..72f9475 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java @@ -32,20 +32,16 @@ import org.apache.activemq.artemis.jms.bridge.ConnectionFactoryFactory; import org.apache.activemq.artemis.jms.bridge.QualityOfServiceMode; import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl; import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.ra.DummyTransactionManager; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; public class JMSBridgeReconnectionTest extends BridgeTestBase { + private static final Logger log = Logger.getLogger(JMSBridgeReconnectionTest.class); - /** - * - */ private static final int TIME_WAIT = 5000; - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - // Crash and reconnect // Once and only once @@ -185,17 +181,17 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase { // Now crash the dest server - JMSBridgeReconnectionTest.log.info("About to crash server"); + instanceLog.debug("About to crash server"); server1.stop(); // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + instanceLog.debug("Waiting 5 secs before bringing server back up"); Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); + instanceLog.debug("Done wait"); // Restart the server - JMSBridgeReconnectionTest.log.info("Restarting server"); + instanceLog.debug("Restarting server"); server1.start(); // jmsServer1.createQueue(false, "targetQueue", null, true, "queue/targetQueue"); @@ -206,17 +202,17 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase { // Send some more messages - JMSBridgeReconnectionTest.log.info("Sending more messages"); + instanceLog.debug("Sending more messages"); sendMessages(cf0, sourceQueue, NUM_MESSAGES / 2, NUM_MESSAGES / 2, persistent, largeMessage); - JMSBridgeReconnectionTest.log.info("Sent messages"); + instanceLog.debug("Sent messages"); server1.stop(); bridge.stop(); - System.out.println("JMSBridgeReconnectionTest.performCrashAndReconnectDestBasic"); + log.debug("JMSBridgeReconnectionTest.performCrashAndReconnectDestBasic"); } @Test @@ -246,14 +242,14 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase { checkAllMessageReceivedInOrder(cf1, targetQueue, 0, 1, false); - JMSBridgeReconnectionTest.log.info("About to crash server"); + instanceLog.debug("About to crash server"); server1.stop(); // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + instanceLog.debug("Waiting 5 secs before bringing server back up"); Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); + instanceLog.debug("Done wait"); bridge.stop(); @@ -301,7 +297,7 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase { // Now crash the dest server - JMSBridgeReconnectionTest.log.info("About to crash server"); + instanceLog.debug("About to crash server"); server1.stop(); @@ -309,9 +305,9 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase { server1.start(); } // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + instanceLog.debug("Waiting 5 secs before bringing server back up"); Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); + instanceLog.debug("Done wait"); bridge.stop(); @@ -394,14 +390,14 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase { // Now crash the dest server - JMSBridgeReconnectionTest.log.info("About to crash server"); + instanceLog.debug("About to crash server"); server1.stop(); // Wait a while before starting up to simulate the dest being down for a while - JMSBridgeReconnectionTest.log.info("Waiting 5 secs before bringing server back up"); + instanceLog.debug("Waiting 5 secs before bringing server back up"); Thread.sleep(TIME_WAIT); - JMSBridgeReconnectionTest.log.info("Done wait"); + instanceLog.debug("Done wait"); // Restart the server server1.start(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java index af1f0fb..e42a8d7 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java @@ -49,9 +49,9 @@ import org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl; import org.apache.activemq.artemis.jms.client.ActiveMQMessage; import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory; import org.apache.activemq.artemis.service.extensions.ServiceUtils; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.ra.DummyTransactionManager; import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -59,7 +59,7 @@ import org.junit.rules.Timeout; public class JMSBridgeTest extends BridgeTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(JMSBridgeTest.class); @Rule public Timeout timeout = new Timeout(120000); @@ -390,7 +390,7 @@ public class JMSBridgeTest extends BridgeTestBase { } finally { if (bridge != null) { - JMSBridgeTest.log.info("Stopping bridge"); + instanceLog.debug("Stopping bridge"); bridge.stop(); } } @@ -815,7 +815,7 @@ public class JMSBridgeTest extends BridgeTestBase { try { started.rollback(); } catch (Exception e) { - JMSBridgeTest.log.error("Failed to rollback", e); + log.error("Failed to rollback", e); } } @@ -823,7 +823,7 @@ public class JMSBridgeTest extends BridgeTestBase { try { mgr.resume(toResume); } catch (Exception e) { - JMSBridgeTest.log.error("Failed to resume", e); + log.error("Failed to resume", e); } } if (bridge != null) { @@ -972,7 +972,7 @@ public class JMSBridgeTest extends BridgeTestBase { connTarget = cf1.createConnection(); - JMSBridgeTest.log.trace("Sending " + NUM_MESSAGES + " messages"); + log.trace("Sending " + NUM_MESSAGES + " messages"); List ids1 = new ArrayList<>(); @@ -1007,7 +1007,7 @@ public class JMSBridgeTest extends BridgeTestBase { ids1.add(tm.getJMSMessageID()); } - JMSBridgeTest.log.trace("Sent the first messages"); + log.trace("Sent the first messages"); Session sessTarget = connTarget.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -1146,7 +1146,7 @@ public class JMSBridgeTest extends BridgeTestBase { connTarget = cf1.createConnection(); - JMSBridgeTest.log.trace("Sending " + NUM_MESSAGES + " messages"); + log.trace("Sending " + NUM_MESSAGES + " messages"); Session sessSource = connSource.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -1293,7 +1293,7 @@ public class JMSBridgeTest extends BridgeTestBase { connTarget = cf1.createConnection(); - JMSBridgeTest.log.trace("Sending " + NUM_MESSAGES + " messages"); + log.trace("Sending " + NUM_MESSAGES + " messages"); Session sessSource = connSource.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -1375,13 +1375,13 @@ public class JMSBridgeTest extends BridgeTestBase { // Now crash the dest server - JMSBridgeTest.log.info("About to crash server"); + instanceLog.debug("About to crash server"); server1.stop(); // Now stop the bridge while the failover is happening - JMSBridgeTest.log.info("About to stop the bridge"); + instanceLog.debug("About to stop the bridge"); bridge.stop(); @@ -1450,7 +1450,7 @@ public class JMSBridgeTest extends BridgeTestBase { try { connSource.close(); } catch (Exception e) { - JMSBridgeTest.log.error("Failed to close connection", e); + log.error("Failed to close connection", e); } } @@ -1518,7 +1518,7 @@ public class JMSBridgeTest extends BridgeTestBase { try { connSource.close(); } catch (Exception e) { - JMSBridgeTest.log.error("Failed to close connection", e); + log.error("Failed to close connection", e); } } @@ -1584,7 +1584,7 @@ public class JMSBridgeTest extends BridgeTestBase { try { connSource.close(); } catch (Exception e) { - JMSBridgeTest.log.error("Failed to close connection", e); + log.error("Failed to close connection", e); } } @@ -1644,7 +1644,7 @@ public class JMSBridgeTest extends BridgeTestBase { checkAllMessageReceivedInOrder(cf1, targetQueue, 0, NUM_MESSAGES - 1, false); } finally { if (bridge != null) { - JMSBridgeTest.log.info("Stopping bridge"); + instanceLog.debug("Stopping bridge"); bridge.stop(); } } @@ -1831,7 +1831,7 @@ public class JMSBridgeTest extends BridgeTestBase { final List sentMessages = new ArrayList<>(); final List receivedMessages = new ArrayList<>(); - log.info("Starting bridge " + bridge); + instanceLog.debug("Starting bridge " + bridge); bridge.start(); waitForComponent(bridge, 15); @@ -1850,7 +1850,7 @@ public class JMSBridgeTest extends BridgeTestBase { msg.setIntProperty("count", counter); producer.send(msg); sentMessages.add(msg); - log.info("Sent message with property counter: " + counter + ", messageId:" + msg.getJMSMessageID() + instanceLog.debug("Sent message with property counter: " + counter + ", messageId:" + msg.getJMSMessageID() + ((msg.getStringProperty("_AMQ_DUPL_ID") != null) ? ", _AMQ_DUPL_ID=" + msg.getStringProperty("_AMQ_DUPL_ID") : "")); counter++; Thread.sleep(200); @@ -1892,7 +1892,7 @@ public class JMSBridgeTest extends BridgeTestBase { if (msg != null) { msg.acknowledge(); receivedMessages.add(msg); - log.info("Received message with messageId: " + msg.getJMSMessageID() + + instanceLog.debug("Received message with messageId: " + msg.getJMSMessageID() + " and property counter " + msg.getIntProperty("count")); } else { running = false; @@ -1916,16 +1916,16 @@ public class JMSBridgeTest extends BridgeTestBase { } }); - log.info("Starting producer thread..."); + instanceLog.debug("Starting producer thread..."); producerThread.start(); Assert.assertTrue(waitForMessages(server1, targetQueue.getQueueName(), NUM_MESSAGES / 100, 250000)); - log.info("Stopping bridge " + bridge); + instanceLog.debug("Stopping bridge " + bridge); bridge.stop(); Thread.sleep(5000); - log.info("Starting bridge " + bridge + " again"); + instanceLog.debug("Starting bridge " + bridge + " again"); bridge.start(); waitForComponent(bridge, 15); @@ -1933,13 +1933,13 @@ public class JMSBridgeTest extends BridgeTestBase { - log.info("Starting consumer thread..."); + instanceLog.debug("Starting consumer thread..."); consumerThread.start(); - log.info("Waiting for the consumer thread to die..."); + instanceLog.debug("Waiting for the consumer thread to die..."); consumerThread.join(); - log.info("Waiting for the producer thread to die..."); + instanceLog.debug("Waiting for the producer thread to die..."); producerThread.join(); bridge.stop(); @@ -1977,7 +1977,7 @@ public class JMSBridgeTest extends BridgeTestBase { } } } - log.info("Number of messages in queue " + queueName + " on server: " + server + " is: " + count); + log.debug("Number of messages in queue " + queueName + " on server: " + server + " is: " + count); return count; } @@ -1987,7 +1987,7 @@ public class JMSBridgeTest extends BridgeTestBase { long count = 0; while ((count = countMessagesInQueue(server, queueName)) < numberOfMessages) { - log.info("Total number of messages in queue: " + queueName + " on server " + server + " is " + count); + log.debug("Total number of messages in queue: " + queueName + " on server " + server + " is " + count); Thread.sleep(5000); if (System.currentTimeMillis() - startTime > timeout) { log.warn(numberOfMessages + " not on server " + server + " in timeout " + timeout + "ms."); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java index a4b9db0..66607fd 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java @@ -58,6 +58,7 @@ import org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.integration.ra.ActiveMQRATestBase; import org.apache.activemq.artemis.utils.RandomUtil; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -67,6 +68,7 @@ import org.junit.Test; * Simulates several messages being received over multiple instances with reconnects during the process. */ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase { + private static final Logger log = Logger.getLogger(MDBMultipleHandlersServerDisconnectTest.class); final ConcurrentHashMap mapCounter = new ConcurrentHashMap<>(); @@ -228,7 +230,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase if (playServerClosingSession && serverSessions.size() > 0) { int randomBother = RandomUtil.randomInterval(0, serverSessions.size() - 1); - System.out.println("bugging session " + randomBother); + log.debug("bugging session " + randomBother); ServerSession serverSession = serverSessions.get(randomBother); @@ -278,19 +280,19 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase } if (i == NUMBER_OF_MESSAGES * 0.90) { - System.out.println("Disabled failures at " + i); + log.debug("Disabled failures at " + i); playTXTimeouts = false; playServerClosingSession = false; playServerClosingConsumer = false; } - System.out.println("Received " + i + " messages"); + log.debug("Received " + i + " messages"); doReceiveMessage(message); if (i % 200 == 0) { - System.out.println("received " + i); + log.debug("received " + i); session.commit(); } } @@ -303,7 +305,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase break; } - System.out.println("Received extra message " + message); + log.debug("Received extra message " + message); doReceiveMessage(message); } @@ -338,15 +340,12 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase session.close(); if (failed) { - for (int i = 0; i < 10; i++) { - System.out.println("----------------------------------------------------"); - } - System.out.println(writer.toString()); + log.debug(writer.toString()); } Assert.assertFalse(writer.toString(), failed); - System.out.println("Received " + NUMBER_OF_MESSAGES + " messages"); + log.debug("Received " + NUMBER_OF_MESSAGES + " messages"); Assert.assertFalse("There was meta-data failures, some sessions didn't reconnect properly", metaDataFailed.get()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java index 5a8c23e..75bfc79 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java @@ -40,13 +40,14 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.transaction.impl.XidImpl; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class DuplicateDetectionTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private final Logger log = Logger.getLogger(this.getClass()); private ActiveMQServer server; @@ -390,7 +391,7 @@ public class DuplicateDetectionTest extends ActiveMQTestBase { Assert.assertEquals(i, message.getObjectProperty(propKey)); } - DuplicateDetectionTest.log.info("Now sending more"); + log.debug("Now sending more"); for (int i = 0; i < cacheSize; i++) { SimpleString dupID = new SimpleString("dupID" + i); @@ -785,13 +786,13 @@ public class DuplicateDetectionTest extends ActiveMQTestBase { message = consumer.receiveImmediate(); Assert.assertNull(message); - DuplicateDetectionTest.log.info("ending session"); + log.debug("ending session"); session.end(xid3, XAResource.TMSUCCESS); - DuplicateDetectionTest.log.info("preparing session"); + log.debug("preparing session"); session.prepare(xid3); - DuplicateDetectionTest.log.info("committing session"); + log.debug("committing session"); session.commit(xid3, false); } @@ -856,13 +857,13 @@ public class DuplicateDetectionTest extends ActiveMQTestBase { message = consumer.receiveImmediate(); Assert.assertNull(message); - DuplicateDetectionTest.log.info("ending session"); + log.debug("ending session"); session.end(xid3, XAResource.TMSUCCESS); - DuplicateDetectionTest.log.info("preparing session"); + log.debug("preparing session"); session.prepare(xid3); - DuplicateDetectionTest.log.info("committing session"); + log.debug("committing session"); session.commit(xid3, false); } @@ -926,13 +927,13 @@ public class DuplicateDetectionTest extends ActiveMQTestBase { message = consumer.receiveImmediate(); Assert.assertNull(message); - DuplicateDetectionTest.log.info("ending session"); + log.debug("ending session"); session.end(xid3, XAResource.TMSUCCESS); - DuplicateDetectionTest.log.info("preparing session"); + log.debug("preparing session"); session.prepare(xid3); - DuplicateDetectionTest.log.info("committing session"); + log.debug("committing session"); session.commit(xid3, false); } @@ -1143,13 +1144,13 @@ public class DuplicateDetectionTest extends ActiveMQTestBase { message = consumer.receiveImmediate(); Assert.assertNull(message); - DuplicateDetectionTest.log.info("ending session"); + log.debug("ending session"); session.end(xid3, XAResource.TMSUCCESS); - DuplicateDetectionTest.log.info("preparing session"); + log.debug("preparing session"); session.prepare(xid3); - DuplicateDetectionTest.log.info("committing session"); + log.debug("committing session"); session.commit(xid3, false); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/IntegrationTestLogger.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/IntegrationTestLogger.java deleted file mode 100644 index 80bd4d9..0000000 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/IntegrationTestLogger.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.tests.integration; - -import org.jboss.logging.BasicLogger; -import org.jboss.logging.Logger; -import org.jboss.logging.annotations.MessageLogger; - -@MessageLogger(projectCode = "AMQTEST") -public interface IntegrationTestLogger extends BasicLogger { - - /** - * The integration test logger. - */ - IntegrationTestLogger LOGGER = Logger.getMessageLogger(IntegrationTestLogger.class, IntegrationTestLogger.class.getPackage().getName()); -} diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java index 2e94aa5..ed03adb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java @@ -74,7 +74,6 @@ public class SimpleNotificationService implements NotificationService { @Override public void onNotification(final Notification notification) { - System.out.println(">>>>>>>>" + notification); notifications.add(notification); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java index 89246a5..ecefc24 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java @@ -98,7 +98,7 @@ public class AnycastTest extends ActiveMQTestBase { for (int j = 0; j < num / 2; j++) { ClientMessage m = consumers[i].receive(2000); assertNotNull(m); - System.out.println("consumer" + i + " received: " + m.getBodyBuffer().readString()); + instanceLog.debug("consumer" + i + " received: " + m.getBodyBuffer().readString()); } assertNull(consumers[i].receive(200)); @@ -157,7 +157,7 @@ public class AnycastTest extends ActiveMQTestBase { for (int j = 0; j < num / 2; j++) { ClientMessage m = consumers[i].receive(2000); assertNotNull(m); - System.out.println("consumer" + i + " received: " + m.getBodyBuffer().readString()); + instanceLog.debug("consumer" + i + " received: " + m.getBodyBuffer().readString()); } assertNull(consumers[i].receive(200)); @@ -173,7 +173,7 @@ public class AnycastTest extends ActiveMQTestBase { for (int j = 0; j < num / 2; j++) { ClientMessage m = consumers[i].receive(2000); assertNotNull(m); - System.out.println("consumer" + i + " received: " + m.getBodyBuffer().readString()); + instanceLog.debug("consumer" + i + " received: " + m.getBodyBuffer().readString()); } assertNull(consumers[i].receive(200)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java index e5e5187..0c6a953 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/MulticastTest.java @@ -98,7 +98,7 @@ public class MulticastTest extends ActiveMQTestBase { for (int j = 0; j < num; j++) { ClientMessage m = consumers[i].receive(2000); assertNotNull(m); - System.out.println("consumer" + i + " received: " + m.getBodyBuffer().readString()); + instanceLog.debug("consumer" + i + " received: " + m.getBodyBuffer().readString()); } assertNull(consumers[i].receive(200)); @@ -157,7 +157,7 @@ public class MulticastTest extends ActiveMQTestBase { for (int j = 0; j < num; j++) { ClientMessage m = consumers[i].receive(2000); assertNotNull(m); - System.out.println("consumer" + i + " received: " + m.getBodyBuffer().readString()); + instanceLog.debug("consumer" + i + " received: " + m.getBodyBuffer().readString()); } assertNull(consumers[i].receive(200)); @@ -173,7 +173,7 @@ public class MulticastTest extends ActiveMQTestBase { for (int j = 0; j < num; j++) { ClientMessage m = consumers[i].receive(2000); assertNotNull(m); - System.out.println("consumer" + i + " received: " + m.getBodyBuffer().readString()); + instanceLog.debug("consumer" + i + " received: " + m.getBodyBuffer().readString()); } assertNull(consumers[i].receive(200)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDLQReceiverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDLQReceiverTest.java index a95c908..a14fd92 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDLQReceiverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDLQReceiverTest.java @@ -45,23 +45,23 @@ public class AmqpDLQReceiverTest extends AmqpClientTestSupport { assertNotNull(queue); receiver.flow(100); for (int i = 0; i < 10; i++) { - System.out.println("i = " + i); + instanceLog.debug("i = " + i); AmqpMessage receive = receiver.receive(5000, TimeUnit.MILLISECONDS); receive.modified(true, false); Queue queueView = getProxyToQueue(getQueueName()); - System.out.println("receive = " + receive.getWrappedMessage().getDeliveryCount()); - System.out.println("queueView.getMessageCount() = " + queueView.getMessageCount()); - System.out.println("queueView.getDeliveringCount() = " + queueView.getDeliveringCount()); - System.out.println("queueView.getPersistentSize() = " + queueView.getPersistentSize()); + instanceLog.debug("receive = " + receive.getWrappedMessage().getDeliveryCount()); + instanceLog.debug("queueView.getMessageCount() = " + queueView.getMessageCount()); + instanceLog.debug("queueView.getDeliveringCount() = " + queueView.getDeliveringCount()); + instanceLog.debug("queueView.getPersistentSize() = " + queueView.getPersistentSize()); } receiver.close(); connection.close(); Thread.sleep(5000); Queue queueView = getProxyToQueue(getQueueName()); - System.out.println("queueView.getMessageCount() = " + queueView.getMessageCount()); - System.out.println("queueView.getDeliveringCount() = " + queueView.getDeliveringCount()); - System.out.println("queueView.getPersistentSize() = " + queueView.getPersistentSize()); + instanceLog.debug("queueView.getMessageCount() = " + queueView.getMessageCount()); + instanceLog.debug("queueView.getDeliveringCount() = " + queueView.getDeliveringCount()); + instanceLog.debug("queueView.getPersistentSize() = " + queueView.getPersistentSize()); Assert.assertEquals(0, queueView.getMessageCount()); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java index d659306..ed486c4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java @@ -341,7 +341,7 @@ public class AmqpDurableReceiverTest extends AmqpClientTestSupport { session.lookupSubscription(getSubscriptionName()); fail("Should throw an exception since there is not subscription"); } catch (Exception e) { - LOG.info("Error on lookup: {}", e.getMessage()); + LOG.debug("Error on lookup: {}", e.getMessage()); } connection.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlTest.java index d58ccb3..714c113 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlTest.java @@ -254,7 +254,6 @@ public class AmqpFlowControlTest extends JMSClientTestSupport { try { for (int i = 0; i < maxMessages; i++) { sender.send(message); - System.out.println("Sent " + i); sentMessages.getAndIncrement(); } timeout.countDown(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java index 95c99f1..dfdf7f5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFullyQualifiedNameTest.java @@ -184,7 +184,7 @@ public class AmqpFullyQualifiedNameTest extends JMSClientTestSupport { Bindings bindings = server.getPostOffice().getBindingsForAddress(multicastAddress); for (Binding b : bindings.getBindings()) { - System.out.println("checking binidng " + b.getUniqueName() + " " + ((LocalQueueBinding)b).getQueue().getDeliveringMessages()); + instanceLog.debug("checking binidng " + b.getUniqueName() + " " + ((LocalQueueBinding)b).getQueue().getDeliveringMessages()); SimpleString qName = b.getUniqueName(); //do FQQN query QueueQueryResult result = server.queueQuery(CompositeAddress.toFullyQualified(multicastAddress, qName)); @@ -266,7 +266,7 @@ public class AmqpFullyQualifiedNameTest extends JMSClientTestSupport { producer3.send(session.createMessage()); assertTrue(Wait.waitFor(() -> server.locateQueue(anycastQ3).getMessageCount() == 5, 2000, 200)); - System.out.println("Queue is: " + q1); + instanceLog.debug("Queue is: " + q1); MessageConsumer consumer1 = session.createConsumer(q1); MessageConsumer consumer2 = session.createConsumer(q2); MessageConsumer consumer3 = session.createConsumer(q3); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java index aca1cda..fef11bf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpInboundConnectionTest.java @@ -285,7 +285,7 @@ public class AmqpInboundConnectionTest extends AmqpClientTestSupport { connection2.connect(); fail("Should not be able to connect with same container Id."); } catch (Exception ex) { - LOG.info("Second connection with same container Id failed as expected."); + LOG.debug("Second connection with same container Id failed as expected."); } connection2.getStateInspector().assertValid(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java index 304ce7c..cc94067 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java @@ -236,7 +236,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { if (wrapped.getBody() instanceof Data) { // converters can change this to AmqValue Data data = (Data) wrapped.getBody(); - System.out.println("received : message: " + data.getValue().getLength()); + instanceLog.debug("received : message: " + data.getValue().getLength()); assertEquals(PAYLOAD, data.getValue().getLength()); } message.accept(); @@ -290,7 +290,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { MessageImpl wrapped = (MessageImpl) message.getWrappedMessage(); if (wrapped.getBody() instanceof Data) { Data data = (Data) wrapped.getBody(); - System.out.println("received : message: " + data.getValue().getLength()); + instanceLog.debug("received : message: " + data.getValue().getLength()); assertEquals(PAYLOAD, data.getValue().getLength()); } @@ -397,7 +397,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { } public void doTestSendLargeMessage(int expectedSize) throws Exception { - LOG.info("doTestSendLargeMessage called with expectedSize " + expectedSize); + LOG.debug("doTestSendLargeMessage called with expectedSize " + expectedSize); byte[] payload = createLargePayload(expectedSize); assertEquals(expectedSize, payload.length); @@ -417,12 +417,12 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { producer.send(message); long endTime = System.currentTimeMillis(); - LOG.info("Returned from send after {} ms", endTime - startTime); + LOG.debug("Returned from send after {} ms", endTime - startTime); startTime = System.currentTimeMillis(); MessageConsumer consumer = session.createConsumer(queue); connection.start(); - LOG.info("Calling receive"); + LOG.debug("Calling receive"); Message received = consumer.receive(); assertNotNull(received); assertTrue(received instanceof BytesMessage); @@ -430,7 +430,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { assertNotNull(bytesMessage); endTime = System.currentTimeMillis(); - LOG.info("Returned from receive after {} ms", endTime - startTime); + LOG.debug("Returned from receive after {} ms", endTime - startTime); byte[] bytesReceived = new byte[expectedSize]; assertEquals(expectedSize, bytesMessage.readBytes(bytesReceived, expectedSize)); assertTrue(Arrays.equals(payload, bytesReceived)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpPresettledReceiverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpPresettledReceiverTest.java index 7fb9069..f28a286 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpPresettledReceiverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpPresettledReceiverTest.java @@ -66,7 +66,7 @@ public class AmqpPresettledReceiverTest extends AmqpClientTestSupport { receiver1.close(); receiver2.close(); - System.out.println("Message Count after all consumed: " + queueView.getMessageCount()); + instanceLog.debug("Message Count after all consumed: " + queueView.getMessageCount()); // Should be nothing left on the Queue AmqpReceiver receiver3 = session.createReceiver(getQueueName()); @@ -74,7 +74,7 @@ public class AmqpPresettledReceiverTest extends AmqpClientTestSupport { AmqpMessage received = receiver3.receive(5, TimeUnit.SECONDS); if (received != null) { - System.out.println("Message read: " + received.getMessageId()); + instanceLog.debug("Message read: " + received.getMessageId()); } assertNull(received); @@ -103,14 +103,14 @@ public class AmqpPresettledReceiverTest extends AmqpClientTestSupport { } receiver.close(); - System.out.println("Message Count after all consumed: " + queueView.getMessageCount()); + instanceLog.debug("Message Count after all consumed: " + queueView.getMessageCount()); // Open a new receiver and see if any message are left on the Queue receiver = session.createReceiver(getQueueName()); receiver.flow(1); AmqpMessage received = receiver.receive(5, TimeUnit.SECONDS); if (received != null) { - System.out.println("Message read: " + received.getMessageId()); + instanceLog.debug("Message read: " + received.getMessageId()); } assertNull(received); @@ -155,14 +155,14 @@ public class AmqpPresettledReceiverTest extends AmqpClientTestSupport { receiver.close(); - System.out.println("Message Count after all consumed: " + queueView.getMessageCount()); + instanceLog.debug("Message Count after all consumed: " + queueView.getMessageCount()); // Open a new receiver and see if any message are left on the Queue receiver = session.createReceiver(getQueueName()); receiver.flow(1); AmqpMessage received = receiver.receive(5, TimeUnit.SECONDS); if (received != null) { - System.out.println("Message read: " + received.getMessageId()); + instanceLog.debug("Message read: " + received.getMessageId()); } assertNull(received); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpProtocolHeaderHandlingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpProtocolHeaderHandlingTest.java index e16fd46..90afa19 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpProtocolHeaderHandlingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpProtocolHeaderHandlingTest.java @@ -22,7 +22,6 @@ import java.io.OutputStream; import java.net.Socket; import java.util.concurrent.TimeUnit; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.Wait; import org.fusesource.hawtbuf.Buffer; import org.junit.Test; @@ -50,7 +49,6 @@ public class AmqpProtocolHeaderHandlingTest extends AmqpClientTestSupport { AmqpHeader response = connection.readAmqpHeader(); assertNotNull(response); assertEquals(3, response.getProtocolId()); - IntegrationTestLogger.LOGGER.info("Broker responded with: " + response); // pump some bytes down the wire until broker closes the connection assertTrue("Broker should have closed client connection", Wait.waitFor(new Wait.Condition() { @@ -78,7 +76,6 @@ public class AmqpProtocolHeaderHandlingTest extends AmqpClientTestSupport { } public void send(AmqpHeader header) throws Exception { - IntegrationTestLogger.LOGGER.info("Client sending header: " + header); OutputStream outputStream = clientSocket.getOutputStream(); header.getBuffer().writeTo(outputStream); outputStream.flush(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDrainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDrainTest.java index 7cffe35..ee0012f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDrainTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDrainTest.java @@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.integration.amqp; import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; @@ -70,7 +69,7 @@ public class AmqpReceiverDrainTest extends AmqpClientTestSupport { for (int i = 0; i < MSG_COUNT; ++i) { AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); assertNotNull("Failed to read message: " + (i + 1), message); - IntegrationTestLogger.LOGGER.info("Read message: " + message.getMessageId()); + instanceLog.info("Read message: " + message.getMessageId()); message.accept(); } receiver.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverTest.java index 7d11d14..fe9e9e0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverTest.java @@ -31,7 +31,6 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; @@ -365,7 +364,6 @@ public class AmqpReceiverTest extends AmqpClientTestSupport { @Override public void inspectClosedResource(Session session) { - IntegrationTestLogger.LOGGER.info("Session closed: " + session.getContext()); } @Override @@ -375,7 +373,6 @@ public class AmqpReceiverTest extends AmqpClientTestSupport { @Override public void inspectClosedResource(Receiver receiver) { - IntegrationTestLogger.LOGGER.info("Receiver closed: " + receiver.getContext()); closed.set(true); } }); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java index 1e140c7..d8a2cf8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverWithFiltersTest.java @@ -148,7 +148,7 @@ public class AmqpReceiverWithFiltersTest extends AmqpClientTestSupport { for (int i = 0; i < NUM_MESSAGES / 2; ++i) { AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); Assert.assertNotNull(message); - System.out.println("Read message: " + message.getApplicationProperty("myNewID")); + instanceLog.debug("Read message: " + message.getApplicationProperty("myNewID")); assertNotNull(message); messages.add(message); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSecurityTest.java index c2cee06..911d1fd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSecurityTest.java @@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.integration.amqp; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; import org.apache.activemq.transport.amqp.client.AmqpMessage; @@ -119,7 +118,7 @@ public class AmqpSecurityTest extends AmqpClientTestSupport { session.createSender(getQueueName()); fail("Should not be able to consume here."); } catch (Exception ex) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } connection.getStateInspector().assertValid(); @@ -217,7 +216,7 @@ public class AmqpSecurityTest extends AmqpClientTestSupport { session.createReceiver(getQueueName()); fail("Should not be able to consume here."); } catch (Exception ex) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } connection.getStateInspector().assertValid(); @@ -254,7 +253,7 @@ public class AmqpSecurityTest extends AmqpClientTestSupport { session.createReceiver(getQueueName(getPrecreatedQueueSize() + 1)); fail("Should not be able to consume here."); } catch (Exception ex) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } connection.getStateInspector().assertValid(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java index d11faad..cb1db92 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java @@ -371,7 +371,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { sender.send(message); sender.close(); - LOG.info("Attempting to read message with receiver"); + LOG.debug("Attempting to read message with receiver"); AmqpReceiver receiver = session.createReceiver(getQueueName()); receiver.flow(2); AmqpMessage received = receiver.receive(10, TimeUnit.SECONDS); @@ -400,7 +400,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { message.setMessageAnnotation("serialNo", i); message.setText("Test-Message"); - System.out.println("Sending message: " + message.getMessageId()); + instanceLog.debug("Sending message: " + message.getMessageId()); sender.send(message); } @@ -422,7 +422,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { for (int i = 0; i < MSG_COUNT; ++i) { received = receiver2.receive(5, TimeUnit.SECONDS); assertNotNull("Should have got a message", received); - System.out.println("Read message: " + received.getMessageId()); + instanceLog.debug("Read message: " + received.getMessageId()); assertEquals("msg" + i, received.getMessageId()); } @@ -516,7 +516,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { sender.close(); - LOG.info("Attempting to read first two messages with receiver #1"); + LOG.debug("Attempting to read first two messages with receiver #1"); AmqpReceiver receiver1 = session.createReceiver(getQueueName()); receiver1.flow(2); AmqpMessage message1 = receiver1.receive(10, TimeUnit.SECONDS); @@ -528,7 +528,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { message1.accept(); message2.accept(); - LOG.info("Attempting to read next two messages with receiver #2"); + LOG.debug("Attempting to read next two messages with receiver #2"); AmqpReceiver receiver2 = session.createReceiver(getQueueName()); receiver2.flow(2); AmqpMessage message3 = receiver2.receive(10, TimeUnit.SECONDS); @@ -540,7 +540,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { message3.accept(); message4.accept(); - LOG.info("Attempting to read remaining messages with receiver #1"); + LOG.debug("Attempting to read remaining messages with receiver #1"); receiver1.flow(MSG_COUNT - 4); for (int i = 4; i < MSG_COUNT; i++) { AmqpMessage message = receiver1.receive(10, TimeUnit.SECONDS); @@ -603,24 +603,24 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { message3.accept(); message4.accept(); - LOG.info("*** Attempting to read remaining messages with both receivers"); + LOG.debug("*** Attempting to read remaining messages with both receivers"); int splitCredit = (MSG_COUNT - 4) / 2; - LOG.info("**** Receiver #1 granting credit[{}] for its block of messages", splitCredit); + LOG.debug("**** Receiver #1 granting credit[{}] for its block of messages", splitCredit); receiver1.flow(splitCredit); for (int i = 0; i < splitCredit; i++) { AmqpMessage message = receiver1.receive(10, TimeUnit.SECONDS); assertNotNull("Receiver #1 should have read a message", message); - LOG.info("Receiver #1 read message: {}", message.getMessageId()); + LOG.debug("Receiver #1 read message: {}", message.getMessageId()); message.accept(); } - LOG.info("**** Receiver #2 granting credit[{}] for its block of messages", splitCredit); + LOG.debug("**** Receiver #2 granting credit[{}] for its block of messages", splitCredit); receiver2.flow(splitCredit); for (int i = 0; i < splitCredit; i++) { AmqpMessage message = receiver2.receive(10, TimeUnit.SECONDS); assertNotNull("Receiver #2 should have read message[" + i + "]", message); - LOG.info("Receiver #2 read message: {}", message.getMessageId()); + LOG.debug("Receiver #2 read message: {}", message.getMessageId()); message.accept(); } @@ -677,7 +677,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { @Override public void run() { try { - LOG.info("Starting consumer connection"); + LOG.debug("Starting consumer connection"); AmqpConnection connection = addConnection(client.connect()); AmqpSession session = connection.createSession(); AmqpReceiver receiver = session.createReceiver(address); @@ -928,7 +928,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { sender.send(message); } - LOG.info("Attempting to read first two messages with receiver #1"); + LOG.debug("Attempting to read first two messages with receiver #1"); receiver1.flow(2); AmqpMessage message1 = receiver1.receive(10, TimeUnit.SECONDS); AmqpMessage message2 = receiver1.receive(10, TimeUnit.SECONDS); @@ -939,7 +939,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { message1.accept(); message2.accept(); - LOG.info("Attempting to read next two messages with receiver #2"); + LOG.debug("Attempting to read next two messages with receiver #2"); receiver2.flow(2); AmqpMessage message3 = receiver2.receive(10, TimeUnit.SECONDS); AmqpMessage message4 = receiver2.receive(10, TimeUnit.SECONDS); @@ -950,24 +950,24 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { message3.accept(); message4.accept(); - LOG.info("*** Attempting to read remaining messages with both receivers"); + LOG.debug("*** Attempting to read remaining messages with both receivers"); int splitCredit = (MSG_COUNT - 4) / 2; - LOG.info("**** Receiver #1 granting credit[{}] for its block of messages", splitCredit); + LOG.debug("**** Receiver #1 granting credit[{}] for its block of messages", splitCredit); receiver1.flow(splitCredit); for (int i = 0; i < splitCredit; i++) { AmqpMessage message = receiver1.receive(10, TimeUnit.SECONDS); assertNotNull("Receiver #1 should have read a message", message); - LOG.info("Receiver #1 read message: {}", message.getMessageId()); + LOG.debug("Receiver #1 read message: {}", message.getMessageId()); message.accept(); } - LOG.info("**** Receiver #2 granting credit[{}] for its block of messages", splitCredit); + LOG.debug("**** Receiver #2 granting credit[{}] for its block of messages", splitCredit); receiver2.flow(splitCredit); for (int i = 0; i < splitCredit; i++) { AmqpMessage message = receiver2.receive(10, TimeUnit.SECONDS); assertNotNull("Receiver #2 should have read a message[" + i + "]", message); - LOG.info("Receiver #2 read message: {}", message.getMessageId()); + LOG.debug("Receiver #2 read message: {}", message.getMessageId()); message.accept(); } @@ -1153,7 +1153,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport { received.accept(); done.countDown(); } catch (Exception ex) { - LOG.info("Caught error: {}", ex.getClass().getSimpleName()); + LOG.debug("Caught error: {}", ex.getClass().getSimpleName()); error.set(true); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java index 09b8025..ea8e882 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; @@ -129,7 +128,6 @@ public class AmqpSenderTest extends AmqpClientTestSupport { @Override public void inspectDeliveryUpdate(Sender sender, Delivery delivery) { if (delivery.remotelySettled()) { - IntegrationTestLogger.LOGGER.trace("Remote settled message for sender: " + sender.getName()); settled.countDown(); } } @@ -143,9 +141,6 @@ public class AmqpSenderTest extends AmqpClientTestSupport { message.setText("Test-Message: " + i); sender.send(message); - if (i % 1000 == 0) { - IntegrationTestLogger.LOGGER.info("Sent message: " + i); - } } Queue queueView = getProxyToQueue(getQueueName()); @@ -173,9 +168,6 @@ public class AmqpSenderTest extends AmqpClientTestSupport { message.setText("Test-Message: " + i); sender.send(message); - if (i % 1000 == 0) { - IntegrationTestLogger.LOGGER.info("Sent message: " + i); - } } Queue queueView = getProxyToQueue(getQueueName()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSessionTest.java index 0048be5..b16eafa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSessionTest.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.amqp; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; import org.apache.activemq.transport.amqp.client.AmqpReceiver; @@ -46,7 +45,7 @@ public class AmqpSessionTest extends AmqpClientTestSupport { @Override public void inspectClosedResource(Session session) { - IntegrationTestLogger.LOGGER.info("Session closed: " + session.getContext()); + instanceLog.debug("Session closed: " + session.getContext()); } @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java index 07c81f9..0f33b4d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java @@ -209,7 +209,7 @@ public class AmqpTempDestinationTest extends AmqpClientTestSupport { // Get the new address String address = sender.getSender().getRemoteTarget().getAddress(); - LOG.info("New dynamic sender address -> {}", address); + LOG.debug("New dynamic sender address -> {}", address); // Create a message and send to a receive that is listening on the newly // created dynamic link address. @@ -258,7 +258,7 @@ public class AmqpTempDestinationTest extends AmqpClientTestSupport { // Get the new address String address = receiver.getReceiver().getRemoteSource().getAddress(); - LOG.info("New dynamic receiver address -> {}", address); + LOG.debug("New dynamic receiver address -> {}", address); // Create a message and send to a receive that is listening on the newly // created dynamic link address. diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java index b6e04ec..42822a1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java @@ -715,7 +715,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { receiver.flow((NUM_MESSAGES + 2) * 2); for (int i = 0; i < NUM_MESSAGES; ++i) { AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); - System.out.println("Read message: " + message.getApplicationProperty("msgId")); + instanceLog.debug("Read message: " + message.getApplicationProperty("msgId")); assertNotNull(message); messages.add(message); } @@ -723,7 +723,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { // Commit half the consumed messages [0, 1, 2, 3, 4] txnSession.begin(); for (int i = 0; i < NUM_MESSAGES / 2; ++i) { - System.out.println("Commit: Accepting message: " + messages.get(i).getApplicationProperty("msgId")); + instanceLog.debug("Commit: Accepting message: " + messages.get(i).getApplicationProperty("msgId")); messages.get(i).accept(txnSession, false); } txnSession.commit(); @@ -731,7 +731,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { // Rollback the other half the consumed messages [5, 6, 7, 8, 9] txnSession.begin(); for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; ++i) { - System.out.println("Rollback: Accepting message: " + messages.get(i).getApplicationProperty("msgId")); + instanceLog.debug("Rollback: Accepting message: " + messages.get(i).getApplicationProperty("msgId")); messages.get(i).accept(txnSession, false); } txnSession.rollback(); @@ -739,7 +739,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { // After rollback messages should still be acquired so we read last sent message [10] { AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); - System.out.println("Read message: " + message.getApplicationProperty("msgId")); + instanceLog.debug("Read message: " + message.getApplicationProperty("msgId")); assertNotNull(message); assertEquals(NUM_MESSAGES, message.getApplicationProperty("msgId")); message.release(); @@ -757,7 +757,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { { receiver.flow(1); AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); - System.out.println("Read message: " + message.getApplicationProperty("msgId")); + instanceLog.debug("Read message: " + message.getApplicationProperty("msgId")); assertNotNull(message); assertEquals(NUM_MESSAGES, message.getApplicationProperty("msgId")); message.accept(); @@ -767,7 +767,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { receiver.flow(1); AmqpMessage message = receiver.receive(1, TimeUnit.SECONDS); if (message != null) { - System.out.println("Read message: " + message.getApplicationProperty("msgId")); + instanceLog.debug("Read message: " + message.getApplicationProperty("msgId")); } assertNull(message); } finally { @@ -807,7 +807,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { { // This will result in message [0[ being consumed once we commit. message1.accept(txnSession, false); - System.out.println("Commit: accepting message: " + message1.getApplicationProperty("msgId")); + instanceLog.debug("Commit: accepting message: " + message1.getApplicationProperty("msgId")); AmqpMessage message = new AmqpMessage(); message.setText("Test-Message"); @@ -821,7 +821,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { txnSession.begin(); { message2.accept(txnSession, false); - System.out.println("Rollback: accepting message: " + message2.getApplicationProperty("msgId")); + instanceLog.debug("Rollback: accepting message: " + message2.getApplicationProperty("msgId")); AmqpMessage message = new AmqpMessage(); message.setText("Test-Message"); @@ -839,7 +839,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { for (int i = 1; i <= NUM_MESSAGES; ++i) { AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS); assertNotNull("Expected a message for: " + i, message); - System.out.println("Accepting message: " + message.getApplicationProperty("msgId")); + instanceLog.debug("Accepting message: " + message.getApplicationProperty("msgId")); assertEquals(i, message.getApplicationProperty("msgId")); message.accept(); } @@ -878,7 +878,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { } if (i % 100 == 0) { - if (i % 1000 == 0) System.out.println("Read message " + i); + if (i % 1000 == 0) instanceLog.debug("Read message " + i); consumerSession.commit(); } } @@ -903,7 +903,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { for (int i = 0; i < MESSAGE_COUNT; i++) { producer.send(sendingSession.createTextMessage("message " + i), DeliveryMode.PERSISTENT, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE); if (i % 100 == 0) { - if (i % 1000 == 0) System.out.println("Sending " + i); + if (i % 1000 == 0) instanceLog.debug("Sending " + i); sendingSession.commit(); } } @@ -941,7 +941,7 @@ public class AmqpTransactionTest extends AmqpClientTestSupport { @Override public void inspectDeliveryUpdate(Sender sender, Delivery delivery) { if (delivery.remotelySettled()) { - LOG.info("Receiver got delivery update for: {}", delivery); + LOG.debug("Receiver got delivery update for: {}", delivery); if (!(delivery.getRemoteState() instanceof TransactionalState)) { markAsInvalid("Transactionally acquire work no tagged as being in a transaction."); } else { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSConnectionWithSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSConnectionWithSecurityTest.java index 7199efc..57f4b6b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSConnectionWithSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSConnectionWithSecurityTest.java @@ -26,7 +26,6 @@ import javax.jms.QueueBrowser; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.qpid.jms.JmsConnectionFactory; import org.junit.Test; @@ -52,7 +51,8 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { connection.start(); fail("Expected JMSException"); } catch (JMSSecurityException ex) { - IntegrationTestLogger.LOGGER.debug("Failed to authenticate connection with no user / password."); + instanceLog.debug("Failed to authenticate connection with no user / password.", ex); + } finally { if (connection != null) { connection.close(); @@ -69,7 +69,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { connection.start(); fail("Expected Exception"); } catch (JMSSecurityException ex) { - IntegrationTestLogger.LOGGER.debug("Failed to authenticate connection with no user / password."); + instanceLog.debug("Failed to authenticate connection with no user / password."); } catch (Exception ex) { fail("Expected JMSSecurityException"); } finally { @@ -87,7 +87,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { connection.start(); fail("Expected JMSException"); } catch (JMSSecurityException ex) { - IntegrationTestLogger.LOGGER.debug("Failed to authenticate connection with unknown user ID"); + instanceLog.debug("Failed to authenticate connection with unknown user ID"); } finally { if (connection != null) { connection.close(); @@ -103,7 +103,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { connection.start(); fail("Expected JMSException"); } catch (JMSSecurityException ex) { - IntegrationTestLogger.LOGGER.debug("Failed to authenticate connection with incorrect password."); + instanceLog.debug("Failed to authenticate connection with incorrect password."); } finally { if (connection != null) { connection.close(); @@ -120,7 +120,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { connection.start(); fail("Expected JMSException"); } catch (JMSSecurityException ex) { - IntegrationTestLogger.LOGGER.debug("Failed to authenticate connection with incorrect password."); + instanceLog.debug("Failed to authenticate connection with incorrect password."); } finally { if (connection != null) { connection.close(); @@ -167,7 +167,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { session.createConsumer(queue); fail("Should not be able to consume here."); } catch (JMSSecurityException jmsSE) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } } finally { connection.close(); @@ -187,7 +187,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { browser.getEnumeration(); fail("Should not be able to consume here."); } catch (JMSSecurityException jmsSE) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } } finally { connection.close(); @@ -205,7 +205,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { session.createConsumer(queue); fail("Should not be able to consume here."); } catch (JMSSecurityException jmsSE) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } } finally { connection.close(); @@ -223,7 +223,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { session.createProducer(queue); fail("Should not be able to produce here."); } catch (JMSSecurityException jmsSE) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } } finally { connection.close(); @@ -243,7 +243,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { producer.send(queue, session.createTextMessage()); fail("Should not be able to produce here."); } catch (JMSSecurityException jmsSE) { - IntegrationTestLogger.LOGGER.info("Caught expected exception"); + instanceLog.debug("Caught expected exception"); } } finally { connection.close(); @@ -260,7 +260,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { try { session.createTemporaryQueue(); } catch (JMSSecurityException jmsse) { - IntegrationTestLogger.LOGGER.info("Client should have thrown a JMSSecurityException but only threw JMSException"); + instanceLog.debug("Client should have thrown a JMSSecurityException but only threw JMSException"); } // Should not be fatal @@ -280,7 +280,7 @@ public class JMSConnectionWithSecurityTest extends JMSClientTestSupport { try { session.createTemporaryTopic(); } catch (JMSSecurityException jmsse) { - IntegrationTestLogger.LOGGER.info("Client should have thrown a JMSSecurityException but only threw JMSException"); + instanceLog.debug("Client should have thrown a JMSSecurityException but only threw JMSException"); } // Should not be fatal diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java index 14c019b..b5b170d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java @@ -606,7 +606,7 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport { message.acknowledge(); done.countDown(); } catch (JMSException ex) { - LOG.info("Caught exception.", ex); + LOG.debug("Caught exception.", ex); } } }); @@ -686,7 +686,7 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport { while (count > 0) { try { if (++n % 1000 == 0) { - System.out.println("received " + n + " messages"); + instanceLog.debug("received " + n + " messages"); } Message m = consumer.receive(5000); @@ -738,11 +738,11 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport { Wait.assertEquals(0, queueView::getMessageCount); long taken = (System.currentTimeMillis() - time); - System.out.println("Microbenchamrk ran in " + taken + " milliseconds, sending/receiving " + numMessages); + instanceLog.debug("Microbenchamrk ran in " + taken + " milliseconds, sending/receiving " + numMessages); double messagesPerSecond = ((double) numMessages / (double) taken) * 1000; - System.out.println(((int) messagesPerSecond) + " messages per second"); + instanceLog.debug(((int) messagesPerSecond) + " messages per second"); } @Test(timeout = 60000) @@ -776,9 +776,6 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport { for (int i = 0; i < numMessages; i++) { Message msg = consumer.receive(5000); - if (msg == null) { - System.out.println("ProtonTest.testManyMessages"); - } Assert.assertNotNull("" + i, msg); Assert.assertTrue("" + msg, msg instanceof TextMessage); String text = ((TextMessage) msg).getText(); @@ -790,12 +787,7 @@ public class JMSMessageConsumerTest extends JMSClientTestSupport { consumer.close(); connection.close(); - // Wait for Acks to be processed and message removed from queue. - Thread.sleep(500); - Wait.assertEquals(0, queueView::getMessageCount); - long taken = (System.currentTimeMillis() - time) / 1000; - System.out.println("taken = " + taken); } finally { connection.close(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageTypesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageTypesTest.java index 4a1e296..a504bdc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageTypesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageTypesTest.java @@ -129,7 +129,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { MessageProducer producer = session.createProducer(queue); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("Sending " + i); + instanceLog.debug("Sending " + i); BytesMessage message = session.createBytesMessage(); message.writeBytes(bytes); @@ -151,13 +151,13 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { byte[] bytesReceived = new byte[(int) size]; m.readBytes(bytesReceived); - System.out.println("Received " + ByteUtil.bytesToHex(bytesReceived, 1) + " count - " + m.getIntProperty("count")); + instanceLog.debug("Received " + ByteUtil.bytesToHex(bytesReceived, 1) + " count - " + m.getIntProperty("count")); Assert.assertArrayEquals(bytes, bytesReceived); } long taken = (System.currentTimeMillis() - time) / 1000; - System.out.println("taken = " + taken); + instanceLog.debug("taken = " + taken); } @Test(timeout = 60000) @@ -188,7 +188,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { MessageProducer producer = session.createProducer(queue); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("Sending " + i); + instanceLog.debug("Sending " + i); Message message = session.createMessage(); message.setIntProperty("count", i); @@ -205,7 +205,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { } long taken = (System.currentTimeMillis() - time) / 1000; - System.out.println("taken = " + taken); + instanceLog.debug("taken = " + taken); } @Test(timeout = 60000) @@ -231,7 +231,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { MessageProducer producer = session.createProducer(queue); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("Sending " + i); + instanceLog.debug("Sending " + i); MapMessage message = session.createMapMessage(); message.setInt("i", i); @@ -252,7 +252,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { } long taken = (System.currentTimeMillis() - time) / 1000; - System.out.println("taken = " + taken); + instanceLog.debug("taken = " + taken); } @Test(timeout = 60000) @@ -278,7 +278,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { MessageProducer producer = session.createProducer(queue); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("Sending " + i); + instanceLog.debug("Sending " + i); TextMessage message = session.createTextMessage("text" + i); message.setStringProperty("text", "text" + i); producer.send(message); @@ -295,7 +295,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { } long taken = (System.currentTimeMillis() - time) / 1000; - System.out.println("taken = " + taken); + instanceLog.debug("taken = " + taken); } @Test(timeout = 60000) @@ -403,7 +403,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { MessageProducer producer = session.createProducer(queue); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("Sending " + i); + instanceLog.debug("Sending " + i); ObjectMessage message = session.createObjectMessage(new AnythingSerializable(i)); producer.send(message); } @@ -421,7 +421,7 @@ public class JMSMessageTypesTest extends JMSClientTestSupport { } long taken = (System.currentTimeMillis() - time) / 1000; - System.out.println("taken = " + taken); + instanceLog.debug("taken = " + taken); } @Test(timeout = 60000) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTemporaryDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTemporaryDestinationTest.java index 776d553..01b185c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTemporaryDestinationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTemporaryDestinationTest.java @@ -39,7 +39,7 @@ public class JMSTemporaryDestinationTest extends JMSClientTestSupport { try { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); TemporaryQueue queue = session.createTemporaryQueue(); - System.out.println("queue:" + queue.getQueueName()); + instanceLog.debug("queue:" + queue.getQueueName()); MessageProducer producer = session.createProducer(queue); TextMessage message = session.createTextMessage(); @@ -92,7 +92,7 @@ public class JMSTemporaryDestinationTest extends JMSClientTestSupport { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); TemporaryTopic topic = session.createTemporaryTopic(); - System.out.println("topic:" + topic.getTopicName()); + instanceLog.debug("topic:" + topic.getTopicName()); MessageConsumer consumer = session.createConsumer(topic); MessageProducer producer = session.createProducer(topic); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTransactionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTransactionTest.java index bcd59aa..fa9551b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTransactionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTransactionTest.java @@ -40,7 +40,7 @@ public class JMSTransactionTest extends JMSClientTestSupport { Session session = connection.createSession(true, Session.SESSION_TRANSACTED); javax.jms.Queue queue = session.createQueue(getQueueName()); - System.out.println("queue:" + queue.getQueueName()); + instanceLog.debug("queue:" + queue.getQueueName()); MessageProducer p = session.createProducer(queue); for (int i = 0; i < 10; i++) { TextMessage message = session.createTextMessage(); @@ -62,7 +62,7 @@ public class JMSTransactionTest extends JMSClientTestSupport { Session session = connection.createSession(true, Session.SESSION_TRANSACTED); javax.jms.Queue queue = session.createQueue(getQueueName()); - System.out.println("queue:" + queue.getQueueName()); + instanceLog.debug("queue:" + queue.getQueueName()); MessageProducer p = session.createProducer(queue); for (int i = 0; i < 10; i++) { TextMessage message = session.createTextMessage(); @@ -106,7 +106,7 @@ public class JMSTransactionTest extends JMSClientTestSupport { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); javax.jms.Queue queue = session.createQueue(getQueueName()); - System.out.println("queue:" + queue.getQueueName()); + instanceLog.debug("queue:" + queue.getQueueName()); MessageProducer p = session.createProducer(queue); for (int i = 0; i < 10; i++) { TextMessage message = session.createTextMessage(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/QueueAutoCreationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/QueueAutoCreationTest.java index 30c177b..c1c11c4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/QueueAutoCreationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/QueueAutoCreationTest.java @@ -90,7 +90,7 @@ public class QueueAutoCreationTest extends JMSClientTestSupport { Map.Entry entry = map.entrySet().iterator().next(); AddressSettings settings = entry.getValue(); settings.setAutoCreateQueues(true); - System.out.println("server cofg, isauto? " + entry.getValue().isAutoCreateQueues()); + instanceLog.debug("server cofg, isauto? " + entry.getValue().isAutoCreateQueues()); } @@ -118,7 +118,7 @@ public class QueueAutoCreationTest extends JMSClientTestSupport { ConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:5672"); Connection connection = factory.createConnection(); SimpleString addressName = UUIDGenerator.getInstance().generateSimpleStringUUID(); - System.out.println("Address is " + addressName); + instanceLog.debug("Address is " + addressName); clientSession.createAddress(addressName, RoutingType.ANYCAST, false); Topic topic = new ActiveMQTopic(addressName.toString()); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -137,7 +137,7 @@ public class QueueAutoCreationTest extends JMSClientTestSupport { ConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:5672"); Connection connection = factory.createConnection(); SimpleString addressName = UUIDGenerator.getInstance().generateSimpleStringUUID(); - System.out.println("Address is " + addressName); + instanceLog.debug("Address is " + addressName); clientSession.createAddress(addressName, RoutingType.ANYCAST, false); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -158,7 +158,7 @@ public class QueueAutoCreationTest extends JMSClientTestSupport { ConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:5672"); Connection connection = factory.createConnection(); SimpleString addressName = UUIDGenerator.getInstance().generateSimpleStringUUID(); - System.out.println("Address is " + addressName); + instanceLog.debug("Address is " + addressName); clientSession.createAddress(addressName, RoutingType.ANYCAST, false); Connection recConnection = factory.createConnection(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SaslKrb5LDAPSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SaslKrb5LDAPSecurityTest.java index 0012c19..d16a4b4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SaslKrb5LDAPSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SaslKrb5LDAPSecurityTest.java @@ -119,6 +119,7 @@ import static org.apache.activemq.artemis.tests.util.ActiveMQTestBase.NETTY_ACCE @CreateKdcServer(transports = {@CreateTransport(protocol = "TCP", port = 0)}) @ApplyLdifFiles("SaslKrb5LDAPSecurityTest.ldif") public class SaslKrb5LDAPSecurityTest extends AbstractLdapTestUnit { + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(SaslKrb5LDAPSecurityTest.class); protected static final Logger LOG = LoggerFactory.getLogger(SaslKrb5LDAPSecurityTest.class); public static final String QUEUE_NAME = "some_queue"; @@ -222,7 +223,7 @@ public class SaslKrb5LDAPSecurityTest extends AbstractLdapTestUnit { Method refreshMethod = classRef.getMethod("refresh", new Class[0]); refreshMethod.invoke(classRef, new Object[0]); - LOG.info("krb5.conf to: {}", krb5conf.getAbsolutePath()); + LOG.debug("krb5.conf to: {}", krb5conf.getAbsolutePath()); } private void dumpLdapContents() throws Exception { @@ -234,7 +235,7 @@ public class SaslKrb5LDAPSecurityTest extends AbstractLdapTestUnit { String ss = LdifUtils.convertToLdif(entry); st += ss + "\n"; } - System.out.println(st); + log.debug(st); cursor = getService().getAdminSession().search(new Dn("dc=example,dc=com"), SearchScope.SUBTREE, new PresenceNode("ObjectClass"), AliasDerefMode.DEREF_ALWAYS); st = ""; @@ -244,7 +245,7 @@ public class SaslKrb5LDAPSecurityTest extends AbstractLdapTestUnit { String ss = LdifUtils.convertToLdif(entry); st += ss + "\n"; } - System.out.println(st); + log.debug(st); } private void initLogging() { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java index e4a9066..4c549ce 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/TopicDurableTests.java @@ -53,7 +53,7 @@ public class TopicDurableTests extends JMSClientTestSupport { Connection connection = connectionFactory.createConnection(); connection.start(); - System.out.println("testMessageDurableSubscription"); + instanceLog.debug("testMessageDurableSubscription"); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Topic testTopic = session.createTopic("jmsTopic"); @@ -67,39 +67,39 @@ public class TopicDurableTests extends JMSClientTestSupport { String batchPrefix = "First"; List listMsgs = generateMessages(session, batchPrefix, count); sendMessages(messageProducer, listMsgs); - System.out.println("First batch messages sent"); + instanceLog.debug("First batch messages sent"); List recvd1 = receiveMessages(subscriber1, count); List recvd2 = receiveMessages(subscriber2, count); assertThat(recvd1.size(), is(count)); assertMessageContent(recvd1, batchPrefix); - System.out.println(sub1ID + " :First batch messages received"); + instanceLog.debug(sub1ID + " :First batch messages received"); assertThat(recvd2.size(), is(count)); assertMessageContent(recvd2, batchPrefix); - System.out.println(sub2ID + " :First batch messages received"); + instanceLog.debug(sub2ID + " :First batch messages received"); subscriber1.close(); - System.out.println(sub1ID + " : closed"); + instanceLog.debug(sub1ID + " : closed"); batchPrefix = "Second"; listMsgs = generateMessages(session, batchPrefix, count); sendMessages(messageProducer, listMsgs); - System.out.println("Second batch messages sent"); + instanceLog.debug("Second batch messages sent"); recvd2 = receiveMessages(subscriber2, count); assertThat(recvd2.size(), is(count)); assertMessageContent(recvd2, batchPrefix); - System.out.println(sub2ID + " :Second batch messages received"); + instanceLog.debug(sub2ID + " :Second batch messages received"); subscriber1 = session.createDurableSubscriber(testTopic, sub1ID); - System.out.println(sub1ID + " :connected"); + instanceLog.debug(sub1ID + " :connected"); recvd1 = receiveMessages(subscriber1, count); assertThat(recvd1.size(), is(count)); assertMessageContent(recvd1, batchPrefix); - System.out.println(sub1ID + " :Second batch messages received"); + instanceLog.debug(sub1ID + " :Second batch messages received"); subscriber1.close(); subscriber2.close(); @@ -113,7 +113,7 @@ public class TopicDurableTests extends JMSClientTestSupport { public void testSharedNonDurableSubscription() throws Exception { int iterations = 10; for (int i = 0; i < iterations; i++) { - System.out.println("testSharedNonDurableSubscription; iteration: " + i); + instanceLog.debug("testSharedNonDurableSubscription; iteration: " + i); //SETUP-START JmsConnectionFactory connectionFactory1 = new JmsConnectionFactory(getBrokerQpidJMSConnectionURI()); Connection connection1 = connectionFactory1.createConnection(); @@ -147,14 +147,14 @@ public class TopicDurableTests extends JMSClientTestSupport { List listMsgs = generateMessages(session, count); List>> results = receiveMessagesAsync(count, subscriber1, subscriber2, subscriber3); sendMessages(messageProducer, listMsgs); - System.out.println("messages sent"); + instanceLog.debug("messages sent"); assertThat("Each message should be received only by one consumer", results.get(0).get(20, TimeUnit.SECONDS).size() + results.get(1).get(20, TimeUnit.SECONDS).size() + results.get(2).get(20, TimeUnit.SECONDS).size(), is(count)); - System.out.println("messages received"); + instanceLog.debug("messages received"); //BODY-E //TEAR-DOWN-S @@ -238,7 +238,7 @@ public class TopicDurableTests extends JMSClientTestSupport { resultsList.add(new CompletableFuture<>()); receivedResList.add(new ArrayList<>()); MessageListener myListener = message -> { - System.out.println("Mesages received" + message + " count: " + totalCount.get()); + instanceLog.debug("Mesages received" + message + " count: " + totalCount.get()); receivedResList.get(index).add(message); if (totalCount.decrementAndGet() == 0) { for (int j = 0; j < consumer.length; j++) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java index be79b0f..8b89e1d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/interop/AmqpCoreTest.java @@ -108,9 +108,9 @@ public class AmqpCoreTest extends JMSClientTestSupport { @Override public void onMessage(ClientMessage message) { - System.out.println("received: " + message.getBodySize()); + instanceLog.debug("received: " + message.getBodySize()); if (message.getBodySize() == 0) { - System.out.println("xxx found zero len message!"); + instanceLog.debug("xxx found zero len message!"); zeroLen = true; } addMessage(message); @@ -118,7 +118,7 @@ public class AmqpCoreTest extends JMSClientTestSupport { private synchronized void addMessage(ClientMessage message) { numMsg++; - System.out.println("[receiver " + id + "] recieved: " + numMsg); + instanceLog.debug("[receiver " + id + "] recieved: " + numMsg); } public synchronized boolean waitForMessages(int num) throws Exception { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/InterruptedAMQPLargeMessage.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/InterruptedAMQPLargeMessage.java index af7c5bb..1ea4bbf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/InterruptedAMQPLargeMessage.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/InterruptedAMQPLargeMessage.java @@ -129,7 +129,7 @@ public class InterruptedAMQPLargeMessage extends AmqpClientTestSupport { } browserIterator.close(); - System.out.println("There are " + serverQueue.getMessageCount() + " on the queue"); + instanceLog.debug("There are " + serverQueue.getMessageCount() + " on the queue"); int messageCount = (int)serverQueue.getMessageCount(); AmqpClient client = createLocalClient(); @@ -148,7 +148,7 @@ public class InterruptedAMQPLargeMessage extends AmqpClientTestSupport { message.accept(true); received++; - System.out.println("Received " + received); + instanceLog.debug("Received " + received); Data data = (Data)message.getWrappedMessage().getBody(); byte[] byteArray = data.getValue().getArray(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java index 0dcb468..6841b18 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java @@ -127,7 +127,7 @@ public class AddressCommandTest extends JMSTestBase { ShowAddress showAddress = new ShowAddress(); showAddress.setName(address); showAddress.execute(new ActionContext(System.in, new PrintStream(output), new PrintStream(error))); - System.out.println(output.toString()); + instanceLog.debug(output.toString()); } @Test @@ -158,7 +158,7 @@ public class AddressCommandTest extends JMSTestBase { showAddress.setName(address.toString()); showAddress.setBindings(true); showAddress.execute(new ActionContext(System.in, new PrintStream(output), new PrintStream(error))); - System.out.println(output.toString()); + instanceLog.debug(output.toString()); } @Test @@ -208,13 +208,13 @@ public class AddressCommandTest extends JMSTestBase { private void checkExecutionPassed(AbstractAction command) throws Exception { String fullMessage = output.toString(); - System.out.println("output: " + fullMessage); + instanceLog.debug("output: " + fullMessage); assertTrue(fullMessage, fullMessage.contains("successfully")); } private void checkExecutionFailure(AbstractAction command, String message) throws Exception { String fullMessage = error.toString(); - System.out.println("error: " + fullMessage); + instanceLog.debug("error: " + fullMessage); assertTrue(fullMessage, fullMessage.contains(message)); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java index 7ea05ac..d4a9009 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java @@ -371,13 +371,13 @@ public class QueueCommandTest extends JMSTestBase { private void checkExecutionPassed(AbstractAction command) throws Exception { String fullMessage = output.toString(); - System.out.println("output: " + fullMessage); + instanceLog.debug("output: " + fullMessage); assertTrue(fullMessage, fullMessage.contains("successfully")); } private void checkExecutionFailure(AbstractAction command, String message) throws Exception { String fullMessage = error.toString(); - System.out.println("error: " + fullMessage); + instanceLog.debug("error: " + fullMessage); assertTrue(fullMessage, fullMessage.contains(message)); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java index 452398c..c9acb18 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AckBatchSizeTest.java @@ -82,7 +82,7 @@ public class AckBatchSizeTest extends ActiveMQTestBase { ClientConsumer consumer = session.createConsumer(queueA); session.start(); for (int i = 0; i < numMessages - 1; i++) { - System.out.println("Receive "); + instanceLog.debug("Receive "); ClientMessage m = consumer.receive(5000); Assert.assertEquals(0, m.getPropertyNames().size()); Assert.assertEquals("expected to be " + originalSize, originalSize, m.getEncodeSize()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java index a6bec7a..310d03d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java @@ -43,7 +43,6 @@ import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQConsumerConte import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUID; import org.junit.Assert; @@ -51,8 +50,6 @@ import org.junit.Test; public class AcknowledgeTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - public final SimpleString addressA = new SimpleString("addressA"); public final SimpleString queueA = new SimpleString("queueA"); @@ -108,7 +105,7 @@ public class AcknowledgeTest extends ActiveMQTestBase { } Thread.sleep(500); - log.info("woke up"); + instanceLog.debug("woke up"); final CountDownLatch latch = new CountDownLatch(numMessages); session.start(); @@ -117,7 +114,7 @@ public class AcknowledgeTest extends ActiveMQTestBase { @Override public void onMessage(final ClientMessage message) { - log.info("Got message " + c++); + instanceLog.debug("Got message " + c++); latch.countDown(); } }); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java index 5270d9e..56c607f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java @@ -31,8 +31,8 @@ import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -42,7 +42,7 @@ import org.junit.Test; */ public class ActiveMQCrashTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(ActiveMQCrashTest.class); public ActiveMQServer server; @@ -98,11 +98,11 @@ public class ActiveMQCrashTest extends ActiveMQTestBase { @Override public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { - ActiveMQCrashTest.log.info("AckInterceptor.intercept " + packet); + log.debug("AckInterceptor.intercept " + packet); if (packet.getType() == PacketImpl.SESS_SEND) { try { - ActiveMQCrashTest.log.info("Stopping server"); + log.debug("Stopping server"); new Thread() { @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java index e5bd199..a7918db 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java @@ -47,7 +47,6 @@ import org.apache.activemq.artemis.jms.client.ActiveMQQueue; import org.apache.activemq.artemis.jms.client.ActiveMQTemporaryTopic; import org.apache.activemq.artemis.jms.client.ActiveMQTopic; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.tests.util.Wait; @@ -340,8 +339,6 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase { assertNotNull(server.locateQueue(topicAddress)); - IntegrationTestLogger.LOGGER.info("Topic name: " + topicAddress); - topic.delete(); connection.close(); @@ -381,7 +378,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase { ConnectionFactory factory = new ActiveMQConnectionFactory(); Connection connection = factory.createConnection(); SimpleString addressName = UUIDGenerator.getInstance().generateSimpleStringUUID(); - System.out.println("Address is " + addressName); + instanceLog.debug("Address is " + addressName); clientSession.createAddress(addressName, RoutingType.ANYCAST, false); Topic topic = new ActiveMQTopic(addressName.toString()); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -405,7 +402,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase { ConnectionFactory factory = new ActiveMQConnectionFactory(); try (Connection connection = factory.createConnection()) { SimpleString addressName = UUIDGenerator.getInstance().generateSimpleStringUUID(); - System.out.println("Address is " + addressName); + instanceLog.debug("Address is " + addressName); javax.jms.Queue queue = new ActiveMQQueue(addressName.toString()); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(null); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java index 7ed58f5..d58214d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java @@ -29,7 +29,6 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; @@ -37,7 +36,6 @@ import org.junit.Test; public class AutogroupIdTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; public final SimpleString addressA = new SimpleString("addressA"); @@ -93,8 +91,6 @@ public class AutogroupIdTest extends ActiveMQTestBase { ClientConsumer consumer2 = session.createConsumer(groupTestQ); consumer2.setMessageHandler(myMessageHandler2); - log.info("starting session"); - session.start(); final int numMessages = 100; @@ -106,8 +102,6 @@ public class AutogroupIdTest extends ActiveMQTestBase { session.close(); - log.info(myMessageHandler2.messagesReceived); - Assert.assertEquals(100, myMessageHandler.messagesReceived); Assert.assertEquals(0, myMessageHandler2.messagesReceived); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java index 896989f..3977f97 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java @@ -54,7 +54,7 @@ public class BlockingSendTest extends ActiveMQTestBase { server.start(); - System.out.println("sync = " + server.getConfiguration().isJournalSyncNonTransactional()); + instanceLog.debug("sync = " + server.getConfiguration().isJournalSyncNonTransactional()); locator = createInVMNonHALocator().setBlockOnDurableSend(true); factory = createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java index 1eee70d..b558fe9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java @@ -26,14 +26,14 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.impl.QueueImpl; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; public class ConsumerFilterTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(ConsumerFilterTest.class); private ActiveMQServer server; private ClientSession session; @@ -90,7 +90,7 @@ public class ConsumerFilterTest extends ActiveMQTestBase { message.putStringProperty("animal", "giraffe"); - log.info("sending second msg"); + log.debug("sending second msg"); producer.send(message); @@ -243,7 +243,7 @@ public class ConsumerFilterTest extends ActiveMQTestBase { readConsumer("anyConsumer", anyConsumer); - log.info("### closing consumer ###"); + log.debug("### closing consumer ###"); anyConsumer.close(); @@ -251,7 +251,7 @@ public class ConsumerFilterTest extends ActiveMQTestBase { readConsumer("redConsumer", redConsumer); - log.info("### recreating consumer ###"); + log.debug("### recreating consumer ###"); anyConsumer = session.createConsumer("foo"); @@ -273,7 +273,7 @@ public class ConsumerFilterTest extends ActiveMQTestBase { private void readConsumer(String consumerName, ClientConsumer consumer) throws Exception { ClientMessage message = consumer.receive(5000); assertNotNull(message); - System.out.println("consumer = " + consumerName + " message, color=" + message.getStringProperty("color") + ", msg = " + message.getStringProperty("value")); + instanceLog.debug("consumer = " + consumerName + " message, color=" + message.getStringProperty("color") + ", msg = " + message.getStringProperty("value")); message.acknowledge(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java index 0de5f3d..b69bbba 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerRoundRobinTest.java @@ -25,14 +25,14 @@ 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.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; public class ConsumerRoundRobinTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(ConsumerRoundRobinTest.class); public final SimpleString addressA = new SimpleString("addressA"); @@ -67,9 +67,9 @@ public class ConsumerRoundRobinTest extends ActiveMQTestBase { } int currMessage = 0; for (int i = 0; i < numMessage / 5; i++) { - log.info("i is " + i); + log.debug("i is " + i); for (int j = 0; j < 5; j++) { - log.info("j is " + j); + log.debug("j is " + j); ClientMessage cm = consumers[j].receive(5000); Assert.assertNotNull(cm); Assert.assertEquals(currMessage++, cm.getBodyBuffer().readInt()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java index be72733..908c07f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java @@ -85,7 +85,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase { try { while (!Thread.interrupted()) { ClientMessage received = consumer.receive(500); - System.out.println("Received " + received); + instanceLog.debug("Received " + received); if (first) { first = false; nettyConnection.getNettyChannel().config().setAutoRead(false); @@ -107,7 +107,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase { assertEquals(1, server.getSessions().size()); - System.out.println("sessions = " + server.getSessions().size()); + instanceLog.debug("sessions = " + server.getSessions().size()); assertEquals(1, server.getConnectionCount()); @@ -119,16 +119,16 @@ public class ConsumerStuckTest extends ActiveMQTestBase { Thread.sleep(10); } - System.out.println("Time = " + System.currentTimeMillis() + " time diff = " + (System.currentTimeMillis() - timeStart) + ", connections Size = " + server.getConnectionCount() + " sessions = " + server.getSessions().size()); + instanceLog.debug("Time = " + System.currentTimeMillis() + " time diff = " + (System.currentTimeMillis() - timeStart) + ", connections Size = " + server.getConnectionCount() + " sessions = " + server.getSessions().size()); if (server.getSessions().size() != 0) { System.out.println(threadDump("Thread dump")); fail("The cleanup wasn't able to finish cleaning the session. It's probably stuck, look at the thread dump generated by the test for more information"); } - System.out.println("Size = " + server.getConnectionCount()); + instanceLog.debug("Size = " + server.getConnectionCount()); - System.out.println("sessions = " + server.getSessions().size()); + instanceLog.debug("sessions = " + server.getSessions().size()); if (server.getSessions().size() != 0) { System.out.println(threadDump("Thread dump")); @@ -168,7 +168,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase { try { while (!Thread.interrupted()) { ClientMessage received = consumer.receive(500); - System.out.println("Received " + received); + instanceLog.debug("Received " + received); if (first) { first = false; nettyConnection.getNettyChannel().config().setAutoRead(false); @@ -217,7 +217,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase { assertEquals(2, server.getSessions().size()); - System.out.println("sessions = " + server.getSessions().size()); + instanceLog.debug("sessions = " + server.getSessions().size()); assertEquals(2, server.getConnectionCount()); @@ -227,9 +227,9 @@ public class ConsumerStuckTest extends ActiveMQTestBase { Thread.sleep(10); } - System.out.println("Size = " + server.getConnectionCount()); + instanceLog.debug("Size = " + server.getConnectionCount()); - System.out.println("sessions = " + server.getSessions().size()); + instanceLog.debug("sessions = " + server.getSessions().size()); if (server.getSessions().size() != 1) { System.out.println(threadDump("Thread dump")); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java index 5a73116..12559da 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java @@ -192,13 +192,13 @@ public class ConsumerTest extends ActiveMQTestBase { Assert.assertNotNull(message2); - System.out.println("Id::" + message2.getMessageID()); + instanceLog.debug("Id::" + message2.getMessageID()); - System.out.println("Received " + message2); + instanceLog.debug("Received " + message2); - System.out.println("Clie:" + ByteUtil.bytesToHex(message2.getBuffer().array(), 4)); + instanceLog.debug("Clie:" + ByteUtil.bytesToHex(message2.getBuffer().array(), 4)); - System.out.println("String::" + message2.getReadOnlyBodyBuffer().readString()); + instanceLog.debug("String::" + message2.getReadOnlyBodyBuffer().readString()); Assert.assertEquals("elo", message2.getStringProperty("hello")); @@ -579,7 +579,7 @@ public class ConsumerTest extends ActiveMQTestBase { } long end = System.currentTimeMillis(); - System.out.println("Time = " + (end - time)); + instanceLog.debug("Time = " + (end - time)); { TextMessage dummyMessage = session.createTextMessage(); @@ -1012,7 +1012,7 @@ public class ConsumerTest extends ActiveMQTestBase { } if (cons.receiveImmediate() != null) { - System.out.println("ERROR: Received an extra message"); + instanceLog.debug("ERROR: Received an extra message"); errors.incrementAndGet(); } sessionSend.close(); @@ -1249,11 +1249,11 @@ public class ConsumerTest extends ActiveMQTestBase { final long messagesPerRun = (forks * messages); for (int r = 0; r < runs; r++) { onStartRun.await(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); - System.out.println("started run " + r); + instanceLog.debug("started run " + r); final long start = System.currentTimeMillis(); onFinishRun.await(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); final long elapsedMillis = System.currentTimeMillis() - start; - System.out.println((messagesPerRun * 1000L) / elapsedMillis + " msg/sec"); + instanceLog.debug((messagesPerRun * 1000L) / elapsedMillis + " msg/sec"); } Stream.of(producersRunners).forEach(runner -> { try { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java index 9778ff1..156c815 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java @@ -46,7 +46,6 @@ import org.apache.activemq.artemis.core.server.Consumer; import org.apache.activemq.artemis.core.server.ServerSession; import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.Wait; import org.junit.Assert; @@ -62,10 +61,6 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { private final int TIMEOUT = 5; - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - - private static final boolean isTrace = ConsumerWindowSizeTest.log.isTraceEnabled(); - private ServerLocator locator; protected boolean isNetty() { @@ -416,7 +411,7 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { ClientMessage msg = consumer.receiveImmediate(); if (msg == null) { - System.out.println("Returning null"); + instanceLog.debug("Returning null"); break; } msg.acknowledge(); @@ -721,8 +716,6 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { String str = getTextMessage(msg); Assert.assertEquals("Msg" + i, str); - log.info("got msg " + str); - msg.acknowledge(); Assert.assertEquals("A slow consumer shouldn't buffer anything on the client side!", 0, cons1.getBufferSize()); @@ -735,8 +728,6 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { String str = getTextMessage(msg); - log.info("got msg " + str); - Assert.assertEquals("Msg" + i, str); msg.acknowledge(); @@ -1186,13 +1177,7 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { @Override public synchronized void onMessage(final ClientMessage message) { try { - log.info("received msg " + message); String str = getTextMessage(message); - if (ConsumerWindowSizeTest.isTrace) { - ConsumerWindowSizeTest.log.trace("Received message " + str); - } - - ConsumerWindowSizeTest.log.info("Received message " + str); failed = failed || !str.equals("Msg" + count); @@ -1230,11 +1215,8 @@ public class ConsumerWindowSizeTest extends ActiveMQTestBase { Assert.assertTrue(latchReceived.await(TIMEOUT, TimeUnit.SECONDS)); - log.info("bs " + consReceiveOneAndHold.getBufferSize()); - long timeout = System.currentTimeMillis() + 1000 * TIMEOUT; while (consReceiveOneAndHold.getBufferSize() == 0 && System.currentTimeMillis() < timeout) { - log.info("bs " + consReceiveOneAndHold.getBufferSize()); Thread.sleep(10); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java index 4c3ad12..cc9894f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CoreClientTest.java @@ -48,7 +48,6 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.apache.activemq.artemis.utils.UUIDGenerator; @@ -57,8 +56,6 @@ import org.junit.Test; public class CoreClientTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - @Test public void testCoreClientNetty() throws Exception { testCoreClient(true, null); @@ -141,8 +138,6 @@ public class CoreClientTest extends ActiveMQTestBase { producer.send(message); } - CoreClientTest.log.info("sent messages"); - ClientConsumer consumer = session.createConsumer(QUEUE); session.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java index c921ff4..dfc390b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java @@ -39,7 +39,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; import org.junit.Assert; @@ -49,8 +48,6 @@ import org.junit.Test; public class DeadLetterAddressTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private ActiveMQServer server; private ClientSession clientSession; @@ -395,8 +392,6 @@ public class DeadLetterAddressTest extends ActiveMQTestBase { for (int i = 0; i < deliveryAttempt; i++) { ClientMessage m = clientConsumer.receive(500); Assert.assertNotNull(m); - DeadLetterAddressTest.log.info("i is " + i); - DeadLetterAddressTest.log.info("delivery cout is " + m.getDeliveryCount()); Assert.assertEquals(i + 1, m.getDeliveryCount()); m.acknowledge(); clientSession.rollback(); 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 84d0515..2e40ab5 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 @@ -121,7 +121,7 @@ public class ExpireTestOnRestartTest extends ActiveMQTestBase { int extras = 0; ClientMessage msg; while ((msg = cons.receiveImmediate()) != null) { - System.out.println(msg); + instanceLog.debug(msg); extras++; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java index c0ebef6..cffc2ac 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryAddressTest.java @@ -28,7 +28,6 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; import org.junit.Assert; @@ -37,8 +36,6 @@ import org.junit.Test; public class ExpiryAddressTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private ActiveMQServer server; private ClientSession clientSession; @@ -161,7 +158,6 @@ public class ExpiryAddressTest extends ActiveMQTestBase { assertNotNull(m.getStringProperty(Message.HDR_ORIGINAL_ADDRESS)); assertNotNull(m.getStringProperty(Message.HDR_ORIGINAL_QUEUE)); - ExpiryAddressTest.log.info("acking"); m.acknowledge(); Assert.assertEquals(m.getBodyBuffer().readString(), "heyho!"); @@ -177,7 +173,6 @@ public class ExpiryAddressTest extends ActiveMQTestBase { assertNotNull(m.getStringProperty(Message.HDR_ORIGINAL_ADDRESS)); assertNotNull(m.getStringProperty(Message.HDR_ORIGINAL_QUEUE)); - ExpiryAddressTest.log.info("acking"); m.acknowledge(); Assert.assertEquals(m.getBodyBuffer().readString(), "heyho!"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java index 1f0a3ad..f35c0f5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java @@ -32,7 +32,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.Wait; import org.junit.Test; @@ -42,8 +41,6 @@ import org.junit.Test; */ public class ExpiryLargeMessageTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - // Constants ----------------------------------------------------- final SimpleString EXPIRY = new SimpleString("my-expiry"); @@ -153,13 +150,12 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase { cons = session.createConsumer(EXPIRY); session.start(); - log.info("Trying " + rep); for (int i = 0; i < numberOfMessages / 2; i++) { ClientMessage message = cons.receive(5000); assertNotNull(message); if (i % 10 == 0) { - System.out.println("Received " + i); + instanceLog.debug("Received " + i); } for (int location = 0; location < messageSize; location++) { @@ -209,7 +205,7 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase { assertNotNull(message); if (i % 10 == 0) { - System.out.println("Received " + i); + instanceLog.debug("Received " + i); } for (int location = 0; location < messageSize; location++) { @@ -339,7 +335,7 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase { assertNotNull(message); if (i % 10 == 0) { - System.out.println("Received " + i); + instanceLog.debug("Received " + i); } for (int location = 0; location < messageSize; location++) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java index d2ea515..3e9bfec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java @@ -30,15 +30,15 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.client.ActiveMQSession; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class FailureDeadlockTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(FailureDeadlockTest.class); private ActiveMQServer server; @@ -79,7 +79,7 @@ public class FailureDeadlockTest extends ActiveMQTestBase { try { conn2.close(); } catch (Exception e) { - FailureDeadlockTest.log.error("Failed to close connection2", e); + log.error("Failed to close connection2", e); } } }; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java index 64cb018..877f095 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java @@ -27,14 +27,15 @@ import javax.jms.Topic; import javax.jms.TopicSubscriber; import java.util.concurrent.CountDownLatch; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.JMSTestBase; +import org.jboss.logging.Logger; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { - IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(FlowControlOnIgnoreLargeMessageBodyTest.class); private Topic topic; @@ -105,7 +106,7 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { Connection connection = null; Session session = null; MessageProducer prod; - log.info("Starting producer for " + topic + " - " + getName()); + log.debug("Starting producer for " + topic + " - " + getName()); try { connection = cf.createConnection(); session = connection.createSession(true, Session.SESSION_TRANSACTED); @@ -126,10 +127,10 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { session.commit(); } if (i % 100 == 0) { - log.info("Address " + topic + " sent " + i + " messages"); + log.debug("Address " + topic + " sent " + i + " messages"); } } - System.out.println("Ending producer for " + topic + " - " + getName() + " messages " + sentMessages); + log.debug("Ending producer for " + topic + " - " + getName() + " messages " + sentMessages); } catch (Exception e) { error = true; e.printStackTrace(); @@ -203,7 +204,7 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { Session session = null; stopped = false; requestForStop = false; - System.out.println("Starting consumer for " + topic + " - " + getName()); + instanceLog.debug("Starting consumer for " + topic + " - " + getName()); try { connection = cf.createConnection(); @@ -221,11 +222,11 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { while (counter < numberOfMessages && !requestForStop && !error) { if (counter == 0) { - System.out.println("Starting to consume for " + topic + " - " + getName()); + instanceLog.debug("Starting to consume for " + topic + " - " + getName()); } BytesMessage msg = (BytesMessage) subscriber.receive(receiveTimeout); if (msg == null) { - System.out.println("Cannot get message in specified timeout: " + topic + " - " + getName()); + instanceLog.debug("Cannot get message in specified timeout: " + topic + " - " + getName()); error = true; } else { counter++; @@ -237,13 +238,13 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { session.commit(); } if (counter % 100 == 0) { - log.info("## " + getName() + " " + topic + " received " + counter); + log.debug("## " + getName() + " " + topic + " received " + counter); } receivedMessages = counter; } session.commit(); } catch (Exception e) { - System.out.println("Exception in consumer " + getName() + " : " + e.getMessage()); + instanceLog.debug("Exception in consumer " + getName() + " : " + e.getMessage()); e.printStackTrace(); } finally { if (session != null) { @@ -262,7 +263,7 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { } } stopped = true; - System.out.println("Stopping consumer for " + topic + + instanceLog.debug("Stopping consumer for " + topic + " - " + getName() + ", received " + @@ -312,14 +313,13 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase { } if (errorMessage != null) { - System.err.println(" ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR "); System.err.println(errorMessage); - } else { - System.out.println(" OK "); } assertFalse(error); - assertNull(errorMessage); + if (errorMessage != null) { + Assert.fail(errorMessage); + } } catch (Exception e) { log.warn(e.getMessage(), e); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FullQualifiedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FullQualifiedQueueTest.java index daaf9e5..f44e57b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FullQualifiedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FullQualifiedQueueTest.java @@ -91,31 +91,31 @@ public class FullQualifiedQueueTest extends ActiveMQTestBase { //each anycast consumer receives one, each multicast receives three. ClientMessage m = consumer1.receive(2000); assertNotNull(m); - System.out.println("consumer1 : " + m); + instanceLog.debug("consumer1 : " + m); m.acknowledge(); m = consumer2.receive(2000); assertNotNull(m); - System.out.println("consumer2 : " + m); + instanceLog.debug("consumer2 : " + m); m.acknowledge(); m = consumer3.receive(2000); assertNotNull(m); - System.out.println("consumer3 : " + m); + instanceLog.debug("consumer3 : " + m); m.acknowledge(); for (int i = 0; i < num; i++) { m = consumer4.receive(2000); assertNotNull(m); - System.out.println("consumer4 : " + m); + instanceLog.debug("consumer4 : " + m); m.acknowledge(); m = consumer5.receive(2000); assertNotNull(m); - System.out.println("consumer5 : " + m); + instanceLog.debug("consumer5 : " + m); m.acknowledge(); m = consumer6.receive(2000); assertNotNull(m); - System.out.println("consumer6 : " + m); + instanceLog.debug("consumer6 : " + m); m.acknowledge(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java index d900247..318dbf9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java @@ -440,14 +440,14 @@ public class HangConsumerTest extends ActiveMQTestBase { int bindings = 0; for (RecordInfo info : infos) { - System.out.println("info: " + info); + instanceLog.debug("info: " + info); if (info.getUserRecordType() == JournalRecordIds.QUEUE_BINDING_RECORD) { bindings++; } } assertEquals(1, bindings); - System.out.println("Bindings: " + bindings); + instanceLog.debug("Bindings: " + bindings); messagesJournal.stop(); if (i < 4) server.start(); @@ -613,7 +613,7 @@ public class HangConsumerTest extends ActiveMQTestBase { @Override public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet instanceof SessionReceiveMessage) { - System.out.println("Receiving message"); + instanceLog.debug("Receiving message"); try { reusableLatch.countDown(); semaphore.acquire(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java index c44a7a0..c64a761 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java @@ -119,7 +119,7 @@ public class HeuristicXATest extends ActiveMQTestBase { Assert.assertEquals(1, preparedTransactions.length); - System.out.println(preparedTransactions[0]); + instanceLog.debug(preparedTransactions[0]); Assert.assertEquals(0, jmxServer.listHeuristicCommittedTransactions().length); Assert.assertEquals(0, jmxServer.listHeuristicRolledBackTransactions().length); @@ -191,7 +191,7 @@ public class HeuristicXATest extends ActiveMQTestBase { String[] preparedTransactions = jmxServer.listPreparedTransactions(); Assert.assertEquals(1, preparedTransactions.length); - System.out.println(preparedTransactions[0]); + instanceLog.debug(preparedTransactions[0]); if (isCommit) { jmxServer.commitPreparedTransaction(XidImpl.toBase64String(xid)); @@ -216,11 +216,11 @@ public class HeuristicXATest extends ActiveMQTestBase { if (isCommit) { String[] listHeuristicCommittedTransactions = jmxServer.listHeuristicCommittedTransactions(); Assert.assertEquals(1, listHeuristicCommittedTransactions.length); - System.out.println(listHeuristicCommittedTransactions[0]); + instanceLog.debug(listHeuristicCommittedTransactions[0]); } else { String[] listHeuristicRolledBackTransactions = jmxServer.listHeuristicRolledBackTransactions(); Assert.assertEquals(1, listHeuristicRolledBackTransactions.length); - System.out.println(listHeuristicRolledBackTransactions[0]); + instanceLog.debug(listHeuristicRolledBackTransactions[0]); } } @@ -269,7 +269,7 @@ public class HeuristicXATest extends ActiveMQTestBase { String[] preparedTransactions = jmxServer.listPreparedTransactions(); Assert.assertEquals(1, preparedTransactions.length); - System.out.println(preparedTransactions[0]); + instanceLog.debug(preparedTransactions[0]); if (heuristicCommit) { jmxServer.commitPreparedTransaction(XidImpl.toBase64String(xid)); @@ -295,11 +295,11 @@ public class HeuristicXATest extends ActiveMQTestBase { if (heuristicCommit) { String[] listHeuristicCommittedTransactions = jmxServer.listHeuristicCommittedTransactions(); Assert.assertEquals(1, listHeuristicCommittedTransactions.length); - System.out.println(listHeuristicCommittedTransactions[0]); + instanceLog.debug(listHeuristicCommittedTransactions[0]); } else { String[] listHeuristicRolledBackTransactions = jmxServer.listHeuristicRolledBackTransactions(); Assert.assertEquals(1, listHeuristicRolledBackTransactions.length); - System.out.println(listHeuristicRolledBackTransactions[0]); + instanceLog.debug(listHeuristicRolledBackTransactions[0]); } session = sf.createSession(true, false, false); @@ -370,7 +370,7 @@ public class HeuristicXATest extends ActiveMQTestBase { String[] preparedTransactions = jmxServer.listPreparedTransactions(); Assert.assertEquals(1, preparedTransactions.length); - System.out.println(preparedTransactions[0]); + instanceLog.debug(preparedTransactions[0]); if (heuristicCommit) { jmxServer.commitPreparedTransaction(XidImpl.toBase64String(xid)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java index ec641bd..b296e40 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java @@ -40,10 +40,10 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSess import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.version.impl.VersionImpl; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.SpawnedTestBase; import org.apache.activemq.artemis.utils.SpawnedVMSupport; import org.apache.activemq.artemis.utils.VersionLoader; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -53,8 +53,9 @@ import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; public class IncompatibleVersionTest extends SpawnedTestBase { + private static final Logger log = Logger.getLogger(IncompatibleVersionTest.class); + private static final String WORD_START = "&*STARTED&*"; - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -233,7 +234,7 @@ public class IncompatibleVersionTest extends SpawnedTestBase { System.out.println(WORD_START); - log.info("### server: " + startedString); + log.debug("### server: " + startedString); } } @@ -246,7 +247,7 @@ public class IncompatibleVersionTest extends SpawnedTestBase { locator = createNettyNonHALocator(); sf = locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); - log.info("### client: connected. server incrementingVersion = " + session.getVersion()); + log.debug("### client: connected. server incrementingVersion = " + session.getVersion()); session.close(); } finally { closeSessionFactory(sf); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java index df4bc8c..d4c73b1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java @@ -63,11 +63,11 @@ import org.apache.activemq.artemis.core.settings.HierarchicalRepository; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ExecutorFactory; import org.apache.activemq.artemis.utils.actors.ArtemisExecutor; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -77,9 +77,9 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { static final int RECEIVE_WAIT_TIME = 60000; - private final int LARGE_MESSAGE_SIZE = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3; + private static final Logger log = Logger.getLogger(InterruptedLargeMessageTest.class); - private final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private final int LARGE_MESSAGE_SIZE = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3; protected ServerLocator locator; @@ -180,7 +180,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { @Override public void run() { try { - System.out.println("Receiving message"); + instanceLog.debug("Receiving message"); ClientMessage msg = cons.receive(5000); if (msg == null) { System.err.println("Message not received"); @@ -234,7 +234,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { @Override public void run() { try { - System.out.println("Receiving message"); + instanceLog.debug("Receiving message"); javax.jms.Message msg = consumer.receive(5000); if (msg == null) { System.err.println("Message not received"); @@ -242,10 +242,10 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { return; } } catch (JMSException e) { - log.debug("This exception was ok as it was expected", e); + instanceLog.debug("This exception was ok as it was expected", e); expectedErrors.incrementAndGet(); } catch (Throwable e) { - log.warn("Captured unexpected exception", e); + instanceLog.warn("Captured unexpected exception", e); unexpectedErrors.incrementAndGet(); } } @@ -451,7 +451,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { server.start(); for (int start = 0; start < 2; start++) { - System.out.println("Start " + start); + instanceLog.debug("Start " + start); sf = createSessionFactory(locator); @@ -465,7 +465,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { ClientConsumer cons1 = session.createConsumer(ADDRESS); session.start(); for (int i = 0; i < 10; i++) { - log.info("I = " + i); + instanceLog.info("I = " + i); ClientMessage msg = cons1.receive(5000); Assert.assertNotNull(msg); Assert.assertEquals(1, msg.getIntProperty("txid").intValue()); @@ -529,7 +529,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { @Override public void postAcknowledge(final MessageReference ref, AckReason reason) { - System.out.println("Ignoring postACK on message " + ref); + instanceLog.debug("Ignoring postACK on message " + ref); } @Override @@ -739,7 +739,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase { if (packet instanceof SessionContinuationMessage) { SessionContinuationMessage msg = (SessionContinuationMessage) packet; if (!msg.isContinues() && intMessages) { - System.out.println("Ignored a message"); + log.debug("Ignored a message"); latch.countDown(); return false; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java index 48080fe..99819af 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java @@ -57,7 +57,7 @@ public class JMSMessageCounterTest extends JMSTestBase { QueueControl control = (QueueControl) server.getManagementService().getResource(ResourceNames.QUEUE + queue.getQueueName()); assertNotNull(control); - System.out.println(control.listMessageCounterAsHTML()); + instanceLog.debug(control.listMessageCounterAsHTML()); jmsServer.stop(); @@ -66,7 +66,7 @@ public class JMSMessageCounterTest extends JMSTestBase { control = (QueueControl) server.getManagementService().getResource(ResourceNames.QUEUE + queue.getQueueName()); assertNotNull(control); - System.out.println(control.listMessageCounterAsHTML()); + instanceLog.debug(control.listMessageCounterAsHTML()); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java index f4087d4..e883bf6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSOrderTest.java @@ -113,7 +113,6 @@ public class JMSOrderTest extends JMSTestBase { Message message = consumer.receive(3000); assertNotNull("Failed to receive message: " + i, message); int msgNum = message.getIntProperty("nr"); - System.out.println("Received " + msgNum); messageNumbers.add(msgNum); } @@ -163,7 +162,6 @@ public class JMSOrderTest extends JMSTestBase { Message message = consumer.receive(3000); assertNotNull("Failed to receive message: " + i, message); int msgNum = message.getIntProperty("nr"); - System.out.println("Received " + msgNum); messageNumbers.add(msgNum); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java index bf2446b..ff23351 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java @@ -27,7 +27,6 @@ import javax.jms.Topic; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.paging.PagingStore; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.apache.activemq.artemis.tests.util.Wait; import org.junit.Before; @@ -38,8 +37,6 @@ import org.junit.Test; */ public class JMSPagingFileDeleteTest extends JMSTestBase { - static IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - Topic topic1; Connection connection; @@ -100,13 +97,13 @@ public class JMSPagingFileDeleteTest extends JMSTestBase { subscriber1 = session.createConsumer(topic1); // -----------------(Step1) Publish Messages to make Paging Files. -------------------- - System.out.println("---------- Send messages. ----------"); + instanceLog.debug("---------- Send messages. ----------"); BytesMessage bytesMessage = session.createBytesMessage(); bytesMessage.writeBytes(new byte[JMSPagingFileDeleteTest.MESSAGE_SIZE]); for (int i = 0; i < JMSPagingFileDeleteTest.MESSAGE_NUM; i++) { producer.send(bytesMessage); } - System.out.println("Sent " + JMSPagingFileDeleteTest.MESSAGE_NUM + " messages."); + instanceLog.debug("Sent " + JMSPagingFileDeleteTest.MESSAGE_NUM + " messages."); pagingStore = server.getPagingManager().getPageStore(new SimpleString("topic1")); printPageStoreInfo(pagingStore); @@ -148,13 +145,13 @@ public class JMSPagingFileDeleteTest extends JMSTestBase { subscriber2 = session.createDurableSubscriber(topic1, "subscriber-2"); // -----------------(Step1) Publish Messages to make Paging Files. -------------------- - System.out.println("---------- Send messages. ----------"); + instanceLog.debug("---------- Send messages. ----------"); BytesMessage bytesMessage = session.createBytesMessage(); bytesMessage.writeBytes(new byte[JMSPagingFileDeleteTest.MESSAGE_SIZE]); for (int i = 0; i < JMSPagingFileDeleteTest.MESSAGE_NUM; i++) { producer.send(bytesMessage); } - System.out.println("Sent " + JMSPagingFileDeleteTest.MESSAGE_NUM + " messages."); + instanceLog.debug("Sent " + JMSPagingFileDeleteTest.MESSAGE_NUM + " messages."); pagingStore = server.getPagingManager().getPageStore(new SimpleString("topic1")); printPageStoreInfo(pagingStore); @@ -167,7 +164,7 @@ public class JMSPagingFileDeleteTest extends JMSTestBase { stopAndStartServer(); // If try this test without restarting server, please comment out this line; // -----------------(Step3) Subscribe to all the messages from the topic.-------------- - System.out.println("---------- Receive all messages. ----------"); + instanceLog.debug("---------- Receive all messages. ----------"); for (int i = 0; i < JMSPagingFileDeleteTest.MESSAGE_NUM; i++) { Message message1 = subscriber1.receive(JMSPagingFileDeleteTest.RECEIVE_TIMEOUT); assertNotNull(message1); @@ -212,7 +209,7 @@ public class JMSPagingFileDeleteTest extends JMSTestBase { } private void stopAndStartServer() throws Exception { - System.out.println("---------- Restart server. ----------"); + instanceLog.debug("---------- Restart server. ----------"); connection.close(); jmsServer.stop(); @@ -235,11 +232,11 @@ public class JMSPagingFileDeleteTest extends JMSTestBase { } private void printPageStoreInfo(PagingStore pagingStore) throws Exception { - System.out.println("---------- Paging Store Info ----------"); - System.out.println(" CurrentPage = " + pagingStore.getCurrentPage()); - System.out.println(" FirstPage = " + pagingStore.getFirstPage()); - System.out.println(" Number of Pages = " + pagingStore.getNumberOfPages()); - System.out.println(" Address Size = " + pagingStore.getAddressSize()); - System.out.println(" Is Paging = " + pagingStore.isPaging()); + instanceLog.debug("---------- Paging Store Info ----------"); + instanceLog.debug(" CurrentPage = " + pagingStore.getCurrentPage()); + instanceLog.debug(" FirstPage = " + pagingStore.getFirstPage()); + instanceLog.debug(" Number of Pages = " + pagingStore.getNumberOfPages()); + instanceLog.debug(" Address Size = " + pagingStore.getAddressSize()); + instanceLog.debug(" Is Paging = " + pagingStore.isPaging()); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java index aa5a76b..129ef38 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java @@ -282,9 +282,7 @@ public class JmsNettyNioStressTest extends ActiveMQTestBase { Wait.waitFor(() -> totalExpectedCount == totalCount.get(), 60000, 100); - System.out.println("Done.." + totalCount.get() + ", expected " + totalExpectedCount); Assert.assertEquals("Possible deadlock", totalExpectedCount, totalCount.get()); - System.out.println("After assert"); // attempt cleaning up (this is not in a finally, still needs some work) connectionProducer.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java index a03ca5d..573ac1b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java @@ -292,8 +292,6 @@ public class LargeMessageCompressTest extends LargeMessageTest { public void testHugeStreamingSpacesCompressed() throws Exception { final long messageSize = 1024L * 1024L; - System.out.println("Message size = " + messageSize); - ActiveMQServer server = createServer(true, isNetty()); server.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java index 7d4df61..745a6f7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java @@ -50,21 +50,22 @@ import org.apache.activemq.artemis.core.server.MessageReference; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.artemis.utils.collections.LinkedListIterator; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class LargeMessageTest extends LargeMessageTestBase { - private static final int RECEIVE_WAIT_TIME = 10000; - private final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(LargeMessageTest.class); + + private static final int RECEIVE_WAIT_TIME = 10000; protected ServerLocator locator; @@ -85,7 +86,7 @@ public class LargeMessageTest extends LargeMessageTestBase { @Test public void testRollbackPartiallyConsumedBuffer() throws Exception { for (int i = 0; i < 1; i++) { - log.info("#test " + i); + log.debug("#test " + i); internalTestRollbackPartiallyConsumedBuffer(false); tearDown(); setUp(); @@ -600,7 +601,7 @@ public class LargeMessageTest extends LargeMessageTestBase { msg.acknowledge(); Assert.assertEquals(1, msg.getDeliveryCount()); - log.info("body buffer is " + msg.getBodyBuffer()); + log.debug("body buffer is " + msg.getBodyBuffer()); for (int i = 0; i < messageSize; i++) { Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java index 2a1145d..593a1c1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java @@ -31,15 +31,15 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; public class MessageConcurrencyTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(MessageConcurrencyTest.class); private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java index dee29af..03d482c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java @@ -220,7 +220,6 @@ public class MessageConsumerRollbackTest extends ActiveMQTestBase { } if (counter.incrementAndGet() % 200 == 0) { - System.out.println("rollback " + message); session.rollback(); } else { commitLatch.countDown(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java index be7b48d..32108c3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java @@ -37,8 +37,8 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.transaction.impl.XidImpl; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; @@ -46,7 +46,7 @@ import org.junit.Test; public class MessageGroupingTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(MessageGroupingTest.class); private ActiveMQServer server; @@ -199,7 +199,7 @@ public class MessageGroupingTest extends ActiveMQTestBase { Assert.assertEquals(cm.getBodyBuffer().readString(), "m" + i); } - MessageGroupingTest.log.info("closing consumer2"); + log.debug("closing consumer2"); consumer2.close(); @@ -294,7 +294,6 @@ public class MessageGroupingTest extends ActiveMQTestBase { } private void doTestMultipleGroupingTXRollback() throws Exception { - log.info("*** starting test"); ServerLocator locator = createInVMNonHALocator(); locator.setBlockOnAcknowledge(true); ClientSessionFactory sessionFactory = createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java index a43d5ae..08ac94f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java @@ -29,7 +29,6 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; @@ -37,8 +36,6 @@ import org.junit.Test; public class MessageHandlerTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private ActiveMQServer server; private final SimpleString QUEUE = new SimpleString("ConsumerTestQueue"); @@ -164,8 +161,6 @@ public class MessageHandlerTest extends ActiveMQTestBase { messageReceived++; - log.info("got message " + messageReceived); - latch.countDown(); if (latch.getCount() == 0) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java index bd0b88d..56ecd1c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java @@ -27,9 +27,9 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ public class MessagePriorityTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(MessagePriorityTest.class); // Attributes ---------------------------------------------------- @@ -118,7 +118,7 @@ public class MessagePriorityTest extends ActiveMQTestBase { for (int i = 9; i >= 0; i--) { ClientMessage m = consumer.receive(500); - log.info("received msg " + m.getPriority()); + log.debug("received msg " + m.getPriority()); Assert.assertNotNull(m); Assert.assertEquals(i, m.getPriority()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java index 7b3039d..eb5b6d4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java @@ -31,15 +31,15 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.SingleServerTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; public class MixRoutingTest extends SingleServerTestBase { // Constants ----------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(MixRoutingTest.class); private static final long CONNECTION_TTL = 2000; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java index 2af1104..3986f1c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java @@ -154,7 +154,7 @@ public class MultipleThreadFilterOneTest extends ActiveMQTestBase { msg.acknowledge(); if (i % 500 == 0) { - System.out.println("Consumed " + i); + instanceLog.debug("Consumed " + i); consumerSession.commit(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java index 0bd8145..623f8a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java @@ -39,14 +39,14 @@ import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.settings.HierarchicalRepository; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; +import org.jboss.logging.Logger; import org.junit.Test; public class NIOvsOIOTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(NIOvsOIOTest.class); // Constants ----------------------------------------------------- @@ -209,7 +209,7 @@ public class NIOvsOIOTest extends ActiveMQTestBase { log.error("Caught exception", e); } - //log.info(id + " sent message " + i); + //log.debug(id + " sent message " + i); } } @@ -283,7 +283,7 @@ public class NIOvsOIOTest extends ActiveMQTestBase { latch.countDown(); } - //log.info(id + " got msg " + count); + //log.debug(id + " got msg " + count); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java index 168475f..aa16286 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java @@ -41,7 +41,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.HierarchicalRepository; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; import org.junit.Assert; @@ -50,8 +49,6 @@ import org.junit.Test; public class ProducerFlowControlTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private ServerLocator locator; private ClientSessionFactory sf; @@ -247,7 +244,7 @@ public class ProducerFlowControlTest extends ActiveMQTestBase { } } catch (Exception e) { - ProducerFlowControlTest.log.error("Failed to handle message", e); + instanceLog.error("Failed to handle message", e); exception = e; @@ -303,7 +300,7 @@ public class ProducerFlowControlTest extends ActiveMQTestBase { double rate = 1000 * (double) numMessages / (end - start); - ProducerFlowControlTest.log.info("rate is " + rate + " msgs / sec"); + instanceLog.debug("rate is " + rate + " msgs / sec"); } @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java index ac66eec..8c5d6ac 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java @@ -94,7 +94,7 @@ public class ProducerTest extends ActiveMQTestBase { for (int i = 0; i < 100; i++) { final CountDownLatch latch = new CountDownLatch(1); - System.out.println("Try " + i); + instanceLog.debug("Try " + i); ClientSessionFactory cf = locator.createSessionFactory(); final ClientSession session = cf.createSession(false, true, true); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java index e78e34a..8431867 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java @@ -37,7 +37,6 @@ import org.apache.activemq.artemis.core.journal.RecordInfo; import org.apache.activemq.artemis.core.journal.impl.JournalImpl; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; @@ -46,8 +45,6 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - // Attributes ---------------------------------------------------- ActiveMQServer server; @@ -174,7 +171,7 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase { setUp(strictUpdate); ClientSession session = factory.createSession(false, false, false); - RedeliveryConsumerTest.log.info("created"); + instanceLog.debug("created"); ClientProducer prod = session.createProducer(ADDRESS); prod.send(createTextMessage(session, "Hello")); @@ -226,7 +223,7 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase { setUp(strict); ClientSession session = factory.createSession(false, false, false); - RedeliveryConsumerTest.log.info("created"); + instanceLog.debug("created"); ClientProducer prod = session.createProducer(ADDRESS); prod.send(createTextMessage(session, "Hello")); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java index 69ba87f..4490c84 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java @@ -94,9 +94,6 @@ public class RequestorTest extends ActiveMQTestBase { requestConsumer.setMessageHandler(new SimpleMessageHandler(key, sessionRequest)); for (int i = 0; i < 2000; i++) { - if (i % 100 == 0) { - System.out.println(i); - } final ClientSession session = sf.createSession(false, true, true); session.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java index f9be93a..9150e95 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java @@ -26,7 +26,6 @@ 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.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; import org.junit.Assert; @@ -34,8 +33,6 @@ import org.junit.Test; public class SelfExpandingBufferTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - ActiveMQServer service; SimpleString ADDRESS = new SimpleString("Address"); @@ -79,8 +76,6 @@ public class SelfExpandingBufferTest extends ActiveMQTestBase { ActiveMQBuffer buffer = msg.getBodyBuffer(); - SelfExpandingBufferTest.log.info("buffer is " + buffer); - byte[] bytes = RandomUtil.randomBytes(10 * buffer.capacity()); buffer.writeBytes(bytes); @@ -103,11 +98,11 @@ public class SelfExpandingBufferTest extends ActiveMQTestBase { byte[] receivedBytes = new byte[bytes.length]; - // log.info("buffer start pos should be at " + PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT); + // log.debug("buffer start pos should be at " + PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT); // - // log.info("buffer pos at " + msg2.getBodyBuffer().readerIndex()); + // log.debug("buffer pos at " + msg2.getBodyBuffer().readerIndex()); // - // log.info("buffer length should be " + msg2.getBodyBuffer().readInt(PacketImpl.PACKET_HEADERS_SIZE)); + // log.debug("buffer length should be " + msg2.getBodyBuffer().readInt(PacketImpl.PACKET_HEADERS_SIZE)); msg2.getBodyBuffer().readBytes(receivedBytes); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java index 3e99da8..d3eda70 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SendAckFailTest.java @@ -186,14 +186,14 @@ public class SendAckFailTest extends SpawnedTestBase { ClientMessage message = consumer.receive(1000); if (message == null) { for (Integer msgi : listSent) { - System.out.println("Message " + msgi + " was lost"); + instanceLog.debug("Message " + msgi + " was lost"); } fail("missed messages!"); } message.acknowledge(); if (!listSent.remove(message.getIntProperty("myid"))) { - System.out.println("Message " + message + " with id " + message.getIntProperty("myid") + " received in duplicate"); + instanceLog.debug("Message " + message + " with id " + message.getIntProperty("myid") + " received in duplicate"); fail("Message " + message + " with id " + message.getIntProperty("myid") + " received in duplicate"); } } @@ -252,8 +252,6 @@ public class SendAckFailTest extends SpawnedTestBase { if (fail) { if (count.incrementAndGet() == 110) { - System.out.println("Failing " + message); - System.out.flush(); Thread.sleep(100); Runtime.getRuntime().halt(-1); } @@ -268,7 +266,7 @@ public class SendAckFailTest extends SpawnedTestBase { - System.out.println("Location::" + server.getConfiguration().getJournalLocation().getAbsolutePath()); + instanceLog.debug("Location::" + server.getConfiguration().getJournalLocation().getAbsolutePath()); addServer(server); server.start(); return server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java index 083ac7c..55e643d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java @@ -29,15 +29,15 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class SessionStopStartTest extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(SessionStopStartTest.class); private ActiveMQServer server; @@ -210,9 +210,6 @@ public class SessionStopStartTest extends ActiveMQTestBase { session.start(); for (int i = 0; i < 90; i++) { ClientMessage msg = consumer.receive(1000); - if (msg == null) { - System.out.println("ClientConsumerTest.testStopConsumer"); - } Assert.assertNotNull("message " + i, msg); msg.acknowledge(); } @@ -297,9 +294,6 @@ public class SessionStopStartTest extends ActiveMQTestBase { session.start(); for (int i = 0; i < 90; i++) { ClientMessage msg = consumer.receive(1000); - if (msg == null) { - System.out.println("ClientConsumerTest.testStopConsumer"); - } Assert.assertNotNull("message " + i, msg); msg.acknowledge(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java index 06250f2..80d34e6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SimpleSendMultipleQueuesTest.java @@ -59,9 +59,9 @@ public class SimpleSendMultipleQueuesTest extends ActiveMQTestBase { message.getBodyBuffer().writeString(body); - // log.info("sending message"); + // log.debug("sending message"); producer.send(message); - // log.info("sent message"); + // log.debug("sent message"); ClientMessage received1 = consumer1.receive(1000); Assert.assertNotNull(received1); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java index 96bdfe0..7690410 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java @@ -48,16 +48,16 @@ import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.SingleServerTestBase; import org.apache.activemq.artemis.utils.RandomUtil; +import org.jboss.logging.Logger; import org.junit.Test; public class TemporaryQueueTest extends SingleServerTestBase { // Constants ----------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(TemporaryQueueTest.class); private static final long CONNECTION_TTL = 2000; @@ -108,8 +108,6 @@ public class TemporaryQueueTest extends SingleServerTestBase { sf.close(); - System.out.println("size = " + server.getAddressSettingsRepository().getCacheSize()); - assertTrue(server.getAddressSettingsRepository().getCacheSize() < 10); } @@ -398,7 +396,6 @@ public class TemporaryQueueTest extends SingleServerTestBase { localSession.start(); - log.info("Iteration " + i); String queueRed = address + "_red_" + (countTmpQueue++); String queueBlue = address + "_blue_" + (countTmpQueue++); @@ -556,7 +553,6 @@ public class TemporaryQueueTest extends SingleServerTestBase { errors.incrementAndGet(); } - System.out.println("done"); } }; @@ -590,7 +586,6 @@ public class TemporaryQueueTest extends SingleServerTestBase { for (ServerSession sessionIterator : server.getSessions()) { if (sessionIterator.getMetaData("consumer") != null) { - System.out.println("Failing session"); ServerSessionImpl impl = (ServerSessionImpl) sessionIterator; impl.getRemotingConnection().fail(new ActiveMQDisconnectedException("failure e")); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java index ff92b11..5aabb1e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java @@ -29,9 +29,9 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.SpawnedVMCheck; import org.apache.activemq.artemis.utils.SpawnedVMSupport; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -44,6 +44,8 @@ import org.junit.Test; */ public class ClientCrashTest extends ClientTestBase { + private static final Logger log = Logger.getLogger(ClientCrashTest.class); + @Rule public SpawnedVMCheck spawnedVMCheck = new SpawnedVMCheck(); @@ -64,8 +66,6 @@ public class ClientCrashTest extends ClientTestBase { // Static -------------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - // Attributes ---------------------------------------------------- private ClientSessionFactory sf; @@ -125,8 +125,6 @@ public class ClientCrashTest extends ClientTestBase { assertEquals(9, p.exitValue()); - System.out.println("VM Exited"); - long timeout = ClientCrashTest.CONNECTION_TTL + ClientCrashTest.PING_PERIOD + 10000; assertActiveConnections(1, timeout); @@ -159,8 +157,6 @@ public class ClientCrashTest extends ClientTestBase { assertEquals(CrashClient2.OK, p.exitValue()); - System.out.println("VM Exited"); - long timeout = ClientCrashTest.CONNECTION_TTL + ClientCrashTest.PING_PERIOD + 10000L; assertActiveConnections(1, timeout); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java index e179826..5fc6f1a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java @@ -23,9 +23,9 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage; 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.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.utils.SpawnedVMSupport; import org.apache.activemq.artemis.utils.RandomUtil; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; @@ -45,7 +45,7 @@ public class ClientExitTest extends ClientTestBase { // Static --------------------------------------------------------------------------------------- - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(ClientExitTest.class); // Attributes ----------------------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java index 4bc6010..13cbc08 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java @@ -16,8 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.clientcrash; -import java.util.Arrays; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ClientMessage; @@ -27,25 +25,23 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.jboss.logging.Logger; /** * Code to be run in an external VM, via main() */ public class CrashClient { + private static final Logger log = Logger.getLogger(CrashClient.class); + public static int OK = 9; public static int NOT_OK = 1; // Constants ------------------------------------------------------------------------------------ - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - // Static --------------------------------------------------------------------------------------- public static void main(final String[] args) throws Exception { try { - CrashClient.log.debug("args = " + Arrays.asList(args)); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName())); locator.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); locator.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java index 40367f5..14c2183 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java @@ -16,8 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.clientcrash; -import java.util.Arrays; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ClientConsumer; @@ -27,24 +25,21 @@ 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.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.jboss.logging.Logger; /** * Code to be run in an external VM, via main() */ public class CrashClient2 { + private static final Logger log = Logger.getLogger(CrashClient2.class); public static final int OK = 9; // Constants ------------------------------------------------------------------------------------ - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - // Static --------------------------------------------------------------------------------------- public static void main(final String[] args) throws Exception { try { - log.debug("args = " + Arrays.asList(args)); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName())); locator.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); locator.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java index cb21023..8c0f09b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java @@ -25,11 +25,11 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionReceiveMessage; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.jboss.logging.Logger; public class DummyInterceptor implements Interceptor { - protected IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(DummyInterceptor.class); boolean sendException = false; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java index 81ef047..d8ec7c2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java @@ -22,11 +22,11 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Interceptor; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.jboss.logging.Logger; public class DummyInterceptorB implements Interceptor { - protected IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(DummyInterceptorB.class); static AtomicInteger syncCounter = new AtomicInteger(0); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java index bec01f2..d4d42ca 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java @@ -26,15 +26,15 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.jboss.logging.Logger; /** * Code to be run in an external VM, via main() */ public class GracefulClient { - // Constants ------------------------------------------------------------------------------------ + private static final Logger log = Logger.getLogger(GracefulClient.class); - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + // Constants ------------------------------------------------------------------------------------ // Static --------------------------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java index 703de6b..7e9401c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java @@ -48,7 +48,6 @@ public class PendingDeliveriesTest extends ClientTestBase { @After public void clearLogger() throws Exception { - System.out.println("After clearing"); AssertionLoggerHandler.stopCapture(); AssertionLoggerHandler.clear(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java index 8ade9ee..7d56321 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerAction.java @@ -125,7 +125,6 @@ public class NodeManagerAction { e.printStackTrace(); System.exit(9); } - System.out.println("work performed"); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java index e2b819e..49680f2f3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeReconnectTest.java @@ -46,13 +46,14 @@ import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl; import org.apache.activemq.artemis.core.server.impl.InVMNodeManager; import org.apache.activemq.artemis.core.server.management.ManagementService; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.apache.activemq.artemis.tests.util.Wait; +import org.jboss.logging.Logger; import org.junit.Before; import org.junit.Test; public class BridgeReconnectTest extends BridgeTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(BridgeReconnectTest.class); private static final int NUM_MESSAGES = 100; @@ -204,7 +205,7 @@ public class BridgeReconnectTest extends BridgeTestBase { startServers(); - BridgeReconnectTest.log.info("** failing connection"); + BridgeReconnectTest.log.debug("** failing connection"); // Now we will simulate a failure of the bridge connection between server0 and server1 server0.fail(true); @@ -445,16 +446,16 @@ public class BridgeReconnectTest extends BridgeTestBase { ClientProducer prod0 = session0.createProducer(testAddress); - BridgeReconnectTest.log.info("stopping server1"); + BridgeReconnectTest.log.debug("stopping server1"); server1.stop(); if (sleep) { Thread.sleep(2 * clientFailureCheckPeriod); } - BridgeReconnectTest.log.info("restarting server1"); + BridgeReconnectTest.log.debug("restarting server1"); server1.start(); - BridgeReconnectTest.log.info("server 1 restarted"); + BridgeReconnectTest.log.debug("server 1 restarted"); ClientSessionFactory csf1 = locator.createSessionFactory(server1tc); session1 = csf1.createSession(false, true, true); @@ -474,7 +475,7 @@ public class BridgeReconnectTest extends BridgeTestBase { prod0.send(message); } - BridgeReconnectTest.log.info("sent messages"); + BridgeReconnectTest.log.debug("sent messages"); for (int i = 0; i < numMessages; i++) { ClientMessage r1 = cons1.receive(30000); @@ -482,7 +483,7 @@ public class BridgeReconnectTest extends BridgeTestBase { assertEquals("property value matches", i, r1.getObjectProperty(propKey)); } - BridgeReconnectTest.log.info("got messages"); + BridgeReconnectTest.log.debug("got messages"); closeServers(); assertNoMoreConnections(); } @@ -585,7 +586,7 @@ public class BridgeReconnectTest extends BridgeTestBase { fail("Message " + outOfOrder + " was received out of order, it was supposed to be " + supposed); } - log.info("=========== second failure, sending message"); + log.debug("=========== second failure, sending message"); // Fail again - should reconnect forwardingConnection = ((BridgeImpl) bridge).getForwardingConnection(); @@ -666,8 +667,6 @@ public class BridgeReconnectTest extends BridgeTestBase { final Queue queue = (Queue) server0.getPostOffice().getBinding(new SimpleString(queueName)).getBindable(); - System.out.println("DeliveringCount: " + queue.getDeliveringCount()); - for (int i = 0; i < numMessages; i++) { ClientMessage message = session0.createMessage(false); message.putIntProperty(propKey, i); @@ -679,12 +678,7 @@ public class BridgeReconnectTest extends BridgeTestBase { } } - for (int i = 0; i < 100 && queue.getDeliveringCount() != 0; i++) { - Thread.sleep(10); - } - - System.out.println("Check.. DeliveringCount: " + queue.getDeliveringCount()); - assertEquals("Delivering count of a source queue should be zero on connection failure", 0, queue.getDeliveringCount()); + Wait.assertEquals(0, queue::getDeliveringCount); closeServers(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java index ee52ea4..13ba888 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeStartTest.java @@ -37,7 +37,6 @@ import org.apache.activemq.artemis.core.config.BridgeConfiguration; import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.cluster.Bridge; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; @@ -58,8 +57,6 @@ public class BridgeStartTest extends ActiveMQTestBase { private final boolean netty; - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - protected boolean isNetty() { return netty; } @@ -337,12 +334,8 @@ public class BridgeStartTest extends ActiveMQTestBase { sf1.close(); - BridgeStartTest.log.info("stopping server 1"); - server1.stop(); - BridgeStartTest.log.info("stopped server 1"); - for (int i = 0; i < numMessages; i++) { ClientMessage message = session0.createMessage(false); @@ -351,13 +344,9 @@ public class BridgeStartTest extends ActiveMQTestBase { producer0.send(message); } - BridgeStartTest.log.info("sent some more messages"); - server1.start(); waitForServerToStart(server1); - BridgeStartTest.log.info("started server1"); - sf1 = locator.createSessionFactory(server1tc); session1 = sf1.createSession(false, true, true); @@ -366,8 +355,6 @@ public class BridgeStartTest extends ActiveMQTestBase { session1.start(); - BridgeStartTest.log.info("started session"); - for (int i = 0; i < numMessages; i++) { ClientMessage message = consumer1.receive(1000); @@ -625,8 +612,6 @@ public class BridgeStartTest extends ActiveMQTestBase { Bridge bridge = server0.getClusterManager().getBridges().get(bridgeName); - BridgeStartTest.log.info("stopping bridge manually"); - bridge.stop(); bridge.flushExecutor(); @@ -643,8 +628,6 @@ public class BridgeStartTest extends ActiveMQTestBase { bridge.start(); - BridgeStartTest.log.info("started bridge"); - // The previous messages will get resent, but with duplicate detection they will be rejected // at the target diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java index 63de32c..00d2dc1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java @@ -82,6 +82,7 @@ import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.artemis.utils.RandomUtil; import org.apache.activemq.artemis.utils.ReusableLatch; import org.apache.activemq.artemis.utils.collections.LinkedListIterator; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -91,6 +92,8 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) public class BridgeTest extends ActiveMQTestBase { + private static final Logger log = Logger.getLogger(BridgeTest.class); + private ActiveMQServer server0; private ActiveMQServer server1; private ServerLocator locator; @@ -248,7 +251,6 @@ public class BridgeTest extends ActiveMQTestBase { assertEquals(0, loadQueues(server0).size()); } long timeTaken = System.currentTimeMillis() - time; - System.out.println(timeTaken + "ms"); } @Test @@ -391,7 +393,6 @@ public class BridgeTest extends ActiveMQTestBase { assertEquals(0, loadQueues(server0).size()); } long timeTaken = System.currentTimeMillis() - time; - System.out.println(timeTaken + "ms"); } public void internaltestSimpleBridge(final boolean largeMessage, final boolean useFiles) throws Exception { @@ -1495,7 +1496,7 @@ public class BridgeTest extends ActiveMQTestBase { msgCount.incrementAndGet(); if (i % 500 == 0) - System.out.println("received " + i); + instanceLog.debug("received " + i); } boolean failed = false; @@ -1569,14 +1570,11 @@ public class BridgeTest extends ActiveMQTestBase { if (packet instanceof SessionSendMessage && ++count == 100) { try { - System.out.println("Stopping server after " + count + " messages"); - thread = new Thread("***Server Restarter***") { @Override public void run() { try { - System.out.println("Stopping server"); serverToStop.fail(false); latch.countDown(); } catch (Exception e) { @@ -1816,7 +1814,7 @@ public class BridgeTest extends ActiveMQTestBase { File outputFile = new File(getTemporaryDir(), "huge_message_received.dat"); - System.out.println("-----message save to: " + outputFile.getAbsolutePath()); + instanceLog.debug("-----message save to: " + outputFile.getAbsolutePath()); FileOutputStream fileOutputStream = new FileOutputStream(outputFile); BufferedOutputStream bufferedOutput = new BufferedOutputStream(fileOutputStream); @@ -1861,7 +1859,7 @@ public class BridgeTest extends ActiveMQTestBase { createFile(fileInput, largeMessageSize); - System.out.println("File created at: " + fileInput.getAbsolutePath()); + instanceLog.debug("File created at: " + fileInput.getAbsolutePath()); ClientMessage message = session.createMessage(Message.BYTES_TYPE, true); @@ -1875,13 +1873,13 @@ public class BridgeTest extends ActiveMQTestBase { private static void createFile(final File file, final long fileSize) throws IOException { if (file.exists()) { - System.out.println("---file already there " + file.length()); + log.warn("---file already there " + file.length()); return; } FileOutputStream fileOut = new FileOutputStream(file); BufferedOutputStream buffOut = new BufferedOutputStream(fileOut); byte[] outBuffer = new byte[1024 * 1024]; - System.out.println(" --- creating file, size: " + fileSize); + log.debug(" --- creating file, size: " + fileSize); for (long i = 0; i < fileSize; i += outBuffer.length) { buffOut.write(outBuffer); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java index 3213953..4fb2faf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java @@ -300,7 +300,7 @@ public class ProtocolsMessageLoadBalancingTest extends ClusterTestBase { startServers(MessageLoadBalancingType.STRICT); - System.out.println("connections " + servers[1].getRemotingService().getConnections().size()); + instanceLog.debug("connections " + servers[1].getRemotingService().getConnections().size()); Wait.assertEquals(3, () -> servers[1].getRemotingService().getConnections().size()); Wait.assertEquals(3, () -> servers[0].getRemotingService().getConnections().size()); @@ -356,7 +356,7 @@ public class ProtocolsMessageLoadBalancingTest extends ClusterTestBase { waitForBindings(0, "queues.0", 1, 1, false); waitForBindings(1, "queues.0", 1, 1, false); - System.out.println("connections " + servers[1].getRemotingService().getConnections().size()); + instanceLog.debug("connections " + servers[1].getRemotingService().getConnections().size()); // sending Messages.. they should be load balanced { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java index 1c873eb..02eb245 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AutoDeleteDistributedTest.java @@ -33,14 +33,13 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.logs.AssertionLoggerHandler; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; public class AutoDeleteDistributedTest extends ClusterTestBase { - - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(AutoDeleteDistributedTest.class); @Override @Before @@ -110,7 +109,7 @@ public class AutoDeleteDistributedTest extends ClusterTestBase { client2JmsConsumer.setMessageListener(new MessageListener() { @Override public void onMessage(final javax.jms.Message m) { - System.out.println("Message received. " + m); + log.debug("Message received. " + m); onMessageReceived.countDown(); } }); @@ -125,7 +124,7 @@ public class AutoDeleteDistributedTest extends ClusterTestBase { jmsProducer.setAsync(new javax.jms.CompletionListener() { @Override public void onCompletion(final javax.jms.Message m) { - System.out.println("Message sent. " + m); + log.debug("Message sent. " + m); onMessageSent.countDown(); } @@ -141,11 +140,11 @@ public class AutoDeleteDistributedTest extends ClusterTestBase { jmsProducer.send(client1JmsContext.createQueue("queues.myQueue"), jmsMsg); } - System.out.println("Waiting for message to be sent..."); + log.debug("Waiting for message to be sent..."); onMessageSent.await(5, TimeUnit.SECONDS); } - System.out.println("Waiting for message to be received..."); + log.debug("Waiting for message to be received..."); Assert.assertTrue(onMessageReceived.await(5, TimeUnit.SECONDS)); client2JmsConsumer.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterConnectionConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterConnectionConfigTest.java index db77511..31c1520 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterConnectionConfigTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterConnectionConfigTest.java @@ -58,7 +58,6 @@ public class ClusterConnectionConfigTest extends ClusterTestBase { @Test public void testRedistributionFlowControl() throws Exception { final int producerWindow = new Random().nextInt(Integer.MAX_VALUE); - System.out.println("window is: " + producerWindow); setupCluster(MessageLoadBalancingType.ON_DEMAND, (ClusterConnectionConfiguration cfg) -> { cfg.setProducerWindowSize(producerWindow); }); @@ -82,7 +81,6 @@ public class ClusterConnectionConfigTest extends ClusterTestBase { //receiveMessages(consumers[1].consumer, 0, 1, true); Thread.sleep(5000); - System.out.println("checking records.........................."); makeSureForwardingFlowControl(producerWindow, 0, 1); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java index 8205ee0..7e812a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java @@ -85,9 +85,9 @@ import org.apache.activemq.artemis.core.server.group.GroupingHandler; import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.server.impl.InVMNodeManager; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.PortCheckRule; +import org.jboss.logging.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -95,7 +95,7 @@ import org.junit.ClassRule; public abstract class ClusterTestBase extends ActiveMQTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private static final Logger log = Logger.getLogger(ClusterTestBase.class); private static final int[] PORTS = {TransportConstants.DEFAULT_PORT, TransportConstants.DEFAULT_PORT + 1, TransportConstants.DEFAULT_PORT + 2, TransportConstants.DEFAULT_PORT + 3, TransportConstants.DEFAULT_PORT + 4, TransportConstants.DEFAULT_PORT + 5, TransportConstants.DEFAULT_PORT + 6, TransportConstants.DEFAULT_PORT + 7, TransportConstants.DEFAULT_PORT + 8, TransportConstants.DEFAULT_PORT + 9,}; @@ -349,7 +349,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { } } topologyDiagram.append("\n"); - log.info(topologyDiagram.toString()); + log.debug(topologyDiagram.toString()); } catch (Throwable e) { log.warn("error printing the topology::" + e.getMessage(), e); } @@ -430,14 +430,14 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { PostOffice po = server.getPostOffice(); Bindings bindings = po.getBindingsForAddress(new SimpleString(address)); - System.out.println("======================================================================="); - System.out.println("Binding information for address = " + address + " on node " + node); + log.debug("======================================================================="); + log.debug("Binding information for address = " + address + " on node " + node); for (Binding binding : bindings.getBindings()) { if (binding.isConnected() && (binding instanceof LocalQueueBinding && local || binding instanceof RemoteQueueBinding && !local)) { QueueBinding qBinding = (QueueBinding) binding; - System.out.println("Binding = " + qBinding + ", queue=" + qBinding.getQueue()); + log.debug("Binding = " + qBinding + ", queue=" + qBinding.getQueue()); } } @@ -544,7 +544,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { filterString = ClusterTestBase.FILTER_PROP.toString() + "='" + filterVal + "'"; } - log.info("Creating " + queueName + " , address " + address + " on " + servers[node]); + log.debug("Creating " + queueName + " , address " + address + " on " + servers[node]); session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(routingType).setFilterString(filterString).setDurable(durable)); @@ -868,7 +868,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { ClientMessage message = holder.consumer.receive(2000); if (message == null) { - log.info("*** dumping consumers:"); + log.debug("*** dumping consumers:"); dumpConsumers(); @@ -952,7 +952,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { ClientMessage message = holder.consumer.receive(WAIT_TIMEOUT); if (message == null) { - log.info("*** dumping consumers:"); + log.debug("*** dumping consumers:"); dumpConsumers(); @@ -978,9 +978,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { message.getObjectProperty(ClusterTestBase.COUNT_PROP); } outOfOrder = true; - System.out.println("Message j=" + j + " was received out of order = " + + log.debug("Message j=" + j + " was received out of order = " + message.getObjectProperty(ClusterTestBase.COUNT_PROP)); - log.info("Message j=" + j + + log.debug("Message j=" + j + " was received out of order = " + message.getObjectProperty(ClusterTestBase.COUNT_PROP)); } @@ -993,7 +993,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { private void dumpConsumers() throws Exception { for (int i = 0; i < consumers.length; i++) { if (consumers[i] != null && !consumers[i].consumer.isClosed()) { - log.info("Dumping consumer " + i); + log.debug("Dumping consumer " + i); checkReceive(i); } @@ -1046,11 +1046,11 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { message = holder.consumer.receive(500); if (message != null) { - log.info("check receive Consumer " + consumerID + + log.debug("check receive Consumer " + consumerID + " received message " + message.getObjectProperty(ClusterTestBase.COUNT_PROP)); } else { - log.info("check receive Consumer " + consumerID + " null message"); + log.debug("check receive Consumer " + consumerID + " null message"); } } while (message != null); @@ -1220,7 +1220,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { checkMessageBody(message); - // log.info("consumer " + consumerIDs[i] + " received message " + count); + // log.debug("consumer " + consumerIDs[i] + " received message " + count); Assert.assertFalse(counts.contains(count)); @@ -1920,7 +1920,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { protected void startServers(final int... nodes) throws Exception { for (int node : nodes) { - log.info("#test start node " + node); + log.debug("#test start node " + node); final long currentTime = System.currentTimeMillis(); boolean waitForSelf = currentTime - timeStarts[node] < TIMEOUT_START_SERVER; boolean waitForPrevious = node > 0 && currentTime - timeStarts[node - 1] < TIMEOUT_START_SERVER; @@ -1928,10 +1928,10 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { Thread.sleep(TIMEOUT_START_SERVER); } timeStarts[node] = System.currentTimeMillis(); - log.info("starting server " + servers[node]); + log.debug("starting server " + servers[node]); servers[node].start(); - log.info("started server " + servers[node]); + log.debug("started server " + servers[node]); waitForServerToStart(servers[node]); for (int i = 0; i < node * 1000; i++) { @@ -1954,7 +1954,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { } protected void stopServers(final int... nodes) throws Exception { - log.info("Stopping nodes " + Arrays.toString(nodes)); + log.debug("Stopping nodes " + Arrays.toString(nodes)); Exception exception = null; for (int node : nodes) { if (servers[node] != null && servers[node].isStarted()) { @@ -1966,9 +1966,9 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { timeStarts[node] = System.currentTimeMillis(); - log.info("stopping server " + node); + log.debug("stopping server " + node); servers[node].stop(); - log.info("server " + node + " stopped"); + log.debug("server " + node + " stopped"); } catch (Exception e) { exception = e; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java index 0a65415..ed0c637 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterWithBackupTest.java @@ -17,14 +17,11 @@ package org.apache.activemq.artemis.tests.integration.cluster.distribution; import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.junit.Before; import org.junit.Test; public class ClusterWithBackupTest extends ClusterTestBase { - private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - @Override @Before public void setUp() throws Exception { @@ -39,41 +36,35 @@ public class ClusterWithBackupTest extends ClusterTestBase { @Test public void testBasicRoundRobin() throws Throwable { - try { - setupCluster(); + setupCluster(); - startServers(0, 1, 2, 3, 4, 5); + startServers(0, 1, 2, 3, 4, 5); - setupSessionFactory(3, isNetty()); - setupSessionFactory(4, isNetty()); - setupSessionFactory(5, isNetty()); + setupSessionFactory(3, isNetty()); + setupSessionFactory(4, isNetty()); + setupSessionFactory(5, isNetty()); - createQueue(3, "queues.testaddress", "queue0", null, false); - createQueue(4, "queues.testaddress", "queue0", null, false); - createQueue(5, "queues.testaddress", "queue0", null, false); + createQueue(3, "queues.testaddress", "queue0", null, false); + createQueue(4, "queues.testaddress", "queue0", null, false); + createQueue(5, "queues.testaddress", "queue0", null, false); - addConsumer(0, 3, "queue0", null); - addConsumer(1, 4, "queue0", null); - addConsumer(2, 5, "queue0", null); + addConsumer(0, 3, "queue0", null); + addConsumer(1, 4, "queue0", null); + addConsumer(2, 5, "queue0", null); - waitForBindings(3, "queues.testaddress", 1, 1, true); - waitForBindings(4, "queues.testaddress", 1, 1, true); - waitForBindings(5, "queues.testaddress", 1, 1, true); + waitForBindings(3, "queues.testaddress", 1, 1, true); + waitForBindings(4, "queues.testaddress", 1, 1, true); + waitForBindings(5, "queues.testaddress", 1, 1, true); - waitForBindings(3, "queues.testaddress", 2, 2, false); - waitForBindings(4, "queues.testaddress", 2, 2, false); - waitForBindings(5, "queues.testaddress", 2, 2, false); + waitForBindings(3, "queues.testaddress", 2, 2, false); + waitForBindings(4, "queues.testaddress", 2, 2, false); + waitForBindings(5, "queues.testaddress", 2, 2, false); - send(3, "queues.testaddress", 100, false, null); + send(3, "queues.testaddress", 100, false, null); - verifyReceiveRoundRobinInSomeOrder(100, 0, 1, 2); + verifyReceiveRoundRobinInSomeOrder(100, 0, 1, 2); - verifyNotReceive(0, 0, 1, 2); - } catch (Throwable e) { - e.printStackTrace(); - log.error(e.getMessage(), e); - throw e; - } + verifyNotReceive(0, 0, 1, 2); } protected void setupCluster() throws Exception { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java index 47c7dc4..a384507 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java @@ -48,14 +48,16 @@ import org.apache.activemq.artemis.core.server.management.Notification; import org.apache.activemq.artemis.core.server.management.NotificationListener; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.apache.activemq.artemis.utils.RetryRule; +import org.jboss.logging.Logger; import org.junit.Rule; import org.junit.Test; public class ClusteredGroupingTest extends ClusterTestBase { + private static final Logger log = Logger.getLogger(ClusteredGroupingTest.class); + @Rule public RetryRule retryRule = new RetryRule(2); @@ -595,12 +597,12 @@ public class ClusteredGroupingTest extends ClusterTestBase { groups.add(group); } producer.send(message); - IntegrationTestLogger.LOGGER.trace("Sent message to server 1 with dupID: " + dupID); + log.trace("Sent message to server 1 with dupID: " + dupID); } session.commit(); totalMessageProduced.addAndGet(500); - IntegrationTestLogger.LOGGER.trace("Sent block of 500 messages to server 1. Total sent: " + totalMessageProduced.get()); + log.trace("Sent block of 500 messages to server 1. Total sent: " + totalMessageProduced.get()); session.close(); // need thread pool to service both consumers and producers plus a thread to cycle nodes @@ -622,7 +624,7 @@ public class ClusteredGroupingTest extends ClusterTestBase { String group = groupx; String basicID = UUID.randomUUID().toString(); - IntegrationTestLogger.LOGGER.debug("Starting producer thread..."); + log.debug("Starting producer thread..."); ClientSessionFactory factory; ClientSession session = null; ClientProducer producer = null; @@ -640,12 +642,12 @@ public class ClusteredGroupingTest extends ClusterTestBase { } else { factory = sf0; } - IntegrationTestLogger.LOGGER.debug("Creating producer session factory to node " + targetServer); + log.debug("Creating producer session factory to node " + targetServer); session = addClientSession(factory.createSession(false, true, true)); producer = addClientProducer(session.createProducer(ADDRESS)); } catch (Exception e) { errors.incrementAndGet(); - IntegrationTestLogger.LOGGER.warn("Producer thread couldn't establish connection", e); + log.warn("Producer thread couldn't establish connection", e); return; } @@ -661,11 +663,11 @@ public class ClusteredGroupingTest extends ClusterTestBase { totalMessageProduced.incrementAndGet(); messageCount++; } catch (ActiveMQException e) { - IntegrationTestLogger.LOGGER.warn("Producer thread threw exception while sending messages to " + targetServer + ": " + e.getMessage()); + log.warn("Producer thread threw exception while sending messages to " + targetServer + ": " + e.getMessage()); // in case of a failure we change the group to make possible errors more likely group = group + "afterFail"; } catch (Exception e) { - IntegrationTestLogger.LOGGER.warn("Producer thread threw unexpected exception while sending messages to " + targetServer + ": " + e.getMessage()); + log.warn("Producer thread threw unexpected exception while sending messages to " + targetServer + ": " + e.getMessage()); group = group + "afterFail"; break; } @@ -688,7 +690,6 @@ public class ClusteredGroupingTest extends ClusterTestBase { e.printStackTrace(); // ignore } - System.out.println("Cycling server"); cycleServer(1); } finally { okToConsume.countDown(); @@ -708,13 +709,13 @@ public class ClusteredGroupingTest extends ClusterTestBase { @Override public void run() { try { - IntegrationTestLogger.LOGGER.info("Waiting to start consumer thread..."); + log.debug("Waiting to start consumer thread..."); okToConsume.await(20, TimeUnit.SECONDS); } catch (InterruptedException e) { e.printStackTrace(); return; } - IntegrationTestLogger.LOGGER.info("Starting consumer thread..."); + log.debug("Starting consumer thread..."); ClientSessionFactory factory; ClientSession session = null; ClientConsumer consumer = null; @@ -731,14 +732,14 @@ public class ClusteredGroupingTest extends ClusterTestBase { } else { factory = sf0; } - IntegrationTestLogger.LOGGER.info("Creating consumer session factory to node " + targetServer); + log.debug("Creating consumer session factory to node " + targetServer); session = addClientSession(factory.createSession(false, false, true)); consumer = addClientConsumer(session.createConsumer(QUEUE)); session.start(); consumerCounter.incrementAndGet(); } } catch (Exception e) { - IntegrationTestLogger.LOGGER.info("Consumer thread couldn't establish connection", e); + log.debug("Consumer thread couldn't establish connection", e); errors.incrementAndGet(); return; } @@ -751,13 +752,13 @@ public class ClusteredGroupingTest extends ClusterTestBase { return; } m.acknowledge(); - IntegrationTestLogger.LOGGER.trace("Consumed message " + m.getStringProperty(Message.HDR_DUPLICATE_DETECTION_ID) + " from server " + targetServer + ". Total consumed: " + totalMessagesConsumed.incrementAndGet()); + log.trace("Consumed message " + m.getStringProperty(Message.HDR_DUPLICATE_DETECTION_ID) + " from server " + targetServer + ". Total consumed: " + totalMessagesConsumed.incrementAndGet()); } catch (ActiveMQException e) { errors.incrementAndGet(); - IntegrationTestLogger.LOGGER.warn("Consumer thread threw exception while receiving messages from server " + targetServer + ".: " + e.getMessage()); + log.warn("Consumer thread threw exception while receiving messages from server " + targetServer + ".: " + e.getMessage()); } catch (Exception e) { errors.incrementAndGet(); - IntegrationTestLogger.LOGGER.warn("Consumer thread threw unexpected exception while receiving messages from server " + targetServer + ".: " + e.getMessage()); + log.warn("Consumer thread threw unexpected exception while receiving messages from server " + targetServer + ".: " + e.getMessage()); return; ... 7774 lines suppressed ...