You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/28 17:19:11 UTC
[20/21] activemq-artemis git commit: More test-suite refactoring
More test-suite refactoring
Lots of work on the test-suite in this commit including:
- Rename ServiceTestBase to ActiveMQTestBase
- Make AddressSettings fluent
- Remove unnecessary tearDown() implementations
- Use ActiveMQTestBase.create*Locator() instead of
ActiveMQClient.createServerLocator*(..)
- Use fluent ServerLocator methods
- Make sure all ActiveMQServers.newActiveMQServer invocations
are surrounded with addServer() where appropriate
- Create a few example tests to be references from hacking-guide
- Update hacking-guide with more info on writing tests
- Refactor config creation methods in ActiveMQTestBase
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/328611fd
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/328611fd
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/328611fd
Branch: refs/heads/master
Commit: 328611fdc9370ec8f0cc2eb4c1ca061d395ca6f6
Parents: 30416db
Author: jbertram <jb...@apache.org>
Authored: Wed May 20 12:39:38 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Thu May 28 08:49:02 2015 -0500
----------------------------------------------------------------------
.../artemis/tests/util/SilentTestCase.java | 2 -
.../artemis/util/ConcurrentHashSetTest.java | 24 +-
.../util/TypedPropertiesConversionTest.java | 13 +-
.../org/proton/plug/test/AbstractJMSTest.java | 2 -
.../java/org/proton/plug/test/ProtonTest.java | 1 -
.../artemis/core/config/Configuration.java | 6 +
.../core/config/impl/ConfigurationImpl.java | 13 +
.../core/settings/impl/AddressSettings.java | 60 +-
.../core/config/impl/ConfigurationImplTest.java | 4 +-
.../impl/FileConfigurationParserTest.java | 4 +-
.../config/impl/HAPolicyConfigurationTest.java | 4 +-
.../WrongRoleFileConfigurationParserTest.java | 4 +-
.../core/list/PriorityLinkedListTest.java | 17 +-
.../core/message/impl/MessagePropertyTest.java | 4 +-
.../group/impl/ClusteredResetMockTest.java | 4 +-
.../core/settings/AddressSettingsTest.java | 4 +-
.../artemis/core/settings/RepositoryTest.java | 4 +-
.../artemis/tests/util/ActiveMQTestBase.java | 3017 ++++++++++++++++++
.../artemis/tests/util/RemoveFolder.java | 2 +-
.../artemis/tests/util/ServiceTestBase.java | 3000 -----------------
.../artemis/tests/util/SimpleStringTest.java | 2 +-
.../tests/util/SingleServerTestBase.java | 15 +-
docs/hacking-guide/en/tests.md | 46 +-
.../tests/extras/byteman/BMFailoverTest.java | 34 +-
.../BridgeServerLocatorConfigurationTest.java | 8 +-
.../extras/byteman/ClosingConnectionTest.java | 18 +-
.../extras/byteman/ClusteredGroupingTest.java | 28 +-
.../tests/extras/byteman/GroupingTest.java | 26 +-
.../tests/extras/byteman/LatencyTest.java | 6 +-
.../extras/byteman/OrphanedConsumerTest.java | 31 +-
.../tests/extras/byteman/PagingLeakTest.java | 33 +-
.../extras/byteman/ReplicationBackupTest.java | 20 +-
.../extras/byteman/ScaleDownFailoverTest.java | 12 -
.../extras/byteman/ScaleDownFailureTest.java | 13 -
.../extras/byteman/StartStopDeadlockTest.java | 37 +-
.../extras/byteman/StompInternalStateTest.java | 36 +-
.../tests/extras/jms/bridge/BridgeTestBase.java | 6 +-
.../jms/bridge/ClusteredBridgeTestBase.java | 14 +-
.../protocols/hornetq/HornetQProtocolTest.java | 41 +-
.../integration/DuplicateDetectionTest.java | 518 +--
.../tests/integration/InterceptorTest.java | 4 +-
.../tests/integration/String64KLimitTest.java | 4 +-
.../aerogear/AeroGearBasicServerTest.java | 32 +-
.../integration/client/AckBatchSizeTest.java | 16 +-
.../integration/client/AcknowledgeTest.java | 30 +-
.../integration/client/ActiveMQCrashTest.java | 15 +-
.../integration/client/AddressSettingsTest.java | 72 +-
.../integration/client/AutoCloseCoreTest.java | 2 +-
.../integration/client/AutogroupIdTest.java | 41 +-
.../integration/client/BlockingSendTest.java | 8 +-
.../integration/client/CommitRollbackTest.java | 16 +-
.../ConcurrentCreateDeleteProduceTest.java | 21 +-
.../integration/client/ConsumerCloseTest.java | 16 +-
.../integration/client/ConsumerFilterTest.java | 4 +-
.../client/ConsumerRoundRobinTest.java | 4 +-
.../integration/client/ConsumerStuckTest.java | 20 +-
.../tests/integration/client/ConsumerTest.java | 23 +-
.../client/ConsumerWindowSizeTest.java | 12 +-
.../integration/client/CoreClientTest.java | 31 +-
.../client/CreateQueueIdempotentTest.java | 17 +-
.../client/DeadLetterAddressTest.java | 82 +-
.../integration/client/DeliveryOrderTest.java | 4 +-
.../integration/client/DurableQueueTest.java | 4 +-
.../client/ExpireTestOnRestartTest.java | 14 +-
.../integration/client/ExpiryAddressTest.java | 51 +-
.../client/ExpiryLargeMessageTest.java | 44 +-
.../integration/client/FailureDeadlockTest.java | 60 +-
.../integration/client/HangConsumerTest.java | 42 +-
.../integration/client/HeuristicXATest.java | 26 +-
.../InVMNonPersistentMessageBufferTest.java | 29 +-
.../client/IncompatibleVersionTest.java | 10 +-
.../client/InterruptedLargeMessageTest.java | 44 +-
.../client/JMSPagingFileDeleteTest.java | 32 +-
.../client/JmsNettyNioStressTest.java | 8 +-
.../integration/client/JournalCrashTest.java | 6 +-
.../LargeMessageAvoidLargeMessagesTest.java | 28 +-
.../client/LargeMessageCompressTest.java | 5 +-
.../integration/client/LargeMessageTest.java | 121 +-
.../client/LibaioDependencyCheckTest.java | 4 +-
.../client/MessageConcurrencyTest.java | 30 +-
.../client/MessageConsumerRollbackTest.java | 33 +-
.../integration/client/MessageCounterTest.java | 9 +-
.../client/MessageDurabilityTest.java | 8 +-
.../client/MessageExpirationTest.java | 7 +-
.../MessageGroupingConnectionFactoryTest.java | 25 +-
.../integration/client/MessageGroupingTest.java | 19 +-
.../integration/client/MessageHandlerTest.java | 4 +-
.../integration/client/MessagePriorityTest.java | 20 +-
.../integration/client/MessageRateTest.java | 4 +-
.../client/MultipleThreadFilterOneTest.java | 4 +-
.../tests/integration/client/NIOvsOIOTest.java | 23 +-
.../integration/client/NettyConnectorTest.java | 17 +-
.../client/NewDeadLetterAddressTest.java | 56 +-
.../tests/integration/client/OrderTest.java | 25 +-
.../integration/client/PagingOrderTest.java | 169 +-
.../integration/client/PagingSyncTest.java | 24 +-
.../tests/integration/client/PagingTest.java | 573 ++--
.../integration/client/ProducerCloseTest.java | 12 +-
.../client/ProducerFlowControlTest.java | 66 +-
.../tests/integration/client/ProducerTest.java | 14 +-
.../integration/client/QueueBrowserTest.java | 4 +-
.../client/ReceiveImmediateTest.java | 27 +-
.../tests/integration/client/ReceiveTest.java | 4 +-
.../client/RedeliveryConsumerTest.java | 8 +-
.../tests/integration/client/RequestorTest.java | 52 +-
.../tests/integration/client/RoutingTest.java | 4 +-
.../client/SelfExpandingBufferTest.java | 8 +-
.../client/ServerLocatorConnectTest.java | 4 +-
.../client/SessionCloseOnGCTest.java | 26 +-
.../integration/client/SessionCloseTest.java | 72 +-
...onClosedOnRemotingConnectionFailureTest.java | 11 +-
.../client/SessionCreateAndDeleteQueueTest.java | 8 +-
.../client/SessionCreateConsumerTest.java | 10 +-
.../client/SessionCreateProducerTest.java | 10 +-
.../integration/client/SessionFactoryTest.java | 79 +-
.../SessionSendAcknowledgementHandlerTest.java | 4 +-
.../client/SessionStopStartTest.java | 4 +-
.../tests/integration/client/SessionTest.java | 14 +-
.../client/SimpleSendMultipleQueuesTest.java | 36 +-
.../integration/client/SlowConsumerTest.java | 28 +-
.../integration/client/TemporaryQueueTest.java | 53 +-
.../client/TransactionDurabilityTest.java | 35 +-
.../client/TransactionalSendTest.java | 4 +-
.../integration/client/TransientQueueTest.java | 16 +-
.../integration/client/WildCardRoutingTest.java | 50 +-
.../clientcrash/ClientCrashTest.java | 3 +-
.../integration/clientcrash/ClientExitTest.java | 10 +-
.../integration/clientcrash/ClientTestBase.java | 7 +-
.../cluster/ClusterControllerTest.java | 10 -
.../integration/cluster/NodeManagerTest.java | 4 +-
.../cluster/RealNodeManagerTest.java | 4 +-
.../cluster/bridge/BridgeFailoverTest.java | 4 +-
.../cluster/bridge/BridgeReconnectTest.java | 25 +-
.../cluster/bridge/BridgeStartTest.java | 22 +-
.../integration/cluster/bridge/BridgeTest.java | 33 +-
.../cluster/bridge/BridgeTestBase.java | 25 +-
.../BridgeWithDiscoveryGroupStartTest.java | 4 +-
.../cluster/distribution/ClusterTestBase.java | 65 +-
.../distribution/ClusteredGroupingTest.java | 31 +-
.../distribution/MessageRedistributionTest.java | 14 +-
.../MessageRedistributionWithDiscoveryTest.java | 12 +-
.../SimpleSymmetricClusterTest.java | 18 -
.../distribution/SymmetricClusterTest.java | 17 +-
.../SymmetricClusterWithBackupTest.java | 4 +-
.../SymmetricClusterWithDiscoveryTest.java | 6 +-
.../AlmostLargeAsynchronousFailoverTest.java | 7 +-
.../failover/AsynchronousFailoverTest.java | 10 +-
.../AutomaticColocatedQuorumVoteTest.java | 6 +-
.../failover/BackupAuthenticationTest.java | 2 +-
.../cluster/failover/BackupSyncJournalTest.java | 48 +-
.../failover/BackupSyncLargeMessageTest.java | 28 +-
.../cluster/failover/BackupSyncPagingTest.java | 8 +-
.../cluster/failover/FailBackAutoTest.java | 14 +-
.../cluster/failover/FailBackManualTest.java | 17 +-
.../cluster/failover/FailoverListenerTest.java | 22 +-
.../failover/FailoverOnFlowControlTest.java | 19 +-
.../cluster/failover/FailoverTest.java | 147 +-
.../cluster/failover/FailoverTestBase.java | 26 +-
.../failover/GroupingFailoverTestBase.java | 4 +-
.../failover/LargeMessageFailoverTest.java | 6 +-
.../failover/LiveToLiveFailoverTest.java | 25 +-
.../MultipleBackupsFailoverTestBase.java | 4 +-
...ultipleLivesMultipleBackupsFailoverTest.java | 53 +-
.../MultipleServerFailoverTestBase.java | 83 +-
.../cluster/failover/NettyFailoverTest.java | 10 +-
.../cluster/failover/PagingFailoverTest.java | 34 +-
.../failover/QuorumVoteServerConnectTest.java | 4 +-
.../failover/ReplicatedDistributionTest.java | 35 +-
.../failover/ReplicatedFailoverTest.java | 6 +-
.../ReplicatedMultipleServerFailoverTest.java | 2 +-
.../ReplicatedWithDelayFailoverTest.java | 2 +-
.../cluster/failover/SecurityFailoverTest.java | 4 +-
.../SingleLiveMultipleBackupsFailoverTest.java | 45 +-
.../reattach/MultiThreadRandomReattachTest.java | 11 +-
.../MultiThreadRandomReattachTestBase.java | 58 +-
.../MultiThreadReattachSupportTestBase.java | 8 +-
.../NettyMultiThreadRandomReattachTest.java | 22 +-
.../cluster/reattach/OrderReattachTest.java | 15 +-
.../cluster/reattach/RandomReattachTest.java | 44 +-
.../cluster/reattach/ReattachTest.java | 141 +-
.../cluster/topology/HAClientTopologyTest.java | 8 +-
.../HAClientTopologyWithDiscoveryTest.java | 4 +-
.../cluster/topology/IsolatedTopologyTest.java | 18 +-
.../cluster/topology/NonHATopologyTest.java | 4 +-
.../topology/TopologyClusterTestBase.java | 18 +-
.../cluster/util/MultiServerTestBase.java | 12 +-
.../discovery/DiscoveryBaseTest.java | 4 +-
.../tests/integration/divert/DivertTest.java | 247 +-
.../divert/PersistentDivertTest.java | 91 +-
.../integration/embedded/ValidateAIOTest.java | 10 +-
.../http/CoreClientOverHttpTest.java | 14 +-
.../jms/ActiveMQConnectionFactoryTest.java | 4 +-
.../tests/integration/jms/FloodServerTest.java | 57 +-
.../ManualReconnectionToSingleServerTest.java | 68 +-
.../integration/jms/SimpleJNDIClientTest.java | 4 +-
.../integration/jms/client/ConnectionTest.java | 10 +-
.../jms/client/ExpiryMessageTest.java | 7 +-
.../integration/jms/client/GroupingTest.java | 31 +-
.../integration/jms/client/PreACKJMSTest.java | 23 +-
.../jms/client/ReSendMessageTest.java | 33 +-
.../jms/client/ReceiveNoWaitTest.java | 13 +-
.../jms/client/RemoteConnectionStressTest.java | 39 +-
.../integration/jms/client/TextMessageTest.java | 23 +-
.../jms/cluster/BindingsClusterTest.java | 4 +-
.../jms/cluster/JMSFailoverListenerTest.java | 101 +-
.../jms/cluster/JMSFailoverTest.java | 117 +-
.../jms/cluster/JMSReconnectTest.java | 87 +-
.../jms/cluster/LargeMessageOverBridgeTest.java | 40 +-
.../jms/cluster/MultipleThreadsOpeningTest.java | 2 +-
.../jms/cluster/ReplicatedJMSFailoverTest.java | 18 +-
.../jms/cluster/TemporaryQueueClusterTest.java | 19 +-
.../jms/cluster/TopicClusterTest.java | 22 +-
.../CloseConnectionFactoryOnGCest.java | 2 +-
.../jms/connection/CloseConnectionOnGCTest.java | 44 +-
.../CloseDestroyedConnectionTest.java | 38 +-
.../connection/ConcurrentSessionCloseTest.java | 34 +-
.../jms/connection/ExceptionListenerTest.java | 53 +-
.../jms/connection/InvalidConnectorTest.java | 21 +-
.../integration/jms/consumer/ConsumerTest.java | 45 +-
.../jms/divert/DivertAndACKClientTest.java | 26 +-
.../jms/largemessage/JMSLargeMessageTest.java | 43 +-
.../jms/server/JMSServerDeployerTest.java | 29 +-
.../jms/server/JMSServerStartStopTest.java | 115 +-
.../jms/server/config/JMSConfigurationTest.java | 36 +-
.../config/JMSServerConfigParserTest.java | 6 +-
.../ConnectionFactoryControlTest.java | 59 +-
.../server/management/JMSQueueControlTest.java | 87 +-
.../management/JMSQueueControlUsingJMSTest.java | 27 +-
.../management/JMSServerControl2Test.java | 56 +-
.../management/JMSServerControlRestartTest.java | 59 +-
.../server/management/JMSServerControlTest.java | 191 +-
.../JMSServerControlUsingJMSTest.java | 29 +-
.../management/TopicControlClusterTest.java | 18 +-
.../jms/server/management/TopicControlTest.java | 58 +-
.../management/TopicControlUsingJMSTest.java | 65 +-
.../journal/AIOImportExportTest.java | 4 +-
.../journal/AIOJournalCompactTest.java | 4 +-
.../journal/JournalPerfTuneTest.java | 4 +-
.../journal/NIOBufferedJournalCompactTest.java | 4 +-
.../journal/NIOImportExportTest.java | 20 +-
.../journal/NIOJournalCompactTest.java | 7 +-
.../integration/journal/NIOJournalImplTest.java | 4 +-
.../journal/ValidateTransactionHealthTest.java | 4 +-
.../largemessage/LargeMessageTestBase.java | 26 +-
.../largemessage/ServerLargeMessageTest.java | 10 +-
.../management/AcceptorControlTest.java | 12 +-
.../management/ActiveMQServerControlTest.java | 103 +-
.../ActiveMQServerControlUsingCoreTest.java | 15 -
.../management/AddressControlTest.java | 28 +-
.../management/AddressControlUsingCoreTest.java | 41 +-
.../management/BridgeControlTest.java | 4 +-
.../management/BridgeControlUsingCoreTest.java | 26 +-
.../management/BroadcastGroupControlTest.java | 98 +-
.../ClusterConnectionControl2Test.java | 19 +-
.../ClusterConnectionControlTest.java | 9 -
.../ClusterConnectionControlUsingCoreTest.java | 22 -
.../management/DivertControlTest.java | 46 +-
.../management/DivertControlUsingCoreTest.java | 18 -
.../integration/management/JMXDomainTest.java | 30 +-
.../management/ManagementActivationTest.java | 25 +-
.../management/ManagementServiceImplTest.java | 36 +-
.../management/ManagementTestBase.java | 7 +-
.../ManagementWithPagingServerTest.java | 43 +-
.../management/ManagementWithStompTest.java | 61 +-
.../management/NotificationTest.java | 40 +-
.../management/QueueControlTest.java | 46 +-
.../management/SecurityManagementTestBase.java | 33 +-
...tyManagementWithConfiguredAdminUserTest.java | 15 +-
...yManagementWithDefaultConfigurationTest.java | 12 +-
...ManagementWithModifiedConfigurationTest.java | 14 +-
.../management/SecurityNotificationTest.java | 30 +-
.../integration/openwire/BasicOpenWireTest.java | 2 -
.../integration/openwire/OpenWireTestBase.java | 18 +-
.../amq/ProducerFlowControlSendFailTest.java | 6 +-
.../openwire/amq/ProducerFlowControlTest.java | 6 +-
.../openwire/interop/GeneralInteropTest.java | 26 +-
.../paging/MultipleProducersPagingTest.java | 12 +-
.../paging/PageCountSyncOnNonTXTest.java | 15 +-
.../integration/paging/PagingCounterTest.java | 10 +-
.../integration/paging/PagingReceiveTest.java | 18 +-
.../integration/paging/PagingSendTest.java | 38 +-
.../PagingWithFailoverAndCountersTest.java | 37 +-
.../paging/SpawnedServerSupport.java | 40 +-
...AddressSettingsConfigurationStorageTest.java | 36 +-
.../DeleteMessagesOnStartupTest.java | 2 -
.../persistence/DeleteQueueRestartTest.java | 13 +-
.../persistence/ExportFormatTest.java | 4 +-
...nnectionFactoryConfigurationStorageTest.java | 20 +-
.../integration/persistence/RestartSMTest.java | 26 +-
.../persistence/StorageManagerTestBase.java | 28 +-
.../persistence/XmlImportExportTest.java | 88 +-
.../tests/integration/proton/ProtonTest.java | 4 +-
.../integration/ra/ActiveMQActivationTest.java | 4 +-
.../ra/ActiveMQRAClusteredTestBase.java | 20 +-
.../integration/ra/ActiveMQRATestBase.java | 16 +-
.../integration/ra/ResourceAdapterTest.java | 2 +-
.../integration/remoting/BatchDelayTest.java | 4 +-
.../remoting/DestroyConsumerTest.java | 6 +-
.../integration/remoting/DirectDeliverTest.java | 19 +-
.../remoting/NetworkAddressTestBase.java | 6 +-
.../tests/integration/remoting/PingTest.java | 37 +-
.../integration/remoting/ReconnectTest.java | 28 +-
.../remoting/SynchronousCloseTest.java | 18 +-
.../replication/ReplicationOrderTest.java | 4 +-
.../replication/ReplicationTest.java | 12 +-
.../scheduling/DelayedMessageTest.java | 17 +-
.../MultipliedDelayedMessageTest.java | 22 +-
.../scheduling/ScheduledMessageTest.java | 23 +-
.../security/NettySecurityClientTest.java | 6 +-
.../integration/security/SecurityTest.java | 20 +-
.../server/AddressFullLoggingTest.java | 20 +-
.../integration/server/ConnectionLimitTest.java | 8 +-
.../integration/server/ExpiryRunnerTest.java | 61 +-
.../integration/server/FileLockTimeoutTest.java | 6 +-
.../server/GracefulShutdownTest.java | 30 +-
.../integration/server/LVQRecoveryTest.java | 78 +-
.../tests/integration/server/LVQTest.java | 87 +-
.../integration/server/PredefinedQueueTest.java | 151 +-
.../integration/server/ResourceLimitTest.java | 4 +-
.../integration/server/ScaleDown3NodeTest.java | 26 +-
.../integration/server/ScaleDownDirectTest.java | 22 +-
.../tests/integration/server/ScaleDownTest.java | 42 +-
.../integration/server/SimpleStartStopTest.java | 4 +-
.../server/SuppliedThreadPoolTest.java | 4 +-
.../spring/SpringIntegrationTest.java | 4 +-
.../ssl/CoreClientOverOneWaySSLTest.java | 10 +-
.../ssl/CoreClientOverTwoWaySSLTest.java | 6 +-
.../tests/integration/stomp/ExtraStompTest.java | 35 +-
.../tests/integration/stomp/StompTestBase.java | 6 +-
.../integration/stomp/StompWebSocketTest.java | 18 +-
.../integration/stomp/v11/StompV11TestBase.java | 57 +-
.../netty/ActiveMQFrameDecoder2Test.java | 26 +-
.../NettyConnectorWithHTTPUpgradeTest.java | 11 +-
.../vertx/ActiveMQVertxUnitTest.java | 11 +-
.../integration/xa/BasicXaRecoveryTest.java | 101 +-
.../tests/integration/xa/BasicXaTest.java | 9 +-
.../tests/integration/xa/XaTimeoutTest.java | 91 +-
.../tests/util/JMSClusteredTestBase.java | 179 +-
.../artemis/tests/util/JMSTestBase.java | 12 +-
.../tests/util/ReplicatedBackupUtils.java | 4 +-
.../tests/util/TransportConfigurationUtils.java | 20 +-
.../artemis/jms/tests/MessageConsumerTest.java | 8 +-
.../tests/message/JMSExpirationHeaderTest.java | 10 +-
.../jms/tests/selector/SelectorTest.java | 6 +-
.../activemq/artemis/jms/SpawnedJMSServer.java | 11 +-
.../paging/MeasurePagingMultiThreadTest.java | 14 +-
.../sends/AbstractSendReceivePerfTest.java | 6 +-
.../soak/client/ClientNonDivertedSoakTest.java | 17 +-
.../tests/soak/client/ClientSoakTest.java | 35 +-
.../soak/client/SimpleSendReceiveSoakTest.java | 17 +-
.../tests/stress/client/SendStressTest.java | 4 +-
.../stress/journal/AddAndRemoveStressTest.java | 4 +-
.../stress/journal/CompactingStressTest.java | 18 +-
.../JournalCleanupCompactStressTest.java | 6 +-
.../journal/JournalRestartStressTest.java | 10 +-
.../stress/journal/LargeJournalStressTest.java | 22 +-
.../journal/MultiThreadConsumerStressTest.java | 23 +-
.../NIOMultiThreadCompactorStressTest.java | 25 +-
.../journal/XmlImportExportStressTest.java | 4 +-
.../paging/MultipleConsumersPageStressTest.java | 59 +-
.../stress/paging/PageCursorStressTest.java | 34 +-
.../tests/stress/paging/PageStressTest.java | 236 +-
.../tests/stress/remote/PingStressTest.java | 41 +-
.../tests/stress/stomp/StompStressTest.java | 4 +-
.../core/journal/impl/AIOJournalImplTest.java | 4 +-
.../core/journal/impl/NIOJournalImplTest.java | 4 +-
.../core/server/impl/QueueConcurrentTest.java | 4 +-
.../timing/core/server/impl/QueueImplTest.java | 4 +-
.../jms/bridge/impl/JMSBridgeImplTest.java | 68 +-
.../tests/timing/util/ReusableLatchTest.java | 4 +-
.../timing/util/TokenBucketLimiterImplTest.java | 4 +-
.../artemis/tests/timing/util/UTF8Test.java | 4 +-
.../tests/unit/core/asyncio/AIOTestBase.java | 4 +-
.../unit/core/asyncio/AsynchronousFileTest.java | 22 +-
.../MultiThreadAsynchronousFileTest.java | 20 +-
.../client/impl/LargeMessageBufferTest.java | 50 +-
.../impl/ConfigurationValidationTest.java | 4 +-
.../core/config/impl/ConnectorsServiceTest.java | 4 +-
.../config/impl/TransportConfigurationTest.java | 4 +-
.../journal/impl/AlignedJournalImplTest.java | 10 +-
.../unit/core/journal/impl/CleanBufferTest.java | 4 +-
.../core/journal/impl/FileFactoryTestBase.java | 4 +-
.../core/journal/impl/JournalAsyncTest.java | 4 +-
.../core/journal/impl/JournalImplTestBase.java | 8 +-
.../unit/core/journal/impl/ReclaimerTest.java | 4 +-
.../impl/SequentialFileFactoryTestBase.java | 12 +-
.../unit/core/journal/impl/TimedBufferTest.java | 18 +-
.../unit/core/message/impl/MessageImplTest.java | 4 +-
.../unit/core/paging/impl/PagePositionTest.java | 4 +-
.../tests/unit/core/paging/impl/PageTest.java | 24 +-
.../core/paging/impl/PagingManagerImplTest.java | 18 +-
.../core/paging/impl/PagingStoreImplTest.java | 57 +-
.../impl/BatchIDGeneratorUnitTest.java | 4 +-
.../impl/OperationContextUnitTest.java | 4 +-
.../core/postoffice/impl/AddressImplTest.java | 4 +-
.../core/postoffice/impl/BindingsImplTest.java | 4 +-
.../impl/DuplicateDetectionUnitTest.java | 6 +-
.../impl/WildcardAddressManagerUnitTest.java | 4 +-
.../core/remoting/ActiveMQBufferTestBase.java | 14 +-
.../impl/netty/NettyAcceptorFactoryTest.java | 4 +-
.../remoting/impl/netty/NettyAcceptorTest.java | 12 +-
.../impl/netty/NettyConnectionTest.java | 4 +-
.../remoting/impl/netty/NettyConnectorTest.java | 4 +-
.../core/remoting/impl/ssl/SSLSupportTest.java | 4 +-
.../impl/ActiveMQSecurityManagerImplTest.java | 4 +-
.../impl/ClusterConnectionBridgeTest.java | 4 +-
.../cluster/impl/RemoteQueueBindImplTest.java | 4 +-
.../group/impl/SystemPropertyOverrideTest.java | 4 +-
.../unit/core/server/impl/FileLockTest.java | 4 +-
.../unit/core/server/impl/QueueImplTest.java | 20 +-
.../tests/unit/jms/ActiveMQDestinationTest.java | 4 +-
.../unit/jms/client/ActiveMQMapMessageTest.java | 6 +-
.../jms/client/ActiveMQStreamMessageTest.java | 12 +-
.../unit/jms/client/JMSExceptionHelperTest.java | 4 +-
.../unit/jms/client/SelectorTranslatorTest.java | 4 +-
.../tests/unit/jms/misc/ManifestTest.java | 4 +-
.../ConnectionFactoryObjectFactoryTest.java | 4 +-
.../DestinationObjectFactoryTest.java | 4 +-
.../ra/ActiveMQResourceAdapterConfigTest.java | 4 +-
.../ra/ConnectionFactoryPropertiesTest.java | 4 +-
.../tests/unit/ra/ResourceAdapterTest.java | 4 +-
.../util/ActiveMQBufferInputStreamTest.java | 4 +-
.../artemis/tests/unit/util/LinkedListTest.java | 4 +-
.../ObjectInputStreamWithClassLoaderTest.java | 4 +-
.../tests/unit/util/ReusableLatchTest.java | 4 +-
.../tests/unit/util/SoftValueMapTest.java | 4 +-
.../artemis/tests/unit/util/UTF8Test.java | 4 +-
.../tests/unit/util/UUIDGeneratorTest.java | 10 +-
.../artemis/tests/unit/util/UUIDTest.java | 4 +-
.../tests/unit/util/VersionLoaderTest.java | 4 +-
430 files changed, 7201 insertions(+), 10197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java
index 952a2c9..8825631 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java
@@ -40,7 +40,6 @@ public abstract class SilentTestCase extends Assert
@Before
public void setUp() throws Exception
{
-
origSysOut = System.out;
origSysErr = System.err;
sysOut = new PrintStream(new ByteArrayOutputStream());
@@ -54,6 +53,5 @@ public abstract class SilentTestCase extends Assert
{
System.setOut(origSysOut);
System.setErr(origSysErr);
-
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
index d10e432..5eaf1d5 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
@@ -15,19 +15,15 @@
* limitations under the License.
*/
package org.apache.activemq.artemis.util;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
-import java.util.Iterator;
-
-import org.junit.Assert;
-
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.ConcurrentSet;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
public class ConcurrentHashSetTest extends Assert
{
@@ -132,20 +128,10 @@ public class ConcurrentHashSetTest extends Assert
@Before
public void setUp() throws Exception
{
-
-
set = new ConcurrentHashSet<String>();
element = RandomUtil.randomString();
}
- @After
- public void tearDown() throws Exception
- {
- set = null;
- element = null;
-
-
- }
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
index df92491..d1b7e72 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
package org.apache.activemq.artemis.util;
+
import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.utils.TypedProperties;
-import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -46,21 +46,10 @@ public class TypedPropertiesConversionTest
@Before
public void setUp() throws Exception
{
-
-
key = RandomUtil.randomSimpleString();
props = new TypedProperties();
}
- @After
- public void tearDown() throws Exception
- {
- key = null;
- props = null;
-
-
- }
-
@Test
public void testBooleanProperty() throws Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
index b7196d9..efdd938 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
@@ -24,8 +24,6 @@ import javax.jms.Queue;
import java.lang.ref.WeakReference;
-//import io.hawtjms.jms.JmsConnectionFactory;
-//import io.hawtjms.jms.JmsQueue;
import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
import org.proton.plug.test.minimalserver.DumbServer;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
index 704d7ce..0e8909c 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
@@ -84,7 +84,6 @@ public class ProtonTest extends AbstractJMSTest
AbstractJMSTest.forceGC();
server.start("127.0.0.1", Constants.PORT, true);
connection = createConnection();
-
}
@After
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index 309c813..2cb7a4b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -270,6 +270,8 @@ public interface Configuration
Configuration addConnectorConfiguration(final String key, final TransportConfiguration info);
+ Configuration clearConnectorConfigurations();
+
/**
* Returns the broadcast groups configured for this server.
*/
@@ -324,6 +326,8 @@ public interface Configuration
*/
Configuration setDivertConfigurations(final List<DivertConfiguration> configs);
+ Configuration addDivertConfiguration(final DivertConfiguration config);
+
/**
* Returns the cluster connections configured for this server.
* <p/>
@@ -797,6 +801,8 @@ public interface Configuration
Configuration addAddressesSetting(String key, AddressSettings addressesSetting);
+ Configuration clearAddressesSettings();
+
/**
* @param roles a list of roles per matching
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 2147eb6..4402299 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -377,6 +377,12 @@ public class ConfigurationImpl implements Configuration, Serializable
return this;
}
+ public ConfigurationImpl clearConnectorConfigurations()
+ {
+ connectorConfigs.clear();
+ return this;
+ }
+
public GroupingHandlerConfiguration getGroupingHandlerConfiguration()
{
return groupingHandlerConfiguration;
@@ -1027,6 +1033,13 @@ public class ConfigurationImpl implements Configuration, Serializable
}
@Override
+ public ConfigurationImpl clearAddressesSettings()
+ {
+ this.addressesSettings.clear();
+ return this;
+ }
+
+ @Override
public Map<String, ResourceLimitSettings> getResourceLimitSettings()
{
return resourceLimitSettings;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
index 84efb65..cdd665f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java
@@ -146,9 +146,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return autoCreateJmsQueues != null ? autoCreateJmsQueues : AddressSettings.DEFAULT_AUTO_CREATE_QUEUES;
}
- public void setAutoCreateJmsQueues(final boolean autoCreateJmsQueues)
+ public AddressSettings setAutoCreateJmsQueues(final boolean autoCreateJmsQueues)
{
this.autoCreateJmsQueues = autoCreateJmsQueues;
+ return this;
}
public boolean isAutoDeleteJmsQueues()
@@ -156,9 +157,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return autoDeleteJmsQueues != null ? autoDeleteJmsQueues : AddressSettings.DEFAULT_AUTO_DELETE_QUEUES;
}
- public void setAutoDeleteJmsQueues(final boolean autoDeleteJmsQueues)
+ public AddressSettings setAutoDeleteJmsQueues(final boolean autoDeleteJmsQueues)
{
this.autoDeleteJmsQueues = autoDeleteJmsQueues;
+ return this;
}
public boolean isLastValueQueue()
@@ -166,9 +168,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return lastValueQueue != null ? lastValueQueue : AddressSettings.DEFAULT_LAST_VALUE_QUEUE;
}
- public void setLastValueQueue(final boolean lastValueQueue)
+ public AddressSettings setLastValueQueue(final boolean lastValueQueue)
{
this.lastValueQueue = lastValueQueue;
+ return this;
}
public AddressFullMessagePolicy getAddressFullMessagePolicy()
@@ -177,9 +180,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
: AddressSettings.DEFAULT_ADDRESS_FULL_MESSAGE_POLICY;
}
- public void setAddressFullMessagePolicy(final AddressFullMessagePolicy addressFullMessagePolicy)
+ public AddressSettings setAddressFullMessagePolicy(final AddressFullMessagePolicy addressFullMessagePolicy)
{
this.addressFullMessagePolicy = addressFullMessagePolicy;
+ return this;
}
public long getPageSizeBytes()
@@ -187,9 +191,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return pageSizeBytes != null ? pageSizeBytes : AddressSettings.DEFAULT_PAGE_SIZE;
}
- public void setPageSizeBytes(final long pageSize)
+ public AddressSettings setPageSizeBytes(final long pageSize)
{
pageSizeBytes = pageSize;
+ return this;
}
public int getPageCacheMaxSize()
@@ -197,9 +202,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return pageMaxCache != null ? pageMaxCache : AddressSettings.DEFAULT_PAGE_MAX_CACHE;
}
- public void setPageCacheMaxSize(final int pageMaxCache)
+ public AddressSettings setPageCacheMaxSize(final int pageMaxCache)
{
this.pageMaxCache = pageMaxCache;
+ return this;
}
public long getMaxSizeBytes()
@@ -207,9 +213,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return maxSizeBytes != null ? maxSizeBytes : AddressSettings.DEFAULT_MAX_SIZE_BYTES;
}
- public void setMaxSizeBytes(final long maxSizeBytes)
+ public AddressSettings setMaxSizeBytes(final long maxSizeBytes)
{
this.maxSizeBytes = maxSizeBytes;
+ return this;
}
public int getMaxDeliveryAttempts()
@@ -217,9 +224,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return maxDeliveryAttempts != null ? maxDeliveryAttempts : AddressSettings.DEFAULT_MAX_DELIVERY_ATTEMPTS;
}
- public void setMaxDeliveryAttempts(final int maxDeliveryAttempts)
+ public AddressSettings setMaxDeliveryAttempts(final int maxDeliveryAttempts)
{
this.maxDeliveryAttempts = maxDeliveryAttempts;
+ return this;
}
public int getMessageCounterHistoryDayLimit()
@@ -228,9 +236,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
: AddressSettings.DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT;
}
- public void setMessageCounterHistoryDayLimit(final int messageCounterHistoryDayLimit)
+ public AddressSettings setMessageCounterHistoryDayLimit(final int messageCounterHistoryDayLimit)
{
this.messageCounterHistoryDayLimit = messageCounterHistoryDayLimit;
+ return this;
}
public long getRedeliveryDelay()
@@ -238,9 +247,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return redeliveryDelay != null ? redeliveryDelay : AddressSettings.DEFAULT_REDELIVER_DELAY;
}
- public void setRedeliveryDelay(final long redeliveryDelay)
+ public AddressSettings setRedeliveryDelay(final long redeliveryDelay)
{
this.redeliveryDelay = redeliveryDelay;
+ return this;
}
public double getRedeliveryMultiplier()
@@ -248,9 +258,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return redeliveryMultiplier != null ? redeliveryMultiplier : AddressSettings.DEFAULT_REDELIVER_MULTIPLIER;
}
- public void setRedeliveryMultiplier(final double redeliveryMultiplier)
+ public AddressSettings setRedeliveryMultiplier(final double redeliveryMultiplier)
{
this.redeliveryMultiplier = redeliveryMultiplier;
+ return this;
}
public long getMaxRedeliveryDelay()
@@ -260,9 +271,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return maxRedeliveryDelay != null ? maxRedeliveryDelay : (getRedeliveryDelay() * 10);
}
- public void setMaxRedeliveryDelay(final long maxRedeliveryDelay)
+ public AddressSettings setMaxRedeliveryDelay(final long maxRedeliveryDelay)
{
this.maxRedeliveryDelay = maxRedeliveryDelay;
+ return this;
}
public SimpleString getDeadLetterAddress()
@@ -270,9 +282,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return deadLetterAddress;
}
- public void setDeadLetterAddress(final SimpleString deadLetterAddress)
+ public AddressSettings setDeadLetterAddress(final SimpleString deadLetterAddress)
{
this.deadLetterAddress = deadLetterAddress;
+ return this;
}
public SimpleString getExpiryAddress()
@@ -280,9 +293,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return expiryAddress;
}
- public void setExpiryAddress(final SimpleString expiryAddress)
+ public AddressSettings setExpiryAddress(final SimpleString expiryAddress)
{
this.expiryAddress = expiryAddress;
+ return this;
}
public Long getExpiryDelay()
@@ -290,9 +304,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return expiryDelay;
}
- public void setExpiryDelay(final Long expiryDelay)
+ public AddressSettings setExpiryDelay(final Long expiryDelay)
{
this.expiryDelay = expiryDelay;
+ return this;
}
public boolean isSendToDLAOnNoRoute()
@@ -300,9 +315,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return sendToDLAOnNoRoute != null ? sendToDLAOnNoRoute : AddressSettings.DEFAULT_SEND_TO_DLA_ON_NO_ROUTE;
}
- public void setSendToDLAOnNoRoute(final boolean value)
+ public AddressSettings setSendToDLAOnNoRoute(final boolean value)
{
sendToDLAOnNoRoute = value;
+ return this;
}
public long getRedistributionDelay()
@@ -310,9 +326,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return redistributionDelay != null ? redistributionDelay : AddressSettings.DEFAULT_REDISTRIBUTION_DELAY;
}
- public void setRedistributionDelay(final long redistributionDelay)
+ public AddressSettings setRedistributionDelay(final long redistributionDelay)
{
this.redistributionDelay = redistributionDelay;
+ return this;
}
public long getSlowConsumerThreshold()
@@ -320,9 +337,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return slowConsumerThreshold != null ? slowConsumerThreshold : AddressSettings.DEFAULT_SLOW_CONSUMER_THRESHOLD;
}
- public void setSlowConsumerThreshold(final long slowConsumerThreshold)
+ public AddressSettings setSlowConsumerThreshold(final long slowConsumerThreshold)
{
this.slowConsumerThreshold = slowConsumerThreshold;
+ return this;
}
public long getSlowConsumerCheckPeriod()
@@ -330,9 +348,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
return slowConsumerCheckPeriod != null ? slowConsumerCheckPeriod : AddressSettings.DEFAULT_SLOW_CONSUMER_CHECK_PERIOD;
}
- public void setSlowConsumerCheckPeriod(final long slowConsumerCheckPeriod)
+ public AddressSettings setSlowConsumerCheckPeriod(final long slowConsumerCheckPeriod)
{
this.slowConsumerCheckPeriod = slowConsumerCheckPeriod;
+ return this;
}
public SlowConsumerPolicy getSlowConsumerPolicy()
@@ -341,9 +360,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable
: AddressSettings.DEFAULT_SLOW_CONSUMER_POLICY;
}
- public void setSlowConsumerPolicy(final SlowConsumerPolicy slowConsumerPolicy)
+ public AddressSettings setSlowConsumerPolicy(final SlowConsumerPolicy slowConsumerPolicy)
{
this.slowConsumerPolicy = slowConsumerPolicy;
+ return this;
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
----------------------------------------------------------------------
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 9bfc3a3..b024517 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
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.tests.util.RandomUtil;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -33,7 +33,7 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-public class ConfigurationImplTest extends ServiceTestBase
+public class ConfigurationImplTest extends ActiveMQTestBase
{
protected Configuration conf;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
index 6ee3fa4..546b7a9 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.FileDeploymentManager;
import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;
import org.junit.Test;
@@ -29,7 +29,7 @@ import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-public class FileConfigurationParserTest extends ServiceTestBase
+public class FileConfigurationParserTest extends ActiveMQTestBase
{
/**
* These "InvalidConfigurationTest*.xml" files are modified copies of {@value
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
index 8da767c..319a667 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/HAPolicyConfigurationTest.java
@@ -34,12 +34,12 @@ import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivatio
import org.apache.activemq.artemis.core.server.impl.SharedNothingLiveActivation;
import org.apache.activemq.artemis.core.server.impl.SharedStoreBackupActivation;
import org.apache.activemq.artemis.core.server.impl.SharedStoreLiveActivation;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Test;
import java.util.List;
-public class HAPolicyConfigurationTest extends ServiceTestBase
+public class HAPolicyConfigurationTest extends ActiveMQTestBase
{
@Test
public void liveOnlyTest() throws Exception
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
index d24b5e6..f7526d1 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -18,7 +18,7 @@ package org.apache.activemq.artemis.core.config.impl;
import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets;
* When running this test from an IDE add this to the test command line so that the AssertionLoggerHandler works properly:
* -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:<path_to_source>/tests/config/logging.properties
*/
-public class WrongRoleFileConfigurationParserTest extends ServiceTestBase
+public class WrongRoleFileConfigurationParserTest extends ActiveMQTestBase
{
@BeforeClass
public static void prepareLogger()
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java
index 2f1fd03..2f31f62 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/list/PriorityLinkedListTest.java
@@ -15,16 +15,12 @@
* limitations under the License.
*/
package org.apache.activemq.artemis.core.list;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
-import org.junit.Assert;
-
import org.apache.activemq.artemis.utils.LinkedListIterator;
import org.apache.activemq.artemis.utils.PriorityLinkedListImpl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
public final class PriorityLinkedListTest extends Assert
{
@@ -122,13 +118,6 @@ public final class PriorityLinkedListTest extends Assert
z = new Wibble("z");
}
- @After
- public void tearDown() throws Exception
- {
- list = null;
-
- }
-
@Test
public void testEmpty() throws Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java
index 881b212..ca88431 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/message/impl/MessagePropertyTest.java
@@ -24,11 +24,11 @@ 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.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Before;
import org.junit.Test;
-public class MessagePropertyTest extends ServiceTestBase
+public class MessagePropertyTest extends ActiveMQTestBase
{
private ActiveMQServer server;
private ServerLocator locator;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
index 2959eb8..5f81855 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
@@ -48,7 +48,7 @@ import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.transaction.ResourceManager;
import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.ReusableLatch;
import org.junit.Assert;
@@ -65,7 +65,7 @@ import java.util.concurrent.TimeUnit;
* There is a small window where you could receive notifications wrongly
* this test will make sure the component would play well with that notification
*/
-public class ClusteredResetMockTest extends ServiceTestBase
+public class ClusteredResetMockTest extends ActiveMQTestBase
{
public static final SimpleString ANYCLUSTER = SimpleString.toSimpleString("anycluster");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java
index 563022c..ee655f0 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java
@@ -19,11 +19,11 @@ package org.apache.activemq.artemis.core.settings;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Assert;
import org.junit.Test;
-public class AddressSettingsTest extends ServiceTestBase
+public class AddressSettingsTest extends ActiveMQTestBase
{
@Test
public void testDefaults()
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/328611fd/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
index 97c6544..3921966 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java
@@ -18,7 +18,7 @@ package org.apache.activemq.artemis.core.settings;
import org.apache.activemq.artemis.core.security.Role;
import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository;
-import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;
-public class RepositoryTest extends ServiceTestBase
+public class RepositoryTest extends ActiveMQTestBase
{
HierarchicalRepository<HashSet<Role>> securityRepository;