From 4bdf8805b48414b8a8a56cec7d8b7ee07a8e090c Mon Sep 17 00:00:00 2001 From: jbertram Date: Wed, 20 May 2015 12:39:38 -0500 Subject: [PATCH] More test-suite refactoring --- .../artemis/core/config/Configuration.java | 6 + .../core/config/impl/ConfigurationImpl.java | 13 + .../core/settings/impl/AddressSettings.java | 60 +- .../config/impl/ConfigurationImplTest.java | 4 +- .../impl/FileConfigurationParserTest.java | 4 +- .../impl/HAPolicyConfigurationTest.java | 4 +- .../WrongRoleFileConfigurationParserTest.java | 4 +- .../message/impl/MessagePropertyTest.java | 4 +- .../group/impl/ClusteredResetMockTest.java | 4 +- .../core/settings/AddressSettingsTest.java | 4 +- .../artemis/core/settings/RepositoryTest.java | 4 +- ...iceTestBase.java => ActiveMQTestBase.java} | 120 ++-- .../artemis/tests/util/RemoveFolder.java | 2 +- .../artemis/tests/util/SimpleStringTest.java | 2 +- .../tests/util/SingleServerTestBase.java | 9 +- .../BridgeServerLocatorConfigurationTest.java | 4 +- .../extras/byteman/ClosingConnectionTest.java | 4 +- .../tests/extras/byteman/LatencyTest.java | 6 +- .../extras/byteman/OrphanedConsumerTest.java | 4 +- .../tests/extras/byteman/PagingLeakTest.java | 33 +- .../extras/byteman/ReplicationBackupTest.java | 20 +- .../extras/byteman/StartStopDeadlockTest.java | 29 +- .../byteman/StompInternalStateTest.java | 27 +- .../extras/jms/bridge/BridgeTestBase.java | 6 +- .../jms/bridge/ClusteredBridgeTestBase.java | 8 +- .../hornetq/HornetQProtocolTest.java | 4 +- .../integration/DuplicateDetectionTest.java | 518 +++++------------- .../tests/integration/InterceptorTest.java | 4 +- .../tests/integration/String64KLimitTest.java | 4 +- .../aerogear/AeroGearBasicServerTest.java | 6 +- .../integration/client/AckBatchSizeTest.java | 4 +- .../integration/client/AcknowledgeTest.java | 4 +- .../integration/client/ActiveMQCrashTest.java | 12 +- .../client/AddressSettingsTest.java | 4 +- .../integration/client/AutogroupIdTest.java | 4 +- .../integration/client/BlockingSendTest.java | 4 +- .../client/CommitRollbackTest.java | 4 +- .../ConcurrentCreateDeleteProduceTest.java | 15 +- .../integration/client/ConsumerCloseTest.java | 10 +- .../client/ConsumerFilterTest.java | 4 +- .../client/ConsumerRoundRobinTest.java | 4 +- .../integration/client/ConsumerStuckTest.java | 4 +- .../integration/client/ConsumerTest.java | 4 +- .../client/ConsumerWindowSizeTest.java | 4 +- .../integration/client/CoreClientTest.java | 29 +- .../client/CreateQueueIdempotentTest.java | 17 +- .../client/DeadLetterAddressTest.java | 19 +- .../integration/client/DeliveryOrderTest.java | 4 +- .../integration/client/DurableQueueTest.java | 4 +- .../client/ExpireTestOnRestartTest.java | 4 +- .../integration/client/ExpiryAddressTest.java | 18 +- .../client/ExpiryLargeMessageTest.java | 4 +- .../client/FailureDeadlockTest.java | 44 +- .../integration/client/HangConsumerTest.java | 8 +- .../integration/client/HeuristicXATest.java | 14 +- .../InVMNonPersistentMessageBufferTest.java | 4 +- .../client/IncompatibleVersionTest.java | 8 +- .../client/InterruptedLargeMessageTest.java | 8 +- .../client/JmsNettyNioStressTest.java | 8 +- .../integration/client/JournalCrashTest.java | 6 +- .../LargeMessageAvoidLargeMessagesTest.java | 8 +- .../integration/client/LargeMessageTest.java | 48 +- .../client/LibaioDependencyCheckTest.java | 4 +- .../client/MessageConcurrencyTest.java | 4 +- .../client/MessageConsumerRollbackTest.java | 4 +- .../client/MessageCounterTest.java | 4 +- .../client/MessageDurabilityTest.java | 8 +- .../client/MessageExpirationTest.java | 4 +- .../MessageGroupingConnectionFactoryTest.java | 23 +- .../client/MessageGroupingTest.java | 19 +- .../client/MessageHandlerTest.java | 4 +- .../client/MessagePriorityTest.java | 20 +- .../integration/client/MessageRateTest.java | 4 +- .../client/MultipleThreadFilterOneTest.java | 4 +- .../integration/client/NIOvsOIOTest.java | 19 +- .../client/NettyConnectorTest.java | 8 +- .../client/NewDeadLetterAddressTest.java | 32 +- .../tests/integration/client/OrderTest.java | 4 +- .../integration/client/PagingOrderTest.java | 129 ++--- .../integration/client/PagingSyncTest.java | 24 +- .../tests/integration/client/PagingTest.java | 391 ++++++------- .../integration/client/ProducerCloseTest.java | 12 +- .../client/ProducerFlowControlTest.java | 6 +- .../integration/client/ProducerTest.java | 4 +- .../integration/client/QueueBrowserTest.java | 4 +- .../client/ReceiveImmediateTest.java | 7 +- .../tests/integration/client/ReceiveTest.java | 4 +- .../client/RedeliveryConsumerTest.java | 8 +- .../integration/client/RequestorTest.java | 26 +- .../tests/integration/client/RoutingTest.java | 4 +- .../client/SelfExpandingBufferTest.java | 8 +- .../client/ServerLocatorConnectTest.java | 4 +- .../client/SessionCloseOnGCTest.java | 26 +- .../integration/client/SessionCloseTest.java | 48 +- ...ClosedOnRemotingConnectionFailureTest.java | 11 +- .../SessionCreateAndDeleteQueueTest.java | 4 +- .../client/SessionCreateConsumerTest.java | 4 +- .../client/SessionCreateProducerTest.java | 4 +- .../client/SessionFactoryTest.java | 24 +- ...SessionSendAcknowledgementHandlerTest.java | 4 +- .../client/SessionStopStartTest.java | 4 +- .../tests/integration/client/SessionTest.java | 4 +- .../client/SimpleSendMultipleQueuesTest.java | 4 +- .../integration/client/SlowConsumerTest.java | 4 +- .../client/TemporaryQueueTest.java | 6 +- .../client/TransactionDurabilityTest.java | 35 +- .../client/TransactionalSendTest.java | 4 +- .../client/WildCardRoutingTest.java | 39 +- .../clientcrash/ClientTestBase.java | 7 +- .../integration/cluster/NodeManagerTest.java | 4 +- .../cluster/RealNodeManagerTest.java | 4 +- .../cluster/bridge/BridgeStartTest.java | 4 +- .../cluster/bridge/BridgeTest.java | 12 +- .../cluster/bridge/BridgeTestBase.java | 4 +- .../BridgeWithDiscoveryGroupStartTest.java | 4 +- .../cluster/distribution/ClusterTestBase.java | 32 +- ...essageRedistributionWithDiscoveryTest.java | 6 +- .../distribution/SymmetricClusterTest.java | 4 +- .../SymmetricClusterWithBackupTest.java | 4 +- .../SymmetricClusterWithDiscoveryTest.java | 6 +- .../AutomaticColocatedQuorumVoteTest.java | 6 +- .../failover/BackupSyncLargeMessageTest.java | 8 +- .../cluster/failover/FailBackAutoTest.java | 6 +- .../cluster/failover/FailBackManualTest.java | 6 +- .../failover/FailoverListenerTest.java | 6 +- .../cluster/failover/FailoverTestBase.java | 16 +- .../failover/GroupingFailoverTestBase.java | 4 +- .../failover/LiveToLiveFailoverTest.java | 5 +- .../MultipleBackupsFailoverTestBase.java | 4 +- ...tipleLivesMultipleBackupsFailoverTest.java | 6 +- .../MultipleServerFailoverTestBase.java | 14 +- .../failover/QuorumVoteServerConnectTest.java | 4 +- .../ReplicatedMultipleServerFailoverTest.java | 2 +- .../failover/SecurityFailoverTest.java | 4 +- ...SingleLiveMultipleBackupsFailoverTest.java | 6 +- .../MultiThreadRandomReattachTest.java | 5 +- .../MultiThreadRandomReattachTestBase.java | 6 +- .../MultiThreadReattachSupportTestBase.java | 8 +- .../NettyMultiThreadRandomReattachTest.java | 7 +- .../cluster/reattach/OrderReattachTest.java | 4 +- .../cluster/reattach/RandomReattachTest.java | 10 +- .../cluster/reattach/ReattachTest.java | 4 +- .../topology/HAClientTopologyTest.java | 4 +- .../topology/IsolatedTopologyTest.java | 18 +- .../cluster/topology/NonHATopologyTest.java | 4 +- .../topology/TopologyClusterTestBase.java | 8 +- .../cluster/util/MultiServerTestBase.java | 4 +- .../discovery/DiscoveryBaseTest.java | 4 +- .../tests/integration/divert/DivertTest.java | 247 +++------ .../divert/PersistentDivertTest.java | 91 ++- .../integration/embedded/ValidateAIOTest.java | 6 +- .../http/CoreClientOverHttpTest.java | 14 +- .../jms/ActiveMQConnectionFactoryTest.java | 4 +- .../integration/jms/FloodServerTest.java | 57 +- .../ManualReconnectionToSingleServerTest.java | 68 +-- .../integration/jms/SimpleJNDIClientTest.java | 4 +- .../jms/client/ExpiryMessageTest.java | 6 +- .../jms/client/ReSendMessageTest.java | 6 +- .../client/RemoteConnectionStressTest.java | 12 +- .../jms/cluster/JMSFailoverListenerTest.java | 8 +- .../jms/cluster/JMSFailoverTest.java | 8 +- .../jms/cluster/JMSReconnectTest.java | 4 +- .../cluster/LargeMessageOverBridgeTest.java | 40 +- .../cluster/MultipleThreadsOpeningTest.java | 2 +- .../connection/CloseConnectionOnGCTest.java | 8 +- .../jms/connection/ExceptionListenerTest.java | 38 +- .../jms/divert/DivertAndACKClientTest.java | 26 +- .../jms/largemessage/JMSLargeMessageTest.java | 18 +- .../jms/server/JMSServerDeployerTest.java | 4 +- .../jms/server/JMSServerStartStopTest.java | 4 +- .../server/config/JMSConfigurationTest.java | 36 +- .../config/JMSServerConfigParserTest.java | 6 +- .../ConnectionFactoryControlTest.java | 59 +- .../management/JMSQueueControlTest.java | 6 +- .../management/JMSServerControl2Test.java | 4 +- .../JMSServerControlRestartTest.java | 49 +- .../management/JMSServerControlTest.java | 191 +++---- .../server/management/TopicControlTest.java | 58 +- .../management/TopicControlUsingJMSTest.java | 65 +-- .../journal/AIOImportExportTest.java | 4 +- .../journal/AIOJournalCompactTest.java | 4 +- .../journal/JournalPerfTuneTest.java | 4 +- .../NIOBufferedJournalCompactTest.java | 4 +- .../journal/NIOImportExportTest.java | 4 +- .../journal/NIOJournalCompactTest.java | 6 +- .../journal/NIOJournalImplTest.java | 4 +- .../ValidateTransactionHealthTest.java | 4 +- .../largemessage/LargeMessageTestBase.java | 20 +- .../largemessage/ServerLargeMessageTest.java | 8 +- .../management/AcceptorControlTest.java | 12 +- .../management/ActiveMQServerControlTest.java | 84 ++- .../management/AddressControlTest.java | 7 +- .../AddressControlUsingCoreTest.java | 28 +- .../management/BroadcastGroupControlTest.java | 98 ++-- .../ClusterConnectionControl2Test.java | 10 +- .../management/DivertControlTest.java | 46 +- .../integration/management/JMXDomainTest.java | 2 +- .../management/ManagementServiceImplTest.java | 36 +- .../management/ManagementTestBase.java | 4 +- .../ManagementWithPagingServerTest.java | 44 +- .../management/ManagementWithStompTest.java | 62 +-- .../management/NotificationTest.java | 40 +- .../management/QueueControlTest.java | 26 +- .../SecurityManagementTestBase.java | 4 +- ...ManagementWithConfiguredAdminUserTest.java | 15 +- ...anagementWithDefaultConfigurationTest.java | 12 +- .../management/SecurityNotificationTest.java | 30 +- .../openwire/OpenWireTestBase.java | 4 +- .../paging/MultipleProducersPagingTest.java | 4 +- .../paging/PageCountSyncOnNonTXTest.java | 4 +- .../integration/paging/PagingCounterTest.java | 4 +- .../integration/paging/PagingReceiveTest.java | 4 +- .../integration/paging/PagingSendTest.java | 4 +- .../PagingWithFailoverAndCountersTest.java | 4 +- .../paging/SpawnedServerSupport.java | 30 +- .../persistence/DeleteQueueRestartTest.java | 4 +- .../persistence/ExportFormatTest.java | 4 +- .../persistence/RestartSMTest.java | 26 +- .../persistence/StorageManagerTestBase.java | 24 +- .../persistence/XmlImportExportTest.java | 4 +- .../tests/integration/proton/ProtonTest.java | 4 +- .../ra/ActiveMQActivationTest.java | 4 +- .../ra/ActiveMQRAClusteredTestBase.java | 12 +- .../integration/remoting/BatchDelayTest.java | 4 +- .../remoting/DestroyConsumerTest.java | 6 +- .../remoting/DirectDeliverTest.java | 4 +- .../remoting/NetworkAddressTestBase.java | 6 +- .../tests/integration/remoting/PingTest.java | 31 +- .../integration/remoting/ReconnectTest.java | 4 +- .../remoting/SynchronousCloseTest.java | 8 +- .../replication/ReplicationTest.java | 12 +- .../scheduling/DelayedMessageTest.java | 14 +- .../MultipliedDelayedMessageTest.java | 22 +- .../scheduling/ScheduledMessageTest.java | 18 +- .../security/NettySecurityClientTest.java | 4 +- .../integration/security/SecurityTest.java | 12 +- .../server/AddressFullLoggingTest.java | 4 +- .../server/ConnectionLimitTest.java | 4 +- .../integration/server/ExpiryRunnerTest.java | 6 +- .../server/FileLockTimeoutTest.java | 6 +- .../server/GracefulShutdownTest.java | 22 +- .../integration/server/LVQRecoveryTest.java | 15 +- .../tests/integration/server/LVQTest.java | 6 +- .../server/PredefinedQueueTest.java | 151 ++--- .../integration/server/ResourceLimitTest.java | 4 +- .../server/ScaleDown3NodeTest.java | 6 +- .../integration/server/ScaleDownTest.java | 4 +- .../server/SimpleStartStopTest.java | 4 +- .../server/SuppliedThreadPoolTest.java | 4 +- .../spring/SpringIntegrationTest.java | 4 +- .../ssl/CoreClientOverOneWaySSLTest.java | 4 +- .../ssl/CoreClientOverTwoWaySSLTest.java | 4 +- .../integration/stomp/StompTestBase.java | 4 +- .../integration/stomp/StompWebSocketTest.java | 4 +- .../stomp/v11/StompV11TestBase.java | 4 +- .../netty/ActiveMQFrameDecoder2Test.java | 4 +- .../NettyConnectorWithHTTPUpgradeTest.java | 11 +- .../vertx/ActiveMQVertxUnitTest.java | 6 +- .../integration/xa/BasicXaRecoveryTest.java | 49 +- .../tests/integration/xa/BasicXaTest.java | 9 +- .../tests/integration/xa/XaTimeoutTest.java | 6 +- .../tests/util/JMSClusteredTestBase.java | 120 ++-- .../artemis/tests/util/JMSTestBase.java | 8 +- .../tests/util/ReplicatedBackupUtils.java | 4 +- .../util/TransportConfigurationUtils.java | 20 +- .../jms/tests/MessageConsumerTest.java | 8 +- .../message/JMSExpirationHeaderTest.java | 10 +- .../jms/tests/selector/SelectorTest.java | 6 +- .../paging/MeasurePagingMultiThreadTest.java | 14 +- .../client/ClientNonDivertedSoakTest.java | 17 +- .../tests/soak/client/ClientSoakTest.java | 17 +- .../client/SimpleSendReceiveSoakTest.java | 17 +- .../tests/stress/client/SendStressTest.java | 4 +- .../journal/AddAndRemoveStressTest.java | 4 +- .../stress/journal/CompactingStressTest.java | 18 +- .../JournalCleanupCompactStressTest.java | 6 +- .../journal/JournalRestartStressTest.java | 4 +- .../journal/LargeJournalStressTest.java | 12 +- .../MultiThreadConsumerStressTest.java | 12 +- .../NIOMultiThreadCompactorStressTest.java | 12 +- .../journal/XmlImportExportStressTest.java | 4 +- .../MultipleConsumersPageStressTest.java | 28 +- .../stress/paging/PageCursorStressTest.java | 6 +- .../tests/stress/paging/PageStressTest.java | 233 ++++---- .../tests/stress/remote/PingStressTest.java | 23 +- .../tests/stress/stomp/StompStressTest.java | 4 +- .../core/journal/impl/AIOJournalImplTest.java | 4 +- .../core/journal/impl/NIOJournalImplTest.java | 4 +- .../core/server/impl/QueueConcurrentTest.java | 4 +- .../core/server/impl/QueueImplTest.java | 4 +- .../jms/bridge/impl/JMSBridgeImplTest.java | 4 +- .../tests/timing/util/ReusableLatchTest.java | 4 +- .../util/TokenBucketLimiterImplTest.java | 4 +- .../artemis/tests/timing/util/UTF8Test.java | 4 +- .../tests/unit/core/asyncio/AIOTestBase.java | 4 +- .../core/asyncio/AsynchronousFileTest.java | 22 +- .../MultiThreadAsynchronousFileTest.java | 20 +- .../client/impl/LargeMessageBufferTest.java | 8 +- .../impl/ConfigurationValidationTest.java | 4 +- .../config/impl/ConnectorsServiceTest.java | 4 +- .../impl/TransportConfigurationTest.java | 4 +- .../journal/impl/AlignedJournalImplTest.java | 10 +- .../core/journal/impl/CleanBufferTest.java | 4 +- .../journal/impl/FileFactoryTestBase.java | 4 +- .../core/journal/impl/JournalAsyncTest.java | 4 +- .../journal/impl/JournalImplTestBase.java | 8 +- .../unit/core/journal/impl/ReclaimerTest.java | 4 +- .../impl/SequentialFileFactoryTestBase.java | 12 +- .../core/journal/impl/TimedBufferTest.java | 18 +- .../core/message/impl/MessageImplTest.java | 4 +- .../core/paging/impl/PagePositionTest.java | 4 +- .../tests/unit/core/paging/impl/PageTest.java | 24 +- .../paging/impl/PagingManagerImplTest.java | 14 +- .../core/paging/impl/PagingStoreImplTest.java | 22 +- .../impl/BatchIDGeneratorUnitTest.java | 4 +- .../impl/OperationContextUnitTest.java | 4 +- .../core/postoffice/impl/AddressImplTest.java | 4 +- .../postoffice/impl/BindingsImplTest.java | 4 +- .../impl/DuplicateDetectionUnitTest.java | 6 +- .../impl/WildcardAddressManagerUnitTest.java | 4 +- .../core/remoting/ActiveMQBufferTestBase.java | 14 +- .../impl/netty/NettyAcceptorFactoryTest.java | 4 +- .../impl/netty/NettyAcceptorTest.java | 12 +- .../impl/netty/NettyConnectionTest.java | 4 +- .../impl/netty/NettyConnectorTest.java | 4 +- .../remoting/impl/ssl/SSLSupportTest.java | 4 +- .../impl/ActiveMQSecurityManagerImplTest.java | 4 +- .../impl/ClusterConnectionBridgeTest.java | 4 +- .../cluster/impl/RemoteQueueBindImplTest.java | 4 +- .../impl/SystemPropertyOverrideTest.java | 4 +- .../unit/core/server/impl/FileLockTest.java | 4 +- .../unit/core/server/impl/QueueImplTest.java | 20 +- .../unit/jms/ActiveMQDestinationTest.java | 4 +- .../jms/client/ActiveMQMapMessageTest.java | 6 +- .../jms/client/ActiveMQStreamMessageTest.java | 12 +- .../jms/client/JMSExceptionHelperTest.java | 4 +- .../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 +- .../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 +- 352 files changed, 2417 insertions(+), 3581 deletions(-) rename artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/{ServiceTestBase.java => ActiveMQTestBase.java} (98%) 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 309c81373f7..2cb7a4b63fd 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 configs); + Configuration addDivertConfiguration(final DivertConfiguration config); + /** * Returns the cluster connections configured for this server. *

@@ -797,6 +801,8 @@ public interface Configuration Configuration addAddressesSetting(String key, AddressSettings addressesSetting); + Configuration clearAddressesSettings(); + /** * @param roles a list of roles per matching */ 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 2147eb62741..44022995b13 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 ConfigurationImpl addConnectorConfiguration(final String key, final Trans return this; } + public ConfigurationImpl clearConnectorConfigurations() + { + connectorConfigs.clear(); + return this; + } + public GroupingHandlerConfiguration getGroupingHandlerConfiguration() { return groupingHandlerConfiguration; @@ -1026,6 +1032,13 @@ public ConfigurationImpl addAddressesSetting(String key, AddressSettings address return this; } + @Override + public ConfigurationImpl clearAddressesSettings() + { + this.addressesSettings.clear(); + return this; + } + @Override public Map getResourceLimitSettings() { 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 84efb653da5..cdd665fbabd 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 boolean isAutoCreateJmsQueues() 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 boolean isAutoDeleteJmsQueues() 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 boolean isLastValueQueue() 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 AddressFullMessagePolicy getAddressFullMessagePolicy() : 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 long getPageSizeBytes() 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 int getPageCacheMaxSize() 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 long getMaxSizeBytes() 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 int getMaxDeliveryAttempts() 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 int getMessageCounterHistoryDayLimit() : 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 long getRedeliveryDelay() 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 double getRedeliveryMultiplier() 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 long getMaxRedeliveryDelay() 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 SimpleString getDeadLetterAddress() 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 SimpleString getExpiryAddress() 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 Long getExpiryDelay() 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 boolean isSendToDLAOnNoRoute() 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 long getRedistributionDelay() 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 long getSlowConsumerThreshold() 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 long getSlowConsumerCheckPeriod() 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 SlowConsumerPolicy getSlowConsumerPolicy() : AddressSettings.DEFAULT_SLOW_CONSUMER_POLICY; } - public void setSlowConsumerPolicy(final SlowConsumerPolicy slowConsumerPolicy) + public AddressSettings setSlowConsumerPolicy(final SlowConsumerPolicy slowConsumerPolicy) { this.slowConsumerPolicy = slowConsumerPolicy; + return this; } /** 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 9bfc3a3b859..b024517420e 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.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.ObjectInputStream; import java.io.ObjectOutputStream; -public class ConfigurationImplTest extends ServiceTestBase +public class ConfigurationImplTest extends ActiveMQTestBase { protected Configuration conf; 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 6ee3fa40d5f..546b7a98a95 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.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.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 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 8da767c2df5..319a6676af3 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.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 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 d24b5e6059a..f7526d12eab 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 @@ 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 @@ * 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:/tests/config/logging.properties */ -public class WrongRoleFileConfigurationParserTest extends ServiceTestBase +public class WrongRoleFileConfigurationParserTest extends ActiveMQTestBase { @BeforeClass public static void prepareLogger() 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 881b212d58c..ca88431dfc4 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.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; 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 2959eb8e5a9..5f818554210 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.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 @@ * 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"); 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 563022c4077..ee655f00b06 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 @@ 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() 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 97c65443b50..39219660742 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 @@ 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.HashSet; import java.util.concurrent.atomic.AtomicInteger; -public class RepositoryTest extends ServiceTestBase +public class RepositoryTest extends ActiveMQTestBase { HierarchicalRepository> securityRepository; diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServiceTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java similarity index 98% rename from artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServiceTestBase.java rename to artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java index baeae3ceb98..1116ebdd142 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ServiceTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java @@ -133,7 +133,7 @@ /** * Base class with basic utilities on starting up a basic server */ -public abstract class ServiceTestBase extends Assert +public abstract class ActiveMQTestBase extends Assert { public static final String TARGET_TMP = "./target/tmp"; public static final String INVM_ACCEPTOR_FACTORY = InVMAcceptorFactory.class.getCanonicalName(); @@ -203,7 +203,7 @@ protected void finished(Description description) DEFAULT_UDP_PORT = 6000 + random.nextInt(1000); } - public ServiceTestBase() + public ActiveMQTestBase() { File parent = new File(TARGET_TMP); parent.mkdirs(); @@ -388,6 +388,12 @@ public static void assertEqualsByteArrays(final byte[] expected, final byte[] ac } } + /** + * + * @param str + * @param sub + * @return + */ public static int countOccurrencesOf(String str, String sub) { if (str == null || sub == null || str.length() == 0 || sub.length() == 0) @@ -420,17 +426,31 @@ protected boolean isWindows() return (OS_TYPE.indexOf("win") >= 0); } - protected Configuration createDefaultConfig() throws Exception + protected Configuration createDefaultInVMConfig() throws Exception { - return createDefaultConfig(false); + return createDefaultConfig(0, false); + } + + protected Configuration createDefaultInVMConfig(final int serverID) throws Exception + { + return createDefaultConfig(serverID, false); + } + + protected Configuration createDefaultNettyConfig() throws Exception + { + return createDefaultConfig(0, true); } protected Configuration createDefaultConfig(final boolean netty) throws Exception { - ConfigurationImpl configuration = createBasicConfig(-1) + return createDefaultConfig(0, netty); + } + + protected Configuration createDefaultConfig(final int serverID, final boolean netty) throws Exception + { + ConfigurationImpl configuration = createBasicConfig(serverID) .setJMXManagementEnabled(false) - .clearAcceptorConfigurations() - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); + .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, generateInVMParams(serverID))); if (netty) { @@ -440,11 +460,11 @@ protected Configuration createDefaultConfig(final boolean netty) throws Exceptio return configuration; } - protected Configuration createDefaultConfig(final int index, + private Configuration createDefaultConfig(final int index, final Map params, final String... acceptors) { - Configuration configuration = createBasicConfig(index).clearAcceptorConfigurations(); + Configuration configuration = createBasicConfig(index); for (String acceptor : acceptors) { @@ -455,37 +475,9 @@ protected Configuration createDefaultConfig(final int index, return configuration; } - protected static final ClusterConnectionConfiguration basicClusterConnectionConfig(String connectorName, String... connectors) - { - ArrayList connectors0 = new ArrayList<>(); - for (String c : connectors) - { - connectors0.add(c); - } - ClusterConnectionConfiguration clusterConnectionConfiguration = new ClusterConnectionConfiguration() - .setName("cluster1") - .setAddress("jms") - .setConnectorName(connectorName) - .setRetryInterval(1000) - .setDuplicateDetection(false) - .setForwardWhenNoConsumers(true) - .setMaxHops(1) - .setConfirmationWindowSize(1) - .setStaticConnectors(connectors0); - - return clusterConnectionConfiguration; - } - - protected final OrderedExecutorFactory getOrderedExecutor() - { - final ExecutorService executor = Executors.newCachedThreadPool(); - executorSet.add(executor); - return new OrderedExecutorFactory(executor); - } - protected ConfigurationImpl createBasicConfig() throws Exception { - return createBasicConfig(0); + return createBasicConfig(-1); } /** @@ -511,17 +503,41 @@ protected ConfigurationImpl createBasicConfig(final int serverID) return configuration; } - public static final ConfigurationImpl createBasicConfigNoDataFolder() + protected Map generateInVMParams(final int node) { - ConfigurationImpl configuration = new ConfigurationImpl() - .setSecurityEnabled(false) - .setJournalType(getDefaultJournalType()) - .setPersistenceEnabled(false) - .setJournalCompactMinFiles(0) - .setJournalCompactPercentage(0) - .setClusterPassword(CLUSTER_PASSWORD); + Map params = new HashMap(); - return configuration; + params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); + + return params; + } + + protected static final ClusterConnectionConfiguration basicClusterConnectionConfig(String connectorName, String... connectors) + { + ArrayList connectors0 = new ArrayList<>(); + for (String c : connectors) + { + connectors0.add(c); + } + ClusterConnectionConfiguration clusterConnectionConfiguration = new ClusterConnectionConfiguration() + .setName("cluster1") + .setAddress("jms") + .setConnectorName(connectorName) + .setRetryInterval(1000) + .setDuplicateDetection(false) + .setForwardWhenNoConsumers(true) + .setMaxHops(1) + .setConfirmationWindowSize(1) + .setStaticConnectors(connectors0); + + return clusterConnectionConfiguration; + } + + protected final OrderedExecutorFactory getOrderedExecutor() + { + final ExecutorService executor = Executors.newCachedThreadPool(); + executorSet.add(executor); + return new OrderedExecutorFactory(executor); } protected static String getUDPDiscoveryAddress() @@ -1546,8 +1562,8 @@ protected final ActiveMQServer createServer(final boolean realFiles, final long maxAddressSize, final Map settings) { - ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(configuration, realFiles)); + if (settings != null) { for (Map.Entry setting : settings.entrySet()) @@ -1556,10 +1572,10 @@ protected final ActiveMQServer createServer(final boolean realFiles, } } - AddressSettings defaultSetting = new AddressSettings(); - defaultSetting.setPageSizeBytes(pageSize); - defaultSetting.setMaxSizeBytes(maxAddressSize); - defaultSetting.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); + AddressSettings defaultSetting = new AddressSettings() + .setPageSizeBytes(pageSize) + .setMaxSizeBytes(maxAddressSize) + .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); server.getAddressSettingsRepository().addMatch("#", defaultSetting); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java index 66a41c6f157..ec0695f77ea 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/RemoveFolder.java @@ -38,6 +38,6 @@ public RemoveFolder(String folderName) */ protected void after() { - ServiceTestBase.deleteDirectory(new File(folderName)); + ActiveMQTestBase.deleteDirectory(new File(folderName)); } } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java index cc45e64b526..048b6869327 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SimpleStringTest.java @@ -437,7 +437,7 @@ public void run() x[i].start(); } - ServiceTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch); start.countDown(); for (T t : x) diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java index 017c5aa6ceb..fd74684722b 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/SingleServerTestBase.java @@ -17,11 +17,10 @@ package org.apache.activemq.artemis.tests.util; 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.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; -import org.apache.activemq.artemis.api.core.client.ActiveMQClient; 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.junit.Before; @@ -29,7 +28,7 @@ * Any test based on a single server can extend this class. * This is useful for quick writing tests with starting a server, locator, factory... etc */ -public abstract class SingleServerTestBase extends ServiceTestBase +public abstract class SingleServerTestBase extends ActiveMQTestBase { protected ActiveMQServer server; @@ -47,9 +46,7 @@ public void setUp() throws Exception { super.setUp(); - Configuration configuration = createDefaultConfig() - .setSecurityEnabled(false); - server = createServer(false, configuration); + server = createServer(false, createDefaultInVMConfig()); server.start(); locator = createLocator(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java index 300842110eb..5aeb719409c 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java @@ -28,14 +28,14 @@ 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.impl.BridgeImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) -public class BridgeServerLocatorConfigurationTest extends ServiceTestBase +public class BridgeServerLocatorConfigurationTest extends ActiveMQTestBase { private static final long BRIDGE_TTL = 1234L; diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java index 24f5af37df2..f1dd08f36c9 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +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; @@ -40,7 +40,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) -public class ClosingConnectionTest extends ServiceTestBase +public class ClosingConnectionTest extends ActiveMQTestBase { public static final SimpleString ADDRESS = new SimpleString("SimpleAddress"); 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 deb8b948ec5..f411980283e 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 @@ -20,7 +20,7 @@ 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.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) -public class LatencyTest extends ServiceTestBase +public class LatencyTest extends ActiveMQTestBase { /* * simple test to make sure connect still works with some network latency built into netty @@ -58,7 +58,7 @@ public class LatencyTest extends ServiceTestBase ) public void testLatency() throws Exception { - ActiveMQServer server = createServer(createDefaultConfig(true)); + ActiveMQServer server = createServer(createDefaultNettyConfig()); server.start(); ServerLocator locator = createNettyNonHALocator(); ClientSessionFactory factory = createSessionFactory(locator); 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 efda5c94bce..3f385ab5a45 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 @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +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; @@ -36,7 +36,7 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) -public class OrphanedConsumerTest extends ServiceTestBase +public class OrphanedConsumerTest extends ActiveMQTestBase { private static boolean conditionActive = true; 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 bbf43d5b3aa..87d73b4910f 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 @@ -16,12 +16,7 @@ */ package org.apache.activemq.artemis.tests.extras.byteman; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -34,7 +29,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; 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.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -43,8 +38,12 @@ import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + @RunWith(BMUnitRunner.class) -public class PagingLeakTest extends ServiceTestBase +public class PagingLeakTest extends ActiveMQTestBase { private static final AtomicInteger pagePosInstances = new AtomicInteger(0); @@ -120,26 +119,19 @@ public void testValidateLeak() throws Throwable final ArrayList errors = new ArrayList(); // A backup that will be waiting to be activated - Configuration conf = createDefaultConfig(true) - .setSecurityEnabled(false) - .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - - final ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, true); - addServer(server); + Configuration config = createDefaultNettyConfig(); + final ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true)); server.start(); - - AddressSettings settings = new AddressSettings(); - settings.setPageSizeBytes(20 * 1024); - settings.setMaxSizeBytes(200 * 1024); - settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); - + AddressSettings settings = new AddressSettings() + .setPageSizeBytes(20 * 1024) + .setMaxSizeBytes(200 * 1024) + .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); server.getAddressSettingsRepository().addMatch("#", settings); - final SimpleString address = new SimpleString("pgdAddress"); class Consumer extends Thread @@ -154,7 +146,6 @@ class Consumer extends Thread Consumer(int sleepTime, String suffix, int maxConsumed) throws Exception { - server.createQueue(address, address.concat(suffix), null, true, false); this.sleepTime = sleepTime; diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java index aa8165ce5fd..97b6838107b 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java @@ -20,7 +20,7 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; @@ -31,7 +31,7 @@ import java.util.concurrent.CountDownLatch; @RunWith(BMUnitRunner.class) -public class ReplicationBackupTest extends ServiceTestBase +public class ReplicationBackupTest extends ActiveMQTestBase { private static final CountDownLatch ruleFired = new CountDownLatch(1); private ActiveMQServer backupServer; @@ -63,15 +63,13 @@ public void testReplicatedBackupAnnouncement() throws Exception TransportConfiguration backupConnector = TransportConfigurationUtils.getNettyConnector(false, 0); TransportConfiguration backupAcceptor = TransportConfigurationUtils.getNettyAcceptor(false, 0); - final String suffix = "_backup"; + Configuration backupConfig = createDefaultInVMConfig() + .setBindingsDirectory(getBindingsDir(0, true)) + .setJournalDirectory(getJournalDir(0, true)) + .setPagingDirectory(getPageDir(0, true)) + .setLargeMessagesDirectory(getLargeMessagesDir(0, true)); - Configuration backupConfig = createDefaultConfig() - .setBindingsDirectory(getBindingsDir() + suffix) - .setJournalDirectory(getJournalDir() + suffix) - .setPagingDirectory(getPageDir() + suffix) - .setLargeMessagesDirectory(getLargeMessagesDir() + suffix); - - Configuration liveConfig = createDefaultConfig(); + Configuration liveConfig = createDefaultInVMConfig(); ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, liveAcceptor); @@ -99,7 +97,7 @@ public void run() backupServer = createServer(backupConfig); backupServer.start(); - ServiceTestBase.waitForRemoteBackup(null, 3, true, backupServer); + ActiveMQTestBase.waitForRemoteBackup(null, 3, true, backupServer); } public static void breakIt() 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 d45606c3f58..c8999cd0dbf 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 @@ -16,10 +16,6 @@ */ package org.apache.activemq.artemis.tests.extras.byteman; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; @@ -28,7 +24,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +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; @@ -36,11 +32,14 @@ import org.junit.Test; import org.junit.runner.RunWith; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicInteger; + /** * This test validates a deadlock identified by https://bugzilla.redhat.com/show_bug.cgi?id=959616 */ @RunWith(BMUnitRunner.class) -public class StartStopDeadlockTest extends ServiceTestBase +public class StartStopDeadlockTest extends ActiveMQTestBase { /* * simple test to make sure connect still works with some network latency built into netty @@ -80,23 +79,17 @@ public void testDeadlock() throws Exception { // A live server that will always be crashed - Configuration confLive = createDefaultConfig(true) - .setSecurityEnabled(false) - .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration()) - .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - final ActiveMQServer serverLive = ActiveMQServers.newActiveMQServer(confLive); + Configuration confLive = createDefaultNettyConfig() + .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration()); + final ActiveMQServer serverLive = addServer(ActiveMQServers.newActiveMQServer(confLive)); serverLive.start(); - addServer(serverLive); // A backup that will be waiting to be activated - Configuration conf = createDefaultConfig(true) - .setSecurityEnabled(false) - .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration()) - .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + Configuration config = createDefaultNettyConfig() + .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration()); - final ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, true); - addServer(server); + final ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true)); final JMSServerManagerImpl jmsServer = new JMSServerManagerImpl(server); final InVMNamingContext context = new InVMNamingContext(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java index ebd57b6b49f..b4a10b1953e 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java @@ -16,10 +16,6 @@ */ package org.apache.activemq.artemis.tests.extras.byteman; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; @@ -27,12 +23,11 @@ import org.apache.activemq.artemis.api.core.management.CoreNotificationType; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.management.Notification; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +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; @@ -41,8 +36,12 @@ import org.junit.Test; import org.junit.runner.RunWith; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + @RunWith(BMUnitRunner.class) -public class StompInternalStateTest extends ServiceTestBase +public class StompInternalStateTest extends ActiveMQTestBase { private static final String STOMP_QUEUE_NAME = "jms.queue.StompTestQueue"; @@ -92,17 +91,15 @@ public void testStompProtocolManagerLeak() throws Exception @Override protected Configuration createDefaultConfig(final boolean netty) throws Exception { - Configuration config = super.createDefaultConfig(netty) - .setSecurityEnabled(false) - .setPersistenceEnabled(false); - - Map params = new HashMap(); + Map params = new HashMap<>(); params.put(TransportConstants.PROTOCOLS_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME); params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT); params.put(TransportConstants.STOMP_CONSUMERS_CREDIT, "-1"); TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params); - config.getAcceptorConfigurations().add(stompTransport); - config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); + + Configuration config = super.createDefaultConfig(netty) + .setPersistenceEnabled(false) + .addAcceptorConfiguration(stompTransport); return config; } @@ -132,7 +129,7 @@ else if (noti.getType() == CoreNotificationType.BINDING_REMOVED) public void setUp() throws Exception { super.setUp(); - server = createServer(createDefaultConfig(true)); + server = createServer(createDefaultNettyConfig()); server.start(); } 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 1dc7d9ef091..a13ff37b138 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 @@ -60,12 +60,12 @@ import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; -public abstract class BridgeTestBase extends ServiceTestBase +public abstract class BridgeTestBase extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -392,7 +392,7 @@ protected void sendMessages(final ConnectionFactory cf, if (largeMessage) { BytesMessage msg = sess.createBytesMessage(); - ((ActiveMQMessage) msg).setInputStream(ServiceTestBase.createFakeLargeStream(1024L * 1024L)); + ((ActiveMQMessage) msg).setInputStream(ActiveMQTestBase.createFakeLargeStream(1024L * 1024L)); msg.setStringProperty("msg", "message" + i); prod.send(msg); } diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java index 5f32f9f2b37..ea0ddb94c81 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java @@ -53,7 +53,7 @@ import org.apache.activemq.artemis.jms.server.JMSServerManager; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.unit.util.InVMContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Before; @@ -62,7 +62,7 @@ * This class serves as a base class for jms bridge tests in * clustered scenarios. */ -public abstract class ClusteredBridgeTestBase extends ServiceTestBase +public abstract class ClusteredBridgeTestBase extends ActiveMQTestBase { private static int index = 0; @@ -170,7 +170,7 @@ public void create() throws Exception liveNode.setRegistry(new JndiBindingRegistry(liveContext)); //backup - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJournalDirectory(getJournalDir(id, true)) .setBindingsDirectory(getBindingsDir(id, true)) .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params)) @@ -179,7 +179,7 @@ public void create() throws Exception .setHAPolicyConfiguration(new ReplicaPolicyConfiguration()) .addClusterConfiguration(basicClusterConnectionConfig(backupConnector.getName(), liveConnector.getName())); - ActiveMQServer backup = addServer(ActiveMQServers.newActiveMQServer(conf, true)); + ActiveMQServer backup = addServer(ActiveMQServers.newActiveMQServer(config, true)); Context context = new InVMContext(); diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java index 0b378871fac..c67177908f7 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java @@ -27,7 +27,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; 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.hornetq.api.core.client.HornetQClient; @@ -41,7 +41,7 @@ import java.util.Map; import java.util.UUID; -public class HornetQProtocolTest extends ServiceTestBase +public class HornetQProtocolTest extends ActiveMQTestBase { protected ActiveMQServer server; 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 264e5971e29..eee187814d2 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 @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.transaction.impl.XidImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Before; @@ -41,11 +41,11 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -public class DuplicateDetectionTest extends ServiceTestBase +public class DuplicateDetectionTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private ActiveMQServer messagingService; + private ActiveMQServer server; private final SimpleString propKey = new SimpleString("propkey"); @@ -54,10 +54,6 @@ public class DuplicateDetectionTest extends ServiceTestBase @Test public void testSimpleDuplicateDetecion() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); session.start(); @@ -114,12 +110,6 @@ public void testSimpleDuplicateDetecion() throws Exception producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); - - session.close(); - - sf.close(); - - locator.close(); } @Test @@ -139,11 +129,13 @@ public void testDuplicateIDCacheJournalRetentionForNonTemporaryQueues() throws E { testDuplicateIDCacheMemoryRetention(false); - messagingService.stop(); + server.stop(); - messagingService.start(); + waitForServerToStop(server); - Assert.assertEquals(0, ((PostOfficeImpl) messagingService.getPostOffice()).getDuplicateIDCaches().size()); + server.start(); + + Assert.assertEquals(0, ((PostOfficeImpl) server.getPostOffice()).getDuplicateIDCaches().size()); } @Test @@ -151,28 +143,29 @@ public void testDuplicateIDCacheJournalRetentionForTemporaryQueues() throws Exce { testDuplicateIDCacheMemoryRetention(true); - messagingService.stop(); + server.stop(); + + waitForServerToStop(server); - messagingService.start(); + server.start(); - Assert.assertEquals(0, ((PostOfficeImpl) messagingService.getPostOffice()).getDuplicateIDCaches().size()); + Assert.assertEquals(0, ((PostOfficeImpl) server.getPostOffice()).getDuplicateIDCaches().size()); } public void testDuplicateIDCacheMemoryRetention(boolean temporary) throws Exception { final int TEST_SIZE = 100; - ServerLocator locator = createInVMNonHALocator(); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); session.start(); - Assert.assertEquals(0, ((PostOfficeImpl)messagingService.getPostOffice()).getDuplicateIDCaches().size()); + Assert.assertEquals(0, ((PostOfficeImpl) server.getPostOffice()).getDuplicateIDCaches().size()); final SimpleString addressName = new SimpleString("DuplicateDetectionTestAddress"); @@ -222,27 +215,17 @@ public void testDuplicateIDCacheMemoryRetention(boolean temporary) throws Except consumer.close(); // there will be 2 ID caches, one for messages using "_AMQ_DUPL_ID" and one for "_AMQ_BRIDGE_DUP" - Assert.assertEquals(2, ((PostOfficeImpl)messagingService.getPostOffice()).getDuplicateIDCaches().size()); + Assert.assertEquals(2, ((PostOfficeImpl) server.getPostOffice()).getDuplicateIDCaches().size()); session.deleteQueue(queueName); - Assert.assertEquals(0, ((PostOfficeImpl)messagingService.getPostOffice()).getDuplicateIDCaches().size()); + Assert.assertEquals(0, ((PostOfficeImpl) server.getPostOffice()).getDuplicateIDCaches().size()); } - session.close(); - - sf.close(); - - locator.close(); - - Assert.assertEquals(0, ((PostOfficeImpl)messagingService.getPostOffice()).getDuplicateIDCaches().size()); + Assert.assertEquals(0, ((PostOfficeImpl) server.getPostOffice()).getDuplicateIDCaches().size()); } @Test public void testSimpleDuplicateDetectionWithString() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); session.start(); @@ -299,21 +282,11 @@ public void testSimpleDuplicateDetectionWithString() throws Exception producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testCacheSize() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); session.start(); @@ -459,21 +432,11 @@ public void testCacheSize() throws Exception Assert.assertNotNull(message); Assert.assertEquals(i, message.getObjectProperty(propKey)); } - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testTransactedDuplicateDetection1() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, false, false); session.start(); @@ -512,21 +475,11 @@ public void testTransactedDuplicateDetection1() throws Exception message = consumer.receiveImmediate(); Assert.assertNull(message); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testTransactedDuplicateDetection2() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, false, false); session.start(); @@ -559,21 +512,11 @@ public void testTransactedDuplicateDetection2() throws Exception message = consumer.receiveImmediate(); Assert.assertNull(message); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testTransactedDuplicateDetection3() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, false, false); session.start(); @@ -625,21 +568,11 @@ public void testTransactedDuplicateDetection3() throws Exception message = consumer.receiveImmediate(); Assert.assertNull(message); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testRollbackThenSend() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, false, false); session.start(); @@ -667,15 +600,9 @@ public void testRollbackThenSend() throws Exception session.commit(); - message = consumer.receive(5000); assertNotNull(message); assertTrue(message.getStringProperty("key").equals(dupID1.toString())); - session.close(); - - sf.close(); - - locator.close(); } /* @@ -685,10 +612,6 @@ public void testRollbackThenSend() throws Exception @Test public void testEntireTransactionRejected() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, false, false); session.start(); @@ -770,21 +693,11 @@ public void testEntireTransactionRejected() throws Exception message.acknowledge(); session.commit(); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testXADuplicateDetection1() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -850,21 +763,11 @@ public void testXADuplicateDetection1() throws Exception DuplicateDetectionTest.log.info("committing session"); session.commit(xid3, false); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testXADuplicateDetection2() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -932,21 +835,11 @@ public void testXADuplicateDetection2() throws Exception DuplicateDetectionTest.log.info("committing session"); session.commit(xid3, false); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testXADuplicateDetection3() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -1000,7 +893,7 @@ public void testXADuplicateDetection3() throws Exception session.start(xid3, XAResource.TMNOFLAGS); - message = consumer.receive(250); + consumer.receive(250); message = consumer.receiveImmediate(); Assert.assertNull(message); @@ -1013,21 +906,11 @@ public void testXADuplicateDetection3() throws Exception DuplicateDetectionTest.log.info("committing session"); session.commit(xid3, false); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testXADuplicateDetectionPrepareAndRollback() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -1086,21 +969,11 @@ public void testXADuplicateDetectionPrepareAndRollback() throws Exception msgRec.acknowledge(); session.commit(); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testXADuplicateDetectionPrepareAndRollbackStopServer() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -1126,9 +999,11 @@ public void testXADuplicateDetectionPrepareAndRollbackStopServer() throws Except session.close(); - messagingService.stop(); + server.stop(); + + waitForServerToStop(server); - messagingService.start(); + server.start(); sf = createSessionFactory(locator); @@ -1173,21 +1048,11 @@ public void testXADuplicateDetectionPrepareAndRollbackStopServer() throws Except msgRec.acknowledge(); session.commit(); - - session.close(); - - sf.close(); - - locator.close(); } @Test public void testXADuplicateDetection4() throws Exception { - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -1251,7 +1116,7 @@ public void testXADuplicateDetection4() throws Exception session.start(xid3, XAResource.TMNOFLAGS); - message = consumer.receive(250); + consumer.receive(250); message = consumer.receiveImmediate(); Assert.assertNull(message); @@ -1264,12 +1129,6 @@ public void testXADuplicateDetection4() throws Exception DuplicateDetectionTest.log.info("committing session"); session.commit(xid3, false); - - session.close(); - - sf.close(); - - locator.close(); } private ClientMessage createMessage(final ClientSession session, final int i) @@ -1284,18 +1143,16 @@ private ClientMessage createMessage(final ClientSession session, final int i) @Test public void testDuplicateCachePersisted() throws Exception { - messagingService.stop(); + server.stop(); - Configuration conf = createDefaultConfig() + config = createDefaultInVMConfig() .setIDCacheSize(cacheSize); - ActiveMQServer messagingService2 = createServer(conf); + server = createServer(config); - messagingService2.start(); + server.start(); - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1327,11 +1184,11 @@ public void testDuplicateCachePersisted() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); @@ -1356,33 +1213,23 @@ public void testDuplicateCachePersisted() throws Exception producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testDuplicateCachePersisted2() throws Exception { - messagingService.stop(); + server.stop(); final int theCacheSize = 5; - Configuration conf = createDefaultConfig() - .setIDCacheSize(theCacheSize); - - ActiveMQServer messagingService2 = createServer(conf); + config = createDefaultInVMConfig() + .setIDCacheSize(theCacheSize); - messagingService2.start(); + server = createServer(config); - ServerLocator locator = createInVMNonHALocator(); + server.start(); - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1410,11 +1257,11 @@ public void testDuplicateCachePersisted2() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); @@ -1437,34 +1284,24 @@ public void testDuplicateCachePersisted2() throws Exception ClientMessage message2 = consumer.receiveImmediate(); Assert.assertNull(message2); } - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testDuplicateCachePersistedRestartWithSmallerCache() throws Exception { - messagingService.stop(); + server.stop(); final int initialCacheSize = 10; final int subsequentCacheSize = 5; - Configuration conf = createDefaultConfig() - .setIDCacheSize(initialCacheSize); + config = createDefaultInVMConfig() + .setIDCacheSize(initialCacheSize); - ActiveMQServer messagingService2 = createServer(conf); + server = createServer(config); - messagingService2.start(); + server.start(); - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1492,13 +1329,15 @@ public void testDuplicateCachePersistedRestartWithSmallerCache() throws Exceptio sf.close(); - messagingService2.stop(); + server.stop(); - conf.setIDCacheSize(subsequentCacheSize); + waitForServerToStop(server); - messagingService2 = createServer(conf); + config.setIDCacheSize(subsequentCacheSize); - messagingService2.start(); + server = createServer(config); + + server.start(); sf = createSessionFactory(locator); @@ -1530,34 +1369,24 @@ public void testDuplicateCachePersistedRestartWithSmallerCache() throws Exceptio Assert.assertNull(message2); } } - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testDuplicateCachePersistedRestartWithSmallerCacheEnsureDeleted() throws Exception { - messagingService.stop(); + server.stop(); final int initialCacheSize = 10; final int subsequentCacheSize = 5; - Configuration conf = createDefaultConfig() - .setIDCacheSize(initialCacheSize); + config = createDefaultInVMConfig() + .setIDCacheSize(initialCacheSize); - ActiveMQServer messagingService2 = createServer(conf); + server = createServer(config); - messagingService2.start(); + server.start(); - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1585,23 +1414,27 @@ public void testDuplicateCachePersistedRestartWithSmallerCacheEnsureDeleted() th sf.close(); - messagingService2.stop(); + server.stop(); + + waitForServerToStop(server); - conf.setIDCacheSize(subsequentCacheSize); + config.setIDCacheSize(subsequentCacheSize); - messagingService2 = createServer(conf); + server = createServer(config); - messagingService2.start(); + server.start(); // Now stop and set back to original cache size and restart - messagingService2.stop(); + server.stop(); - conf.setIDCacheSize(initialCacheSize); + waitForServerToStop(server); - messagingService2 = createServer(conf); + config.setIDCacheSize(initialCacheSize); - messagingService2.start(); + server = createServer(config); + + server.start(); sf = createSessionFactory(locator); @@ -1633,32 +1466,22 @@ public void testDuplicateCachePersistedRestartWithSmallerCacheEnsureDeleted() th Assert.assertNull(message2); } } - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testNoPersist() throws Exception { - messagingService.stop(); + server.stop(); - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize) - .setPersistIDCache(false); + config = createDefaultInVMConfig() + .setIDCacheSize(cacheSize) + .setPersistIDCache(false); - ActiveMQServer messagingService2 = createServer(conf); + server = createServer(config); - messagingService2.start(); + server.start(); - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1690,11 +1513,11 @@ public void testNoPersist() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); @@ -1719,32 +1542,22 @@ public void testNoPersist() throws Exception producer.send(message); message2 = consumer.receive(200); Assert.assertEquals(2, message2.getObjectProperty(propKey)); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testNoPersistTransactional() throws Exception { - messagingService.stop(); - - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize) - .setPersistIDCache(false); + server.stop(); - ActiveMQServer messagingService2 = createServer(conf); + config = createDefaultInVMConfig() + .setIDCacheSize(cacheSize) + .setPersistIDCache(false); - messagingService2.start(); + server = createServer(config); - ServerLocator locator = createInVMNonHALocator(); + server.start(); - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, false, false); @@ -1778,11 +1591,11 @@ public void testNoPersistTransactional() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); @@ -1809,32 +1622,11 @@ public void testNoPersistTransactional() throws Exception session.commit(); message2 = consumer.receive(200); Assert.assertEquals(2, message2.getObjectProperty(propKey)); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testPersistTransactional() throws Exception { - messagingService.stop(); - - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize); - - ActiveMQServer messagingService2 = createServer(conf); - - messagingService2.start(); - - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, false, false); session.start(); @@ -1871,11 +1663,11 @@ public void testPersistTransactional() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); @@ -1928,32 +1720,22 @@ public void testPersistTransactional() throws Exception message2 = consumer.receiveImmediate(); Assert.assertNull(message2); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testNoPersistXA1() throws Exception { - messagingService.stop(); + server.stop(); - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize) - .setPersistIDCache(false); + config = createDefaultInVMConfig() + .setIDCacheSize(cacheSize) + .setPersistIDCache(false); - ActiveMQServer messagingService2 = createServer(conf); + server = createServer(config); - messagingService2.start(); + server.start(); - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); + sf = createSessionFactory(locator); ClientSession session = sf.createSession(true, false, false); @@ -1989,11 +1771,11 @@ public void testNoPersistXA1() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); @@ -2032,32 +1814,11 @@ public void testNoPersistXA1() throws Exception message2 = consumer.receive(200); Assert.assertEquals(2, message2.getObjectProperty(propKey)); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testNoPersistXA2() throws Exception { - messagingService.stop(); - - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize); - - ActiveMQServer messagingService2 = createServer(conf); - - messagingService2.start(); - - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(true, false, false); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -2072,8 +1833,6 @@ public void testNoPersistXA2() throws Exception ClientProducer producer = session.createProducer(queueName); - ClientConsumer consumer = session.createConsumer(queueName); - ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); @@ -2090,15 +1849,15 @@ public void testNoPersistXA2() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); - session = sf.createSession(true, false, false); + session = addClientSession(sf.createSession(true, false, false)); Xid xid2 = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -2110,7 +1869,7 @@ public void testNoPersistXA2() throws Exception producer = session.createProducer(queueName); - consumer = session.createConsumer(queueName); + ClientConsumer consumer = session.createConsumer(queueName); message = createMessage(session, 1); message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); @@ -2133,33 +1892,12 @@ public void testNoPersistXA2() throws Exception message2 = consumer.receive(200); Assert.assertEquals(2, message2.getObjectProperty(propKey)); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } @Test public void testPersistXA1() throws Exception { - messagingService.stop(); - - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize); - - ActiveMQServer messagingService2 = createServer(conf); - - messagingService2.start(); - - ServerLocator locator = createInVMNonHALocator(); - - ClientSessionFactory sf = createSessionFactory(locator); - - ClientSession session = sf.createSession(true, false, false); + ClientSession session = addClientSession(sf.createSession(true, false, false)); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -2193,15 +1931,15 @@ public void testPersistXA1() throws Exception sf.close(); - messagingService2.stop(); + server.stop(); - messagingService2 = createServer(conf); + waitForServerToStop(server); - messagingService2.start(); + server.start(); sf = createSessionFactory(locator); - session = sf.createSession(true, false, false); + session = addClientSession(sf.createSession(true, false, false)); Xid xid2 = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); @@ -2245,27 +1983,27 @@ public void testPersistXA1() throws Exception message2 = consumer.receiveImmediate(); Assert.assertNull(message2); - - session.close(); - - sf.close(); - - locator.close(); - - messagingService2.stop(); } + private Configuration config; + ServerLocator locator; + ClientSessionFactory sf; + @Override @Before public void setUp() throws Exception { super.setUp(); - Configuration conf = createDefaultConfig() - .setIDCacheSize(cacheSize); + config = createDefaultInVMConfig() + .setIDCacheSize(cacheSize); - messagingService = createServer(true, conf); + server = createServer(true, config); - messagingService.start(); + server.start(); + + locator = createInVMNonHALocator(); + + sf = createSessionFactory(locator); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java index 30f0c7a95b0..9d1a984ea33 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InterceptorTest.java @@ -42,12 +42,12 @@ import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; -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; -public class InterceptorTest extends ServiceTestBase +public class InterceptorTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java index bffdc97cdcb..972c48f8e54 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; /** * @@ -43,7 +43,7 @@ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4806007 * http://jira.jboss.com/jira/browse/JBAS-2641 */ -public class String64KLimitTest extends ServiceTestBase +public class String64KLimitTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java index a755a6c8994..6fa0f616596 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.integration.aerogear.AeroGearConnectorServiceFactory; import org.apache.activemq.artemis.integration.aerogear.AeroGearConstants; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.json.JSONArray; import org.apache.activemq.artemis.utils.json.JSONException; import org.apache.activemq.artemis.utils.json.JSONObject; @@ -53,7 +53,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class AeroGearBasicServerTest extends ServiceTestBase +public class AeroGearBasicServerTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -88,7 +88,7 @@ public void setUp() throws Exception params.put(AeroGearConstants.DEVICE_TYPE_NAME, "android,ipad"); params.put(AeroGearConstants.SOUND_NAME, "sound1"); params.put(AeroGearConstants.VARIANTS_NAME, "variant1,variant2"); - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .addConnectorServiceConfiguration( new ConnectorServiceConfiguration() .setFactoryClassName(AeroGearConnectorServiceFactory.class.getName()) 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 3eac8ed1ce7..a84024cfd80 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 @@ -23,13 +23,13 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.junit.Assert; import org.junit.Test; -public class AckBatchSizeTest extends ServiceTestBase +public class AckBatchSizeTest extends ActiveMQTestBase { public final SimpleString addressA = new SimpleString("addressA"); 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 ef3621fdfca..eb443630f0e 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 @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQConsumerContext; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -44,7 +44,7 @@ import org.junit.Assert; import org.junit.Test; -public class AcknowledgeTest extends ServiceTestBase +public class AcknowledgeTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 018d6948365..63851de7a94 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 @@ -19,7 +19,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Interceptor; import org.apache.activemq.artemis.api.core.Message; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; import org.apache.activemq.artemis.api.core.client.ClientSession; @@ -29,12 +28,11 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -44,7 +42,7 @@ * From https://jira.jboss.org/jira/browse/HORNETQ-144 * */ -public class ActiveMQCrashTest extends ServiceTestBase +public class ActiveMQCrashTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -56,10 +54,8 @@ public class ActiveMQCrashTest extends ServiceTestBase @Test public void testHang() throws Exception { - Configuration configuration = createDefaultConfig() - .setPersistenceEnabled(false) - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); + Configuration configuration = createDefaultInVMConfig() + .setPersistenceEnabled(false); server = addServer(ActiveMQServers.newActiveMQServer(configuration)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java index d85d73cb5c5..e0c20b21f4c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AddressSettingsTest.java @@ -26,11 +26,11 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.HierarchicalRepository; 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 { private final SimpleString addressA = new SimpleString("addressA"); 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 f683a0b67eb..36be4819dde 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,11 +29,11 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; -public class AutogroupIdTest extends ServiceTestBase +public class AutogroupIdTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 0b624bccae3..b6f1a3a0af6 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 @@ -23,11 +23,11 @@ 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.Assert; import org.junit.Test; -public class BlockingSendTest extends ServiceTestBase +public class BlockingSendTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java index 6c0210f1b76..95b822b3adc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java @@ -28,13 +28,13 @@ 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.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.junit.Assert; import org.junit.Test; -public class CommitRollbackTest extends ServiceTestBase +public class CommitRollbackTest extends ActiveMQTestBase { public final SimpleString addressA = new SimpleString("addressA"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java index 59ea460b9e4..71fe143f6b5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java @@ -26,7 +26,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; @@ -40,7 +40,7 @@ * the NPE happened during depaging what let the server to recover itself on the next depage. * To verify a fix on this test against the previous version of QueueImpl look for NPEs on System.err */ -public class ConcurrentCreateDeleteProduceTest extends ServiceTestBase +public class ConcurrentCreateDeleteProduceTest extends ActiveMQTestBase { volatile boolean running = true; @@ -62,15 +62,14 @@ public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false) .setJournalSyncTransactional(false); - server = - createServer(true, config, - PAGE_SIZE, - PAGE_MAX, - new HashMap()); + server = createServer(true, config, + PAGE_SIZE, + PAGE_MAX, + new HashMap()); server.start(); locator = createNonHALocator(false); locator.setBlockOnDurableSend(false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java index cba72783234..e94de4ac40f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java @@ -19,7 +19,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -29,12 +28,11 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.client.impl.ClientConsumerImpl; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; 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.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -42,7 +40,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class ConsumerCloseTest extends ServiceTestBase +public class ConsumerCloseTest extends ActiveMQTestBase { private ClientSessionFactory sf; @@ -302,9 +300,7 @@ public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())) - .setSecurityEnabled(false); + Configuration config = createDefaultInVMConfig(); server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); 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 22fc1b236f1..30527e80fdb 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 @@ -25,11 +25,11 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.impl.QueueImpl; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -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 ConsumerFilterTest extends ServiceTestBase +public class ConsumerFilterTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 62ad8e6d427..f63705cac7e 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 @@ -29,9 +29,9 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class ConsumerRoundRobinTest extends ServiceTestBase +public class ConsumerRoundRobinTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 0246b6be423..175be6957a1 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 @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection; 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 ConsumerStuckTest extends ServiceTestBase +public class ConsumerStuckTest extends ActiveMQTestBase { private ActiveMQServer server; 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 40fa4dce410..4c68e96e733 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 @@ -39,7 +39,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -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.junit.Assert; import org.junit.Before; @@ -48,7 +48,7 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class ConsumerTest extends ServiceTestBase +public class ConsumerTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "isNetty={0}") public static Collection getParameters() 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 0c3a240549d..9033fe8e4cb 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 @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal; import org.apache.activemq.artemis.core.postoffice.Binding; import org.apache.activemq.artemis.core.postoffice.Bindings; @@ -46,7 +46,7 @@ import org.junit.Before; import org.junit.Test; -public class ConsumerWindowSizeTest extends ServiceTestBase +public class ConsumerWindowSizeTest extends ActiveMQTestBase { private final SimpleString addressA = new SimpleString("addressA"); 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 7002e8aa957..15669a0f9ef 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 @@ -17,27 +17,24 @@ package org.apache.activemq.artemis.tests.integration.client; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.junit.Test; - -import org.junit.Assert; - import org.apache.activemq.artemis.api.core.SimpleString; 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; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; 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.ActiveMQClient; 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.jms.client.ActiveMQTextMessage; +import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.Assert; +import org.junit.Test; -public class CoreClientTest extends ServiceTestBase +public class CoreClientTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -54,29 +51,25 @@ public class CoreClientTest extends ServiceTestBase @Test public void testCoreClientNetty() throws Exception { - testCoreClient(NETTY_ACCEPTOR_FACTORY, NETTY_CONNECTOR_FACTORY); + testCoreClient(true); } @Test public void testCoreClientInVM() throws Exception { - testCoreClient(INVM_ACCEPTOR_FACTORY, INVM_CONNECTOR_FACTORY); + testCoreClient(false); } - private void testCoreClient(final String acceptorFactoryClassName, final String connectorFactoryClassName) throws Exception + private void testCoreClient(final boolean netty) throws Exception { final SimpleString QUEUE = new SimpleString("CoreClientTestQueue"); - Configuration conf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(acceptorFactoryClassName)); - - ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(createDefaultConfig(netty), false)); server.start(); ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - connectorFactoryClassName))); + netty ? NETTY_CONNECTOR_FACTORY : INVM_CONNECTOR_FACTORY))); ClientSessionFactory sf = createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java index 0e189d61ee4..ca9d0a1fcc1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java @@ -16,24 +16,22 @@ */ package org.apache.activemq.artemis.tests.integration.client; -import java.util.concurrent.atomic.AtomicInteger; - import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; 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.util.ServiceTestBase; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class CreateQueueIdempotentTest extends ServiceTestBase +import java.util.concurrent.atomic.AtomicInteger; + +public class CreateQueueIdempotentTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -43,12 +41,7 @@ public class CreateQueueIdempotentTest extends ServiceTestBase public void setUp() throws Exception { super.setUp(); - - Configuration conf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - - server = addServer(ActiveMQServers.newActiveMQServer(conf, true)); + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), true)); server.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 0a253e3da3d..72c8107de58 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 @@ -19,8 +19,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; -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; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -28,14 +26,13 @@ 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.config.Configuration; 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.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,7 +42,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class DeadLetterAddressTest extends ServiceTestBase +public class DeadLetterAddressTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -509,18 +506,10 @@ public void testDeadLetterAddressWithOverridenSublevelAddressSettings() throws E public void setUp() throws Exception { super.setUp(); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY); - - Configuration configuration = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(transportConfig); - server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); - // start the server + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), false)); server.start(); // then we create a client as normal - locator = - addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - INVM_CONNECTOR_FACTORY))); + locator = createInVMNonHALocator(); ClientSessionFactory sessionFactory = createSessionFactory(locator); clientSession = addClientSession(sessionFactory.createSession(false, true, false)); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java index a06c0469baf..00541321517 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java @@ -29,13 +29,13 @@ 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.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class DeliveryOrderTest extends ServiceTestBase +public class DeliveryOrderTest extends ActiveMQTestBase { public final SimpleString addressA = new SimpleString("addressA"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java index 4d571fc315a..d46d4b85a13 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java @@ -31,9 +31,9 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class DurableQueueTest extends ServiceTestBase +public class DurableQueueTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- 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 1d8e7eedd2f..08eb60d5cef 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 @@ -27,11 +27,11 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; -public class ExpireTestOnRestartTest extends ServiceTestBase +public class ExpireTestOnRestartTest extends ActiveMQTestBase { ActiveMQServer server; 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 409a6da4630..883a8b42903 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 @@ -26,19 +26,18 @@ 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.config.Configuration; import org.apache.activemq.artemis.core.message.impl.MessageImpl; 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.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ExpiryAddressTest extends ServiceTestBase +public class ExpiryAddressTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -385,21 +384,14 @@ public void testExpireWithOverridenSublevelAddressSettings() throws Exception public void setUp() throws Exception { super.setUp(); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY); - - Configuration configuration = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(transportConfig); - server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); - // start the server + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), false)); server.start(); // then we create a client as normal - locator = createInVMNonHALocator(); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnAcknowledge(true); ClientSessionFactory sessionFactory = createSessionFactory(locator); // There are assertions over sizes that needs to be done after the ACK // was received on server clientSession = addClientSession(sessionFactory.createSession(null, null, false, true, true, false, 0)); } - } 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 2c065ddc391..9201c18a135 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 @@ -27,7 +27,7 @@ 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.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; 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; @@ -37,7 +37,7 @@ /** * This test will send large messages in page-mode, DLQ then, expiry then, and they should be received fine */ -public class ExpiryLargeMessageTest extends ServiceTestBase +public class ExpiryLargeMessageTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 eef85eb5d65..addb0f8e5bf 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 @@ -15,15 +15,24 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.client; + import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; +import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; +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.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.jms.server.management.NullInitialContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.After; - import org.junit.Test; import javax.jms.Connection; @@ -31,18 +40,7 @@ import javax.jms.JMSException; import javax.jms.Session; -import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; -import org.apache.activemq.artemis.api.jms.JMSFactoryType; -import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; -import org.apache.activemq.artemis.core.config.Configuration; -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.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; - -public class FailureDeadlockTest extends ServiceTestBase +public class FailureDeadlockTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -59,21 +57,13 @@ public class FailureDeadlockTest extends ServiceTestBase public void setUp() throws Exception { super.setUp(); - - Configuration conf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - server = createServer(false, conf); + server = createServer(false, createDefaultInVMConfig()); jmsServer = new JMSServerManagerImpl(server); jmsServer.setRegistry(new JndiBindingRegistry(new NullInitialContext())); jmsServer.start(); - cf1 = - ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - cf2 = - ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + cf1 = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + cf2 = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); } @Override 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 dbac19424c7..d98d9a7e701 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 @@ -63,7 +63,7 @@ import org.apache.activemq.artemis.spi.core.remoting.ReadyListener; import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager; import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ExecutorFactory; import org.apache.activemq.artemis.utils.ReusableLatch; import org.junit.After; @@ -76,7 +76,7 @@ * and it will make sure we can still perform certain operations on the queue such as produce * and verify the counters */ -public class HangConsumerTest extends ServiceTestBase +public class HangConsumerTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -93,13 +93,11 @@ public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setMessageExpiryScanPeriod(10); ActiveMQSecurityManager securityManager = new ActiveMQSecurityManagerImpl(); - config.setPersistenceEnabled(true); - server = new MyActiveMQServer(config, ManagementFactory.getPlatformMBeanServer(), securityManager); server.start(); 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 389bf8d694e..45c97fcf1ad 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 @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.transaction.impl.XidImpl; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -40,7 +40,7 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -public class HeuristicXATest extends ServiceTestBase +public class HeuristicXATest extends ActiveMQTestBase { // Constants ----------------------------------------------------- final SimpleString ADDRESS = new SimpleString("ADDRESS"); @@ -62,7 +62,7 @@ public class HeuristicXATest extends ServiceTestBase @Test public void testInvalidCall() throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setJMXManagementEnabled(true); ActiveMQServer server = createServer(false, configuration); @@ -88,7 +88,7 @@ public void testHeuristicRollback() throws Exception private void internalTest(final boolean isCommit) throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setJMXManagementEnabled(true); ActiveMQServer server = createServer(false, configuration); @@ -184,7 +184,7 @@ public void testHeuristicRollbackWithRestart() throws Exception private void doHeuristicCompletionWithRestart(final boolean isCommit) throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setJMXManagementEnabled(true); ActiveMQServer server = createServer(true, configuration); @@ -285,7 +285,7 @@ public void testRecoverHeuristicRollbackWithRestart() throws Exception private void doRecoverHeuristicCompletedTxWithRestart(final boolean heuristicCommit) throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setJMXManagementEnabled(true); ActiveMQServer server = createServer(true, configuration); @@ -395,7 +395,7 @@ public void testForgetHeuristicRollbackAndRestart() throws Exception private void doForgetHeuristicCompletedTxAndRestart(final boolean heuristicCommit) throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setJMXManagementEnabled(true); ActiveMQServer server = createServer(true, configuration); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java index 48c5a82f432..ebf8932ae4a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InVMNonPersistentMessageBufferTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.client; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.DataConstants; -public class InVMNonPersistentMessageBufferTest extends ServiceTestBase +public class InVMNonPersistentMessageBufferTest extends ActiveMQTestBase { public static final String address = "testaddress"; 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 3be17895df5..a9f4851f8a8 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 @@ -41,7 +41,7 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.VersionLoader; import org.junit.After; import org.junit.Before; @@ -49,7 +49,7 @@ import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; -public class IncompatibleVersionTest extends ServiceTestBase +public class IncompatibleVersionTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; // Constants ----------------------------------------------------- @@ -251,10 +251,10 @@ private static class ServerStarter { public void perform(String startedString) throws Exception { - Configuration conf = new ConfigurationImpl() + Configuration config = new ConfigurationImpl() .setSecurityEnabled(false) .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory")); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = ActiveMQServers.newActiveMQServer(config, false); server.start(); log.info("### server: " + startedString); 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 60592f9904e..a94238bdefa 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 @@ -38,7 +38,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.filter.Filter; import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; import org.apache.activemq.artemis.core.persistence.StorageManager; @@ -128,7 +128,7 @@ public void testInterruptLargeMessageSend() throws Exception server.stop(false); - ServiceTestBase.forceGC(); + ActiveMQTestBase.forceGC(); server.start(); @@ -261,7 +261,7 @@ public void testSendNonPersistentQueue() throws Exception Assert.assertNotNull(clientMessage); for (int countByte = 0; countByte < LARGE_MESSAGE_SIZE; countByte++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte()); } clientMessage.acknowledge(); } @@ -340,7 +340,7 @@ public void testSendPaging() throws Exception Assert.assertNotNull(clientMessage); for (int countByte = 0; countByte < LARGE_MESSAGE_SIZE; countByte++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(countByte), clientMessage.getBodyBuffer().readByte()); } clientMessage.acknowledge(); } 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 484f65460b1..889d09c4af2 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 @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.client.ActiveMQDestination; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; @@ -62,7 +62,7 @@ * counting strategy is used to verify that the count has reached the expected * value. */ -public class JmsNettyNioStressTest extends ServiceTestBase +public class JmsNettyNioStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -92,8 +92,8 @@ public void doTestStressSend(final boolean netty) throws Exception // minimize threads to maximize possibility for deadlock params.put(TransportConstants.NIO_REMOTING_THREADS_PROPNAME, 1); params.put(TransportConstants.BATCH_DELAY, 50); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY, params); - Configuration config = createBasicConfig(-1) + TransportConfiguration transportConfig = new TransportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY, params); + Configuration config = createBasicConfig() .setJMXManagementEnabled(false) .clearAcceptorConfigurations() .addAcceptorConfiguration(transportConfig); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java index 95cc3e498fc..371f5bf6a7c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java @@ -34,11 +34,11 @@ import org.apache.activemq.artemis.core.journal.impl.JournalImpl; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; 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.Assert; import org.junit.Test; -public class JournalCrashTest extends ServiceTestBase +public class JournalCrashTest extends ActiveMQTestBase { private static final int FIRST_RUN = 4; @@ -58,7 +58,7 @@ public class JournalCrashTest extends ServiceTestBase protected void startServer() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles()) .setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage()) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java index e43ba042006..11be864fa7f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.junit.Assert; @@ -350,7 +350,7 @@ public void testDLALargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1 + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1 .getBodyBuffer().readByte()); } @@ -375,7 +375,7 @@ public void testDLALargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1 + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1 .getBodyBuffer().readByte()); } @@ -394,7 +394,7 @@ public void testDLALargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1 + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1 .getBodyBuffer().readByte()); } 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 65bdea841fa..5df25dc0c50 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 @@ -49,7 +49,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; 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; @@ -299,7 +299,7 @@ private void fillAddress() throws Exception final int PAGE_SIZE = 10 * 1024; final int MESSAGE_SIZE = 1024; // 1k - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, @@ -490,7 +490,7 @@ public void testDLALargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } session.close(); @@ -514,7 +514,7 @@ public void testDLALargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } msg1.acknowledge(); @@ -531,7 +531,7 @@ public void testDLALargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } msg1.acknowledge(); @@ -580,7 +580,7 @@ public void testDeliveryCount() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } session.rollback(); @@ -595,7 +595,7 @@ public void testDeliveryCount() throws Exception msg.acknowledge(); for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } Assert.assertEquals(2, msg.getDeliveryCount()); msg.acknowledge(); @@ -663,7 +663,7 @@ public void testDLAOnExpiryNonDurableMessage() throws Exception for (int j = 0; j < messageSize; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); } session.rollback(); @@ -681,7 +681,7 @@ public void testDLAOnExpiryNonDurableMessage() throws Exception for (int j = 0; j < messageSize; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); } session.rollback(); @@ -705,7 +705,7 @@ public void testDLAOnExpiryNonDurableMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } session.commit(); @@ -779,7 +779,7 @@ public void testDLAOnExpiry() throws Exception for (int j = 0; j < messageSize; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); } session.rollback(); @@ -796,7 +796,7 @@ public void testDLAOnExpiry() throws Exception for (int j = 0; j < messageSize; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), msg1.getBodyBuffer().readByte()); } session.rollback(); @@ -825,7 +825,7 @@ public void testDLAOnExpiry() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } session.commit(); @@ -892,7 +892,7 @@ public void testExpiryLargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } session.close(); @@ -916,7 +916,7 @@ public void testExpiryLargeMessage() throws Exception for (int i = 0; i < messageSize; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg1.getBodyBuffer().readByte()); } msg1.acknowledge(); @@ -1196,7 +1196,7 @@ private void compareString(final long messageSize, ClientMessage msg) assertNotNull(msg); for (long i = 0; i < messageSize; i++) { - Assert.assertEquals("position " + i, ServiceTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals("position " + i, ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } } @@ -2448,7 +2448,7 @@ public void testBufferMultipleLargeMessages() throws Exception for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { ClientMessage clientFile = session.createMessage(true); - clientFile.setBodyInputStream(ServiceTestBase.createFakeLargeStream(SIZE)); + clientFile.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(SIZE)); producer.send(clientFile); } @@ -2481,7 +2481,7 @@ public void testBufferMultipleLargeMessages() throws Exception { for (int byteRead = 0; byteRead < SIZE; byteRead++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(byteRead), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(byteRead), msg.getBodyBuffer().readByte()); } } @@ -2552,7 +2552,7 @@ public void testReceiveMultipleMessages() throws Exception for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { ClientMessage clientFile = session.createMessage(true); - clientFile.setBodyInputStream(ServiceTestBase.createFakeLargeStream(SIZE)); + clientFile.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(SIZE)); producer.send(clientFile); } @@ -2584,7 +2584,7 @@ public void testReceiveMultipleMessages() throws Exception { for (int byteRead = 0; byteRead < SIZE; byteRead++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(byteRead), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(byteRead), msg.getBodyBuffer().readByte()); } } @@ -2911,7 +2911,7 @@ public void testSendStreamingSingleMessage() throws Exception session.createQueue(ADDRESS, ADDRESS, null, true); ClientMessage clientFile = session.createMessage(true); - clientFile.setBodyInputStream(ServiceTestBase.createFakeLargeStream(SIZE)); + clientFile.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(SIZE)); ClientProducer producer = session.createProducer(ADDRESS); @@ -2990,7 +2990,7 @@ public void testIgnoreStreaming() throws Exception for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { ClientMessage msg = session.createMessage(true); - msg.setBodyInputStream(ServiceTestBase.createFakeLargeStream(SIZE)); + msg.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(SIZE)); msg.putIntProperty(new SimpleString("key"), i); producer.send(msg); @@ -3048,7 +3048,7 @@ public void testSendServerMessage() throws Exception for (int i = 0; i < LARGE_MESSAGE_SIZE; i++) { - fileMessage.addBytes(new byte[]{ServiceTestBase.getSamplebyte(i)}); + fileMessage.addBytes(new byte[]{ActiveMQTestBase.getSamplebyte(i)}); } // The server would be doing this @@ -3078,7 +3078,7 @@ public void testSendServerMessage() throws Exception for (int i = 0; i < LARGE_MESSAGE_SIZE; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } msg.acknowledge(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java index 8a119738e4b..18c3bf1b363 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; /** * This tests is placed in duplication here to validate that the libaio module is properly loaded on this @@ -27,7 +27,7 @@ * * This test should be placed on each one of the tests modules to make sure the library is loaded correctly. */ -public class LibaioDependencyCheckTest extends ServiceTestBase +public class LibaioDependencyCheckTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- 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 8203ad93d66..a4a04bab84b 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 @@ -32,12 +32,12 @@ import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.After; import org.junit.Before; import org.junit.Test; -public class MessageConcurrencyTest extends ServiceTestBase +public class MessageConcurrencyTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 b90540a73c8..46c66b88588 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 @@ -28,7 +28,7 @@ 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.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Test; -public class MessageConsumerRollbackTest extends ServiceTestBase +public class MessageConsumerRollbackTest extends ActiveMQTestBase { ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.java index 5ae47605935..4556c67c205 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageCounterTest.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.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class MessageCounterTest extends ServiceTestBase +public class MessageCounterTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java index 59923908182..4dc97ae09f9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java @@ -27,12 +27,12 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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; -public class MessageDurabilityTest extends ServiceTestBase +public class MessageDurabilityTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -149,7 +149,7 @@ public void testDurableMessageOnNonDurableQueue() throws Exception session.start(); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -177,7 +177,7 @@ public void testDurableMessageOnTemporaryQueue() throws Exception restart(); session.start(); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, new ActiveMQAction() { public void run() throws ActiveMQException { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java index beca5e6af65..487a2cbc8ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java @@ -33,9 +33,9 @@ import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class MessageExpirationTest extends ServiceTestBase +public class MessageExpirationTest extends ActiveMQTestBase { private static final int EXPIRATION = 1000; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java index dc96d1066f7..8eccb4a5754 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java @@ -18,8 +18,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.SimpleString; -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; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -27,10 +25,9 @@ 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.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -39,7 +36,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class MessageGroupingConnectionFactoryTest extends ServiceTestBase +public class MessageGroupingConnectionFactoryTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -118,21 +115,9 @@ private void doTestBasicGroupingMultipleProducers() throws Exception public void setUp() throws Exception { super.setUp(); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY); - - Configuration configuration = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(transportConfig); - server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); - // start the server + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), false)); server.start(); - - // then we create a client as normal - - ServerLocator locator = - addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - ServiceTestBase.INVM_CONNECTOR_FACTORY))); - + ServerLocator locator = createInVMNonHALocator(); locator.setGroupID("grp1"); ClientSessionFactory sessionFactory = createSessionFactory(locator); clientSession = addClientSession(sessionFactory.createSession(false, true, true)); 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 48c45902b45..4d83ef9b627 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 @@ -19,8 +19,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; -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; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -33,7 +31,7 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; @@ -45,7 +43,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class MessageGroupingTest extends ServiceTestBase +public class MessageGroupingTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -608,19 +606,10 @@ private void doTestMultipleGrouping() throws Exception public void setUp() throws Exception { super.setUp(); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY); - - Configuration configuration = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(transportConfig); + Configuration configuration = createDefaultInVMConfig(); server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); - // start the server server.start(); - - // then we create a client as normal - locator = - addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - INVM_CONNECTOR_FACTORY))); + locator = createInVMNonHALocator(); clientSessionFactory = createSessionFactory(locator); clientSession = addClientSession(clientSessionFactory.createSession(false, true, true)); clientSession.createQueue(qName, qName, null, false); 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 e2cd3554929..fc27127bd65 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 @@ -34,9 +34,9 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class MessageHandlerTest extends ServiceTestBase +public class MessageHandlerTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; 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 e9b9da090cc..2694196d50f 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 @@ -17,8 +17,6 @@ package org.apache.activemq.artemis.tests.integration.client; import org.apache.activemq.artemis.api.core.SimpleString; -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; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -26,17 +24,16 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; 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.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class MessagePriorityTest extends ServiceTestBase +public class MessagePriorityTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -334,17 +331,12 @@ public void testManyMessages() throws Exception public void setUp() throws Exception { super.setUp(); - - Configuration config = createDefaultConfig() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())) - .setSecurityEnabled(false); + Configuration config = createDefaultInVMConfig(); server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); - locator = - addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - ServiceTestBase.INVM_CONNECTOR_FACTORY))); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true); sf = createSessionFactory(locator); session = addClientSession(sf.createSession(false, true, true)); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java index 141836e7f84..9fd79eb94c9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java @@ -29,12 +29,12 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class MessageRateTest extends ServiceTestBase +public class MessageRateTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- 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 e6f854b3c3b..19e6cc4a913 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 @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.integration.client; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; @@ -38,7 +38,7 @@ * Multiple Threads producing Messages, with Multiple Consumers with different queues, each queue with a different filter * This is similar to MultipleThreadFilterTwoTest but it uses multiple queues */ -public class MultipleThreadFilterOneTest extends ServiceTestBase +public class MultipleThreadFilterOneTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- 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 ede5299757c..7f9467e2aeb 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 @@ -32,7 +32,7 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Test; @@ -42,7 +42,7 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; -public class NIOvsOIOTest extends ServiceTestBase +public class NIOvsOIOTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -155,22 +155,19 @@ private void testPerf(boolean nio) throws Exception { String acceptorFactoryClassName = "org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory"; - Configuration conf = createDefaultConfig() - .setSecurityEnabled(false); + Configuration config = createDefaultInVMConfig(); Map params = new HashMap(); params.put(TransportConstants.USE_NIO_PROP_NAME, nio); - conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName, params)); + config.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName, params)); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = ActiveMQServers.newActiveMQServer(config, false); - AddressSettings addressSettings = new AddressSettings(); - - addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK); - - addressSettings.setMaxSizeBytes(10 * 1024 * 1024); + AddressSettings addressSettings = new AddressSettings() + .setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK) + .setMaxSizeBytes(10 * 1024 * 1024); final String dest = "test-destination"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java index 4d018a9bfc0..80046f647e6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConnectorTest.java @@ -21,16 +21,15 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; 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.After; import org.junit.Before; import org.junit.Test; -public class NettyConnectorTest extends ServiceTestBase +public class NettyConnectorTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -40,8 +39,7 @@ public void setUp() throws Exception { super.setUp(); - Configuration config = this.createDefaultConfig(true); - server = this.createServer(false, config); + server = this.createServer(false, createDefaultNettyConfig()); server.start(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java index 9b9541ddbc7..92ff441705e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NewDeadLetterAddressTest.java @@ -15,34 +15,29 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.client; -import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import org.junit.Assert; +import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; 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.ActiveMQClient; 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.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * * A NewDeadLetterAddressTest */ -public class NewDeadLetterAddressTest extends ServiceTestBase +public class NewDeadLetterAddressTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -75,18 +70,9 @@ public void testSendToDLAWhenNoRoute() throws Exception public void setUp() throws Exception { super.setUp(); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY); - - Configuration configuration = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(transportConfig); - server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); - // start the server + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), false)); server.start(); - // then we create a client as normal - locator = - addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - INVM_CONNECTOR_FACTORY))); + locator = createInVMNonHALocator(); ClientSessionFactory sessionFactory = createSessionFactory(locator); clientSession = sessionFactory.createSession(false, true, false); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java index 8088189af96..b5897ab5172 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java @@ -25,7 +25,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.junit.Assert; @@ -35,7 +35,7 @@ import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -public class OrderTest extends ServiceTestBase +public class OrderTest extends ActiveMQTestBase { private boolean persistent; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java index b857030b30a..a954adb2361 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingOrderTest.java @@ -52,7 +52,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Test; @@ -60,7 +60,7 @@ * A PagingOrderTest. PagingTest has a lot of tests already. I decided to create a newer one more * specialized on Ordering and counters */ -public class PagingOrderTest extends ServiceTestBase +public class PagingOrderTest extends ActiveMQTestBase { private static final int PAGE_MAX = 100 * 1024; @@ -95,7 +95,7 @@ public void testOrder1() throws Throwable { boolean persistentMessages = true; - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); @@ -105,16 +105,15 @@ public void testOrder1() throws Throwable final int messageSize = 1024; final int numberOfMessages = 500; - ServerLocator locator = createInVMNonHALocator(); - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setConsumerWindowSize(1024 * 1024); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setConsumerWindowSize(1024 * 1024); ClientSessionFactory sf = createSessionFactory(locator); @@ -175,13 +174,9 @@ public void testOrder1() throws Throwable session.close(); - session = null; - sf.close(); sf = createSessionFactory(locator); - locator = createInVMNonHALocator(); - session = sf.createSession(true, true, 0); session.start(); @@ -204,7 +199,7 @@ public void testPageCounter() throws Throwable { boolean persistentMessages = true; - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); @@ -215,16 +210,14 @@ public void testPageCounter() throws Throwable final int numberOfMessages = 500; - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setConsumerWindowSize(1024 * 1024); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setConsumerWindowSize(1024 * 1024); ClientSessionFactory sf = createSessionFactory(locator); @@ -357,7 +350,7 @@ public void testPageCounter2() throws Throwable { boolean persistentMessages = true; - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); @@ -368,16 +361,14 @@ public void testPageCounter2() throws Throwable final int numberOfMessages = 500; - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setConsumerWindowSize(1024 * 1024); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setConsumerWindowSize(1024 * 1024); ClientSessionFactory sf = createSessionFactory(locator); @@ -471,7 +462,7 @@ public void testOrderOverRollback() throws Throwable { boolean persistentMessages = true; - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); @@ -482,16 +473,14 @@ public void testOrderOverRollback() throws Throwable final int numberOfMessages = 3000; - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setConsumerWindowSize(1024 * 1024); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setConsumerWindowSize(1024 * 1024); ClientSessionFactory sf = createSessionFactory(locator); @@ -571,7 +560,7 @@ public void testOrderOverRollback2() throws Throwable { boolean persistentMessages = true; - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); @@ -582,16 +571,14 @@ public void testOrderOverRollback2() throws Throwable final int numberOfMessages = 200; - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setConsumerWindowSize(0); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setConsumerWindowSize(0); ClientSessionFactory sf = createSessionFactory(locator); @@ -682,16 +669,14 @@ public void testOrderOverRollback2() throws Throwable server.start(); - locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setConsumerWindowSize(0); + locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setConsumerWindowSize(0); sf = createSessionFactory(locator); @@ -718,7 +703,7 @@ public void testOrderOverRollback2() throws Throwable public void testPagingOverCreatedDestinationTopics() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, -1, new HashMap()); @@ -797,7 +782,7 @@ public void testPagingOverCreatedDestinationTopics() throws Exception public void testPagingOverCreatedDestinationQueues() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, -1, -1, new HashMap()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java index 500a0847d1b..e274d692d9a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingSyncTest.java @@ -26,7 +26,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; @@ -37,7 +37,7 @@ *

* PagingTest has a lot of tests already. I decided to create a newer one more specialized on Ordering and counters */ -public class PagingSyncTest extends ServiceTestBase +public class PagingSyncTest extends ActiveMQTestBase { private static final int PAGE_MAX = 100 * 1024; @@ -55,7 +55,7 @@ public void testOrder1() throws Throwable { boolean persistentMessages = true; - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); ActiveMQServer server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); @@ -66,16 +66,14 @@ public void testOrder1() throws Throwable final int numberOfMessages = 500; - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(1000); - locator.setConnectionTTL(2000); - locator.setReconnectAttempts(0); - - locator.setBlockOnNonDurableSend(false); - locator.setBlockOnDurableSend(false); - locator.setBlockOnAcknowledge(false); - locator.setConsumerWindowSize(1024 * 1024); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(1000) + .setConnectionTTL(2000) + .setReconnectAttempts(0) + .setBlockOnNonDurableSend(false) + .setBlockOnDurableSend(false) + .setBlockOnAcknowledge(false) + .setConsumerWindowSize(1024 * 1024); ClientSessionFactory sf = createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java index 7abb2acd755..88c5a555490 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java @@ -57,7 +57,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.logs.AssertionLoggerHandler; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -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; @@ -79,7 +79,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public class PagingTest extends ServiceTestBase +public class PagingTest extends ActiveMQTestBase { private ServerLocator locator; private ActiveMQServer server; @@ -107,7 +107,7 @@ public void setUp() throws Exception @Test public void testPageOnLargeMessageMultipleQueues() throws Exception { - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); final int PAGE_MAX = 20 * 1024; @@ -223,7 +223,7 @@ public void testPageCleanup() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = @@ -236,11 +236,10 @@ public void testPageCleanup() throws Exception final int numberOfMessages = 5000; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -362,7 +361,7 @@ public void testFirstPageCompleteNotDeleted() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = @@ -375,11 +374,10 @@ public void testFirstPageCompleteNotDeleted() throws Exception final int numberOfMessages = 20; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -482,7 +480,7 @@ public void testPreparedACKAndRestart() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -495,12 +493,11 @@ public void testPreparedACKAndRestart() throws Exception final int numberOfMessages = 50; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setAckBatchSize(0); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setAckBatchSize(0); sf = createSessionFactory(locator); @@ -699,7 +696,7 @@ public void testMoveExpire() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalDirectory(getJournalDir()) .setJournalSyncNonTransactional(false) .setJournalCompactMinFiles(0) // disable compact @@ -726,13 +723,11 @@ public void testMoveExpire() throws Exception final int numberOfMessages = 5000; - locator = createInVMNonHALocator(); - - locator.setConsumerWindowSize(10 * 1024 * 1024); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setConsumerWindowSize(10 * 1024 * 1024) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); ClientSessionFactory sf = locator.createSessionFactory(); @@ -841,7 +836,7 @@ public void testDeleteQueueRestart() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalDirectory(getJournalDir()) .setJournalSyncNonTransactional(false) .setJournalCompactMinFiles(0); // disable compact @@ -856,13 +851,11 @@ public void testDeleteQueueRestart() throws Exception final int numberOfMessages = 5000; - locator = createInVMNonHALocator(); - - locator.setConsumerWindowSize(10 * 1024 * 1024); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setConsumerWindowSize(10 * 1024 * 1024) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); SimpleString QUEUE2 = ADDRESS.concat("-2"); @@ -1025,7 +1018,7 @@ public void testPreparePersistent() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -1232,7 +1225,7 @@ public void testSendOverBlockingNoFlowControl() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, new HashMap()); @@ -1244,13 +1237,12 @@ public void testSendOverBlockingNoFlowControl() throws Exception final int numberOfMessages = 500; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); - locator.setProducerWindowSize(-1); - locator.setMinLargeMessageSize(1024 * 1024); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true) + .setProducerWindowSize(-1) + .setMinLargeMessageSize(1024 * 1024); sf = createSessionFactory(locator); @@ -1315,7 +1307,7 @@ public void testReceiveImmediate() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -1328,11 +1320,10 @@ public void testReceiveImmediate() throws Exception final int numberOfMessages = 1000; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -1444,7 +1435,7 @@ public void testDeletePhysicalPages() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setPersistDeliveryCountBeforeDelivery(true); config.setJournalSyncNonTransactional(false); @@ -1459,11 +1450,10 @@ public void testDeletePhysicalPages() throws Exception final int numberOfMessages = 1000; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -1662,7 +1652,7 @@ public void testMissingTXEverythingAcked() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -1681,11 +1671,10 @@ public void testMissingTXEverythingAcked() throws Exception try { - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -1847,7 +1836,7 @@ public void testMissingTXEverythingAcked2() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -1866,11 +1855,10 @@ public void testMissingTXEverythingAcked2() throws Exception try { - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -2006,7 +1994,7 @@ public void testTwoQueuesOneNoRouting() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -2019,11 +2007,10 @@ public void testTwoQueuesOneNoRouting() throws Exception final int numberOfMessages = 1000; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -2124,7 +2111,7 @@ public void internalMultiQueuesTest(final boolean divert) throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -2142,6 +2129,8 @@ public void internalMultiQueuesTest(final boolean divert) throws Exception .setForwardingAddress(PagingTest.ADDRESS.toString() + "-1") .setExclusive(true); + config.addDivertConfiguration(divert1); + DivertConfiguration divert2 = new DivertConfiguration() .setName("dv2") .setRoutingName("nm2") @@ -2149,11 +2138,7 @@ public void internalMultiQueuesTest(final boolean divert) throws Exception .setForwardingAddress(PagingTest.ADDRESS.toString() + "-2") .setExclusive(true); - ArrayList divertList = new ArrayList(); - divertList.add(divert1); - divertList.add(divert2); - - config.setDivertConfigurations(divertList); + config.addDivertConfiguration(divert2); } server.start(); @@ -2337,10 +2322,10 @@ public void run() } catch (AssertionError e) { - PagingTest.log.info("Expected buffer:" + ServiceTestBase.dumbBytesHex(body, 40)); - PagingTest.log.info("Arriving buffer:" + ServiceTestBase.dumbBytesHex(message2.getBodyBuffer() - .toByteBuffer() - .array(), 40)); + PagingTest.log.info("Expected buffer:" + ActiveMQTestBase.dumbBytesHex(body, 40)); + PagingTest.log.info("Arriving buffer:" + ActiveMQTestBase.dumbBytesHex(message2.getBodyBuffer() + .toByteBuffer() + .array(), 40)); throw e; } } @@ -2420,7 +2405,7 @@ public void testMultiQueuesNonPersistentAndPersistent() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -2536,10 +2521,10 @@ public void run() } catch (AssertionError e) { - PagingTest.log.info("Expected buffer:" + ServiceTestBase.dumbBytesHex(body, 40)); - PagingTest.log.info("Arriving buffer:" + ServiceTestBase.dumbBytesHex(message2.getBodyBuffer() - .toByteBuffer() - .array(), 40)); + PagingTest.log.info("Expected buffer:" + ActiveMQTestBase.dumbBytesHex(body, 40)); + PagingTest.log.info("Arriving buffer:" + ActiveMQTestBase.dumbBytesHex(message2.getBodyBuffer() + .toByteBuffer() + .array(), 40)); throw e; } } @@ -2587,7 +2572,7 @@ private void internaltestSendReceivePaging(final boolean persistentMessages) thr clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -2601,11 +2586,10 @@ private void internaltestSendReceivePaging(final boolean persistentMessages) thr final int numberOfIntegers = 256; final int numberOfMessages = 1000; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -2689,10 +2673,10 @@ private void internaltestSendReceivePaging(final boolean persistentMessages) thr } catch (AssertionError e) { - PagingTest.log.info("Expected buffer:" + ServiceTestBase.dumbBytesHex(body, 40)); - PagingTest.log.info("Arriving buffer:" + ServiceTestBase.dumbBytesHex(message2.getBodyBuffer() - .toByteBuffer() - .array(), 40)); + PagingTest.log.info("Expected buffer:" + ActiveMQTestBase.dumbBytesHex(body, 40)); + PagingTest.log.info("Arriving buffer:" + ActiveMQTestBase.dumbBytesHex(message2.getBodyBuffer() + .toByteBuffer() + .array(), 40)); throw e; } } @@ -2708,7 +2692,7 @@ private void assertBodiesEqual(final byte[] body, final ActiveMQBuffer buffer) buffer.readBytes(other); - ServiceTestBase.assertEqualsByteArrays(body, other); + ActiveMQTestBase.assertEqualsByteArrays(body, other); } /** @@ -2723,7 +2707,7 @@ public void testDepageDuringTransaction() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -2733,10 +2717,10 @@ public void testDepageDuringTransaction() throws Exception server.start(); - locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -2847,7 +2831,7 @@ public void testDepageDuringTransaction2() throws Exception boolean IS_DURABLE_MESSAGE = true; clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -2857,10 +2841,10 @@ public void testDepageDuringTransaction2() throws Exception server.start(); - locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -2972,7 +2956,7 @@ public void testDepageDuringTransaction3() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -2982,10 +2966,10 @@ public void testDepageDuringTransaction3() throws Exception server.start(); - locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -3080,7 +3064,9 @@ public void testDepageDuringTransaction4() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig() + .setJournalSyncNonTransactional(false) + .setJournalSyncTransactional(false); server = createServer(true, config, @@ -3088,20 +3074,17 @@ public void testDepageDuringTransaction4() throws Exception PagingTest.PAGE_MAX, new HashMap()); - server.getConfiguration().setJournalSyncNonTransactional(false); - server.getConfiguration().setJournalSyncTransactional(false); - server.start(); final AtomicInteger errors = new AtomicInteger(0); final int numberOfMessages = 10000; - locator = createInVMNonHALocator(); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(false); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(false); sf = createSessionFactory(locator); final byte[] body = new byte[MESSAGE_SIZE]; @@ -3194,7 +3177,9 @@ public void testOrderingNonTX() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig() + .setJournalSyncNonTransactional(false) + .setJournalSyncTransactional(false); server = createServer(true, config, @@ -3202,8 +3187,8 @@ public void testOrderingNonTX() throws Exception PagingTest.PAGE_SIZE * 2, new HashMap()); - server.getConfiguration().setJournalSyncNonTransactional(false); - server.getConfiguration().setJournalSyncTransactional(false); + server.getConfiguration(); + server.getConfiguration(); server.start(); @@ -3323,7 +3308,7 @@ public void internalTestPageOnScheduling(final boolean restart) throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -3355,7 +3340,7 @@ public void internalTestPageOnScheduling(final boolean restart) throws Exception for (int j = 0; j < numberOfBytes; j++) { - body[j] = ServiceTestBase.getSamplebyte(j); + body[j] = ActiveMQTestBase.getSamplebyte(j); } long scheduledTime = System.currentTimeMillis() + 5000; @@ -3424,10 +3409,10 @@ public void internalTestPageOnScheduling(final boolean restart) throws Exception } catch (AssertionError e) { - PagingTest.log.info("Expected buffer:" + ServiceTestBase.dumbBytesHex(body, 40)); - PagingTest.log.info("Arriving buffer:" + ServiceTestBase.dumbBytesHex(message2.getBodyBuffer() - .toByteBuffer() - .array(), 40)); + PagingTest.log.info("Expected buffer:" + ActiveMQTestBase.dumbBytesHex(body, 40)); + PagingTest.log.info("Arriving buffer:" + ActiveMQTestBase.dumbBytesHex(message2.getBodyBuffer() + .toByteBuffer() + .array(), 40)); throw e; } } @@ -3442,7 +3427,7 @@ public void testRollbackOnSend() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -3501,7 +3486,7 @@ public void testCommitOnSend() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -3589,7 +3574,7 @@ public void testParialConsume() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -3714,8 +3699,6 @@ public void testDropMessages() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); - HashMap settings = new HashMap(); AddressSettings set = new AddressSettings(); @@ -3723,7 +3706,7 @@ public void testDropMessages() throws Exception settings.put(PagingTest.ADDRESS.toString(), set); - server = createServer(true, config, 1024, 10 * 1024, settings); + server = createServer(true, createDefaultInVMConfig(), 1024, 10 * 1024, settings); server.start(); @@ -3837,8 +3820,6 @@ public void testDropMessagesExpiring() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); - HashMap settings = new HashMap(); AddressSettings set = new AddressSettings(); @@ -3846,7 +3827,7 @@ public void testDropMessagesExpiring() throws Exception settings.put(PagingTest.ADDRESS.toString(), set); - server = createServer(true, config, 1024, 1024 * 1024, settings); + server = createServer(true, createDefaultInVMConfig(), 1024, 1024 * 1024, settings); server.start(); @@ -3922,7 +3903,7 @@ public void onMessage(ClientMessage message1) private void internalTestPageMultipleDestinations(final boolean transacted) throws Exception { - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); final int NUMBER_OF_BINDINGS = 100; @@ -4017,7 +3998,7 @@ private void internalTestPageMultipleDestinations(final boolean transacted) thro @Test public void testSyncPage() throws Exception { - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -4069,7 +4050,7 @@ public void testSyncPage() throws Exception @Test public void testSyncPageTX() throws Exception { - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(true, config, @@ -4104,7 +4085,7 @@ public void testPagingOneDestinationOnly() throws Exception SimpleString PAGED_ADDRESS = new SimpleString("paged"); SimpleString NON_PAGED_ADDRESS = new SimpleString("non-paged"); - Configuration configuration = createDefaultConfig(); + Configuration configuration = createDefaultInVMConfig(); Map addresses = new HashMap(); @@ -4195,7 +4176,7 @@ public void testPagingDifferentSizes() throws Exception SimpleString PAGED_ADDRESS_A = new SimpleString("paged-a"); SimpleString PAGED_ADDRESS_B = new SimpleString("paged-b"); - Configuration configuration = createDefaultConfig(); + Configuration configuration = createDefaultInVMConfig(); Map addresses = new HashMap(); @@ -4316,7 +4297,7 @@ public void testPageAndDepageRapidly() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false) .setJournalFileSize(10 * 1024 * 1024); @@ -4328,11 +4309,10 @@ public void testPageAndDepageRapidly() throws Exception final int numberOfMessages = 200; - locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -4438,7 +4418,7 @@ public void testTwoQueuesDifferentFilters() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -4450,15 +4430,13 @@ public void testTwoQueuesDifferentFilters() throws Exception server.start(); final int numberOfMessages = 200; - locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(120000); - locator.setConnectionTTL(5000000); - locator.setCallTimeout(120000); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(120000) + .setConnectionTTL(5000000) + .setCallTimeout(120000) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); sf = createSessionFactory(locator); @@ -4543,7 +4521,7 @@ public void testTwoQueues() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -4662,7 +4640,7 @@ public void testTwoQueuesAndOneInativeQueue() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -4675,11 +4653,10 @@ public void testTwoQueuesAndOneInativeQueue() throws Exception try { - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(120000); - locator.setConnectionTTL(5000000); - locator.setCallTimeout(120000); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(120000) + .setConnectionTTL(5000000) + .setCallTimeout(120000); locator.setBlockOnNonDurableSend(true); locator.setBlockOnDurableSend(true); @@ -4761,7 +4738,7 @@ public void testTwoQueuesConsumeOneRestart() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -4778,15 +4755,13 @@ public void testTwoQueuesConsumeOneRestart() throws Exception try { - ServerLocator locator = createInVMNonHALocator(); - - locator.setClientFailureCheckPeriod(120000); - locator.setConnectionTTL(5000000); - locator.setCallTimeout(120000); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + ServerLocator locator = createInVMNonHALocator() + .setClientFailureCheckPeriod(120000) + .setConnectionTTL(5000000) + .setCallTimeout(120000) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); ClientSessionFactory sf = locator.createSessionFactory(); @@ -4885,7 +4860,7 @@ public void testDLAOnLargeMessageAndPaging() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setThreadPoolMaxSize(5) .setJournalSyncNonTransactional(false); @@ -5129,7 +5104,7 @@ public void testExpireLargeMessageOnPaging() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setMessageExpiryScanPeriod(500) .setJournalSyncNonTransactional(false); @@ -5148,11 +5123,10 @@ public void testExpireLargeMessageOnPaging() throws Exception try { - ServerLocator locator = createInVMNonHALocator(); - - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); ClientSessionFactory sf = locator.createSessionFactory(); @@ -5297,7 +5271,7 @@ public void testFailMessagesNonDurable() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); HashMap settings = new HashMap(); @@ -5389,7 +5363,7 @@ public void testFailMessagesDurable() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); HashMap settings = new HashMap(); @@ -5473,7 +5447,7 @@ public void testFailMessagesDuplicates() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); HashMap settings = new HashMap(); @@ -5592,7 +5566,7 @@ public void testSpreadMessagesWithFilterWithoutDeadConsumer() throws Exception public void testRouteOnTopWithMultipleQueues() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -5603,12 +5577,11 @@ public void testRouteOnTopWithMultipleQueues() throws Exception server.start(); - ServerLocator locator = createInVMNonHALocator(); - locator.setBlockOnDurableSend(false); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnDurableSend(false); ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, 0); - session.createQueue("Q", "Q1", "dest=1", true); session.createQueue("Q", "Q2", "dest=2", true); session.createQueue("Q", "Q3", "dest=3", true); @@ -5666,7 +5639,7 @@ public void testSpreadMessagesWithFilter(boolean deadConsumer) throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -5868,7 +5841,7 @@ public void testPageHole() throws Throwable { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -5881,8 +5854,8 @@ public void testPageHole() throws Throwable try { - ServerLocator locator = createInVMNonHALocator(); - locator.setBlockOnDurableSend(true); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnDurableSend(true); ClientSessionFactory sf = locator.createSessionFactory(); ClientSession session = sf.createSession(true, true, 0); @@ -5979,7 +5952,7 @@ public void internalTestMultiFilters(boolean browsing) throws Throwable { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -5992,8 +5965,8 @@ public void internalTestMultiFilters(boolean browsing) throws Throwable try { - ServerLocator locator = createInVMNonHALocator(); - locator.setBlockOnDurableSend(true); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnDurableSend(true); ClientSessionFactory sf = locator.createSessionFactory(); ClientSession session = sf.createSession(true, true, 0); @@ -6082,7 +6055,7 @@ public void testPendingACKOutOfOrder() throws Throwable { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -6183,7 +6156,7 @@ public void testPageCompleteWasLive() throws Throwable { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -6267,7 +6240,7 @@ public void testPageCompleteWasLive() throws Throwable @Test public void testNoCursors() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -6312,7 +6285,7 @@ public void testMoveMessages() throws Throwable { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false); server = createServer(true, @@ -6426,9 +6399,9 @@ public void testMoveMessages() throws Throwable @Override - protected Configuration createDefaultConfig() throws Exception + protected Configuration createDefaultInVMConfig() throws Exception { - return super.createDefaultConfig() + return super.createDefaultInVMConfig() .setJournalSyncNonTransactional(false); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java index fa4fb1c1fd1..c7a17c40818 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java @@ -18,21 +18,19 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientProducer; 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.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ProducerCloseTest extends ServiceTestBase +public class ProducerCloseTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -51,7 +49,7 @@ public void testCanNotUseAClosedProducer() throws Exception Assert.assertTrue(producer.isClosed()); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -69,9 +67,7 @@ public void run() throws ActiveMQException public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())) - .setSecurityEnabled(false); + Configuration config = createDefaultInVMConfig(); server = createServer(false, config); server.start(); locator = createInVMNonHALocator(); 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 67074413415..ed0d3db9e64 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 @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; 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; @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -public class ProducerFlowControlTest extends ServiceTestBase +public class ProducerFlowControlTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -273,7 +273,7 @@ public void onMessage(final ClientMessage message) message.getBodyBuffer().readBytes(bytesRead); - ServiceTestBase.assertEqualsByteArrays(bytes, bytesRead); + ActiveMQTestBase.assertEqualsByteArrays(bytes, bytesRead); message.acknowledge(); 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 039c9616823..c3e5a7f9680 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 @@ -34,12 +34,12 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ProducerTest extends ServiceTestBase +public class ProducerTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java index c8170a1b824..19624daa083 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/QueueBrowserTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.client; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; -public class QueueBrowserTest extends ServiceTestBase +public class QueueBrowserTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java index 7bca4d22b3a..e54680208e9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java @@ -34,9 +34,9 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class ReceiveImmediateTest extends ServiceTestBase +public class ReceiveImmediateTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -51,8 +51,7 @@ public class ReceiveImmediateTest extends ServiceTestBase public void setUp() throws Exception { super.setUp(); - - Configuration config = createDefaultConfig(); + Configuration config = createDefaultInVMConfig(); server = createServer(false, config); server.start(); locator = createInVMNonHALocator(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java index 487fde1d01d..ecaa4818adc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java @@ -27,13 +27,13 @@ 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.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ReceiveTest extends ServiceTestBase +public class ReceiveTest extends ActiveMQTestBase { SimpleString addressA = new SimpleString("addressA"); 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 85031fbeafd..91cd81ee941 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 @@ -36,11 +36,11 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; -public class RedeliveryConsumerTest extends ServiceTestBase +public class RedeliveryConsumerTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -351,7 +351,7 @@ public void addPreparedTransaction(PreparedTransactionInfo preparedTransaction) */ private void setUp(final boolean persistDeliveryCountBeforeDelivery) throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setPersistDeliveryCountBeforeDelivery(persistDeliveryCountBeforeDelivery); server = createServer(true, config); @@ -360,7 +360,7 @@ private void setUp(final boolean persistDeliveryCountBeforeDelivery) throws Exce locator = createInVMNonHALocator(); factory = createSessionFactory(locator); - ClientSession session = factory.createSession(false, false, false); + ClientSession session = addClientSession(factory.createSession(false, false, false)); try { session.createQueue(ADDRESS, ADDRESS, true); 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 fea0f95377d..16bae7e0a4e 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 @@ -28,19 +28,17 @@ import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class RequestorTest extends ServiceTestBase +public class RequestorTest extends ActiveMQTestBase { private ActiveMQServer service; @@ -213,9 +211,9 @@ public void run() throws Exception } }; - ServiceTestBase.expectActiveMQException("ClientRequestor's session must not be closed", - ActiveMQExceptionType.OBJECT_CLOSED, - activeMQAction); + ActiveMQTestBase.expectActiveMQException("ClientRequestor's session must not be closed", + ActiveMQExceptionType.OBJECT_CLOSED, + activeMQAction); } @Test @@ -257,8 +255,8 @@ public void run() throws Exception } }; - ServiceTestBase.expectActiveMQException("can not send a request on a closed ClientRequestor", - ActiveMQExceptionType.OBJECT_CLOSED, activeMQAction); + ActiveMQTestBase.expectActiveMQException("can not send a request on a closed ClientRequestor", + ActiveMQExceptionType.OBJECT_CLOSED, activeMQAction); } @Override @@ -266,14 +264,10 @@ public void run() throws Exception public void setUp() throws Exception { super.setUp(); - - Configuration conf = createDefaultConfig() - .addAcceptorConfiguration(TransportConfigurationUtils.getInVMAcceptor(true)); - service = createServer(false, conf); + service = createServer(false, createDefaultInVMConfig()); service.start(); - - locator = createInVMNonHALocator(); - locator.setAckBatchSize(0); + locator = createInVMNonHALocator() + .setAckBatchSize(0); sf = createSessionFactory(locator); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java index f160d717300..636ba3f5905 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RoutingTest.java @@ -23,13 +23,13 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class RoutingTest extends ServiceTestBase +public class RoutingTest extends ActiveMQTestBase { public final SimpleString addressA = new SimpleString("addressA"); public final SimpleString queueA = new SimpleString("queueA"); 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 23814fa8375..90483db37ce 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 @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; 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.Test; -public class SelfExpandingBufferTest extends ServiceTestBase +public class SelfExpandingBufferTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -117,7 +117,7 @@ private void testSelfExpandingBuffer(final boolean netty, final boolean persiste msg2.getBodyBuffer().readBytes(receivedBytes); - ServiceTestBase.assertEqualsByteArrays(bytes, receivedBytes); + ActiveMQTestBase.assertEqualsByteArrays(bytes, receivedBytes); msg2 = cons.receive(3000); @@ -125,7 +125,7 @@ private void testSelfExpandingBuffer(final boolean netty, final boolean persiste msg2.getBodyBuffer().readBytes(receivedBytes); - ServiceTestBase.assertEqualsByteArrays(bytes, receivedBytes); + ActiveMQTestBase.assertEqualsByteArrays(bytes, receivedBytes); } finally { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java index 2fb373f9906..94c36190494 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java @@ -28,11 +28,11 @@ import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; import org.apache.activemq.artemis.core.config.Configuration; 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 ServerLocatorConnectTest extends ServiceTestBase +public class ServerLocatorConnectTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java index debde032d7e..e57bff8c851 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java @@ -21,14 +21,14 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; 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.Assert; import org.junit.Before; import org.junit.Test; import java.lang.ref.WeakReference; -public class SessionCloseOnGCTest extends ServiceTestBase +public class SessionCloseOnGCTest extends ActiveMQTestBase { private ActiveMQServer server; private ServerLocator locator; @@ -69,7 +69,7 @@ public void testValidateFactoryGC1() throws Exception locator.close(); locator = null; - ServiceTestBase.checkWeakReferences(wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); WeakReference fref = new WeakReference(factory); @@ -77,7 +77,7 @@ public void testValidateFactoryGC1() throws Exception factory = null; - ServiceTestBase.checkWeakReferences(fref, wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(fref, wrs1, wrs2); } @Test @@ -102,7 +102,7 @@ public void testValidateFactoryGC2() throws Exception locator.close(); locator = null; - ServiceTestBase.checkWeakReferences(wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); WeakReference fref = new WeakReference(factory); @@ -110,7 +110,7 @@ public void testValidateFactoryGC2() throws Exception factory = null; - ServiceTestBase.checkWeakReferences(fref, wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(fref, wrs1, wrs2); } @Test @@ -133,13 +133,13 @@ public void testValidateFactoryGC3() throws Exception locator.close(); locator = null; - ServiceTestBase.checkWeakReferences(wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); WeakReference fref = new WeakReference(factory); factory = null; - ServiceTestBase.checkWeakReferences(fref, wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(fref, wrs1, wrs2); } @Test @@ -159,13 +159,13 @@ public void testValidateFactoryGC4() throws Exception locator.close(); locator = null; - ServiceTestBase.checkWeakReferences(wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(wrs1, wrs2); WeakReference fref = new WeakReference(factory); factory = null; - ServiceTestBase.checkWeakReferences(fref, wrs1, wrs2); + ActiveMQTestBase.checkWeakReferences(fref, wrs1, wrs2); } @Test @@ -180,7 +180,7 @@ public void testValidateFactoryGC5() throws Exception locator.close(); locator = null; - ServiceTestBase.checkWeakReferences(fref); + ActiveMQTestBase.checkWeakReferences(fref); } @Test @@ -196,7 +196,7 @@ public void testCloseOneSessionOnGC() throws Exception session = null; - ServiceTestBase.checkWeakReferences(wses); + ActiveMQTestBase.checkWeakReferences(wses); Assert.assertEquals(0, sf.numSessions()); Assert.assertEquals(1, sf.numConnections()); @@ -222,7 +222,7 @@ public void testCloseSeveralSessionOnGC() throws Exception session2 = null; session3 = null; - ServiceTestBase.checkWeakReferences(ref1, ref2, ref3); + ActiveMQTestBase.checkWeakReferences(ref1, ref2, ref3); int count = 0; final int TOTAL_SLEEP_TIME = 400; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java index 060d38b5b0f..72eda9c4560 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java @@ -19,18 +19,16 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientProducer; 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.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -39,7 +37,7 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; -public class SessionCloseTest extends ServiceTestBase +public class SessionCloseTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -66,7 +64,7 @@ public void testCanNotUseAClosedSession() throws Exception Assert.assertTrue(session.isClosed()); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -74,7 +72,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -82,7 +80,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -92,7 +90,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -100,7 +98,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -108,7 +106,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -116,7 +114,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -124,7 +122,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -132,7 +130,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -140,7 +138,7 @@ public void run() throws ActiveMQException } }); - ServiceTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() + ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new ActiveMQAction() { public void run() throws ActiveMQException { @@ -161,7 +159,7 @@ public void testCanNotUseXAWithClosedSession() throws Exception Assert.assertTrue(session.isXA()); Assert.assertTrue(session.isClosed()); - ServiceTestBase.expectXAException(XAException.XA_RETRY, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XA_RETRY, new ActiveMQAction() { public void run() throws XAException { @@ -169,7 +167,7 @@ public void run() throws XAException } }); - ServiceTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() { public void run() throws XAException { @@ -177,7 +175,7 @@ public void run() throws XAException } }); - ServiceTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() { public void run() throws XAException { @@ -185,7 +183,7 @@ public void run() throws XAException } }); - ServiceTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() { public void run() throws XAException { @@ -193,7 +191,7 @@ public void run() throws XAException } }); - ServiceTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() { public void run() throws XAException { @@ -201,7 +199,7 @@ public void run() throws XAException } }); - ServiceTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() { public void run() throws XAException { @@ -209,7 +207,7 @@ public void run() throws XAException } }); - ServiceTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() + ActiveMQTestBase.expectXAException(XAException.XAER_RMERR, new ActiveMQAction() { public void run() throws XAException { @@ -249,17 +247,11 @@ public void testCloseHierarchy() throws Exception public void setUp() throws Exception { super.setUp(); - - Configuration config = createDefaultConfig() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())) - .setSecurityEnabled(false); + Configuration config = createDefaultInVMConfig(); server = ActiveMQServers.newActiveMQServer(config, false); - server.start(); - ServerLocator locator = createInVMNonHALocator(); sf = createSessionFactory(locator); - } @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java index 3650e318f83..16ad8b8c366 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java @@ -19,7 +19,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientProducer; import org.apache.activemq.artemis.api.core.client.ClientSession; @@ -29,12 +28,12 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; -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; -public class SessionClosedOnRemotingConnectionFailureTest extends ServiceTestBase +public class SessionClosedOnRemotingConnectionFailureTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -109,12 +108,8 @@ public void testSessionClosedOnRemotingConnectionFailure() throws Exception public void setUp() throws Exception { super.setUp(); - - Configuration config = createDefaultConfig() - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)) - .setSecurityEnabled(false); + Configuration config = createDefaultInVMConfig(); server = createServer(false, config); - server.start(); ServerLocator locator = createInVMNonHALocator(); sf = createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java index 19f4d809481..34f1dcba7dc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateAndDeleteQueueTest.java @@ -26,12 +26,12 @@ import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.impl.LastValueQueue; 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.Before; import org.junit.Test; -public class SessionCreateAndDeleteQueueTest extends ServiceTestBase +public class SessionCreateAndDeleteQueueTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java index aa87a70f180..b1f2ba16533 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateConsumerTest.java @@ -24,12 +24,12 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; 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.Assert; import org.junit.Before; import org.junit.Test; -public class SessionCreateConsumerTest extends ServiceTestBase +public class SessionCreateConsumerTest extends ActiveMQTestBase { private final String queueName = "ClientSessionCreateConsumerTestQ"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java index 714bd247d6a..5db84349f30 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCreateProducerTest.java @@ -21,14 +21,14 @@ import org.apache.activemq.artemis.api.core.client.ClientProducer; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class SessionCreateProducerTest extends ServiceTestBase +public class SessionCreateProducerTest extends ActiveMQTestBase { private ServerLocator locator; private ClientSessionInternal clientSession; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java index b28a558c714..ff87ee3453d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionFactoryTest.java @@ -16,30 +16,27 @@ */ package org.apache.activemq.artemis.tests.integration.client; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; 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.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class SessionFactoryTest extends ServiceTestBase +import java.util.Arrays; + +public class SessionFactoryTest extends ActiveMQTestBase { private final DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration() .setBroadcastEndpointFactory(new UDPBroadcastEndpointFactory() @@ -534,7 +531,7 @@ private void startServer() throws Exception final int localBindPort = 5432; - BroadcastGroupConfiguration bcConfig1 = new BroadcastGroupConfiguration() + BroadcastGroupConfiguration broadcastGroupConfiguration = new BroadcastGroupConfiguration() .setName(bcGroupName) .setBroadcastPeriod(broadcastPeriod) .setConnectorInfos(Arrays.asList(liveTC.getName())) @@ -543,15 +540,10 @@ private void startServer() throws Exception .setGroupPort(getUDPDiscoveryPort()) .setLocalBindPort(localBindPort)); - List bcConfigs1 = new ArrayList(); - bcConfigs1.add(bcConfig1); - - Configuration liveConf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) + Configuration liveConf = createDefaultInVMConfig() .addConnectorConfiguration(liveTC.getName(), liveTC) .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration()) - .setBroadcastGroupConfigurations(bcConfigs1); + .addBroadcastGroupConfiguration(broadcastGroupConfiguration); liveService = createServer(false, liveConf); liveService.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java index 690c51c1be4..1226f0340f8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java @@ -28,12 +28,12 @@ import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler; 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.Assert; import org.junit.Before; import org.junit.Test; -public class SessionSendAcknowledgementHandlerTest extends ServiceTestBase +public class SessionSendAcknowledgementHandlerTest extends ActiveMQTestBase { private ActiveMQServer 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 b68d0db8656..517be410144 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 @@ -34,9 +34,9 @@ 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class SessionStopStartTest extends ServiceTestBase +public class SessionStopStartTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java index 46fa21b05d2..2e3e0afabd5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.core.client.SessionFailureListener; import org.apache.activemq.artemis.tests.util.CountDownSessionFailureListener; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -44,7 +44,7 @@ /** * This test covers the API for ClientSession although XA tests are tested separately. */ -public class SessionTest extends ServiceTestBase +public class SessionTest extends ActiveMQTestBase { private final String queueName = "ClientSessionTestQ"; 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 1ac46ecf1f4..2b8eed77fed 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 @@ -30,9 +30,9 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class SimpleSendMultipleQueuesTest extends ServiceTestBase +public class SimpleSendMultipleQueuesTest extends ActiveMQTestBase { public static final String address = "testaddress"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java index 249c2692310..1f4e84e7910 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java @@ -40,14 +40,14 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; 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.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class SlowConsumerTest extends ServiceTestBase +public class SlowConsumerTest extends ActiveMQTestBase { private boolean isNetty = false; 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 add27249112..46b75a9a516 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 @@ -37,7 +37,7 @@ import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.util.SingleServerTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientProducerImpl; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.protocol.core.Packet; @@ -574,8 +574,8 @@ public void run() throws ActiveMQException } }; - ServiceTestBase.expectActiveMQException("temp queue must not exist after the server detected the client crash", - ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, activeMQAction); + ActiveMQTestBase.expectActiveMQException("temp queue must not exist after the server detected the client crash", + ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, activeMQAction); session.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java index 459152e9e24..18ad8ee9ca2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionDurabilityTest.java @@ -16,24 +16,19 @@ */ package org.apache.activemq.artemis.tests.integration.client; -import org.junit.Test; - -import org.junit.Assert; - import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; 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.ActiveMQClient; 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.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.Assert; +import org.junit.Test; -public class TransactionDurabilityTest extends ServiceTestBase +public class TransactionDurabilityTest extends ActiveMQTestBase { /* @@ -54,27 +49,23 @@ public class TransactionDurabilityTest extends ServiceTestBase @Test public void testRolledBackAcknowledgeWithSameMessageAckedByOtherSession() throws Exception { - Configuration conf = createDefaultConfig(); - final SimpleString testAddress = new SimpleString("testAddress"); final SimpleString queue1 = new SimpleString("queue1"); final SimpleString queue2 = new SimpleString("queue2"); - ActiveMQServer server = createServer(true, conf); + ActiveMQServer server = createServer(true, createDefaultInVMConfig()); server.start(); - ServerLocator locator = - addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration( - ServiceTestBase.INVM_CONNECTOR_FACTORY))); + ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session1 = sf.createSession(false, true, true); + ClientSession session1 = addClientSession(sf.createSession(false, true, true)); - ClientSession session2 = sf.createSession(false, false, false); + ClientSession session2 = addClientSession(sf.createSession(false, false, false)); session1.createQueue(testAddress, queue1, null, true); @@ -120,9 +111,9 @@ public void testRolledBackAcknowledgeWithSameMessageAckedByOtherSession() throws sf = createSessionFactory(locator); - session1 = sf.createSession(false, true, true); + session1 = addClientSession(sf.createSession(false, true, true)); - session2 = sf.createSession(false, true, true); + session2 = addClientSession(sf.createSession(false, true, true)); session1.start(); @@ -152,9 +143,9 @@ public void testRolledBackAcknowledgeWithSameMessageAckedByOtherSession() throws sf = createSessionFactory(locator); - session1 = sf.createSession(false, true, true); + session1 = addClientSession(sf.createSession(false, true, true)); - session2 = sf.createSession(false, true, true); + session2 = addClientSession(sf.createSession(false, true, true)); session1.start(); @@ -179,7 +170,5 @@ public void testRolledBackAcknowledgeWithSameMessageAckedByOtherSession() throws locator.close(); server.stop(); - } - } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java index d5cc9534d60..7d322b308b6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransactionalSendTest.java @@ -23,12 +23,12 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; -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; -public class TransactionalSendTest extends ServiceTestBase +public class TransactionalSendTest extends ActiveMQTestBase { public final SimpleString addressA = new SimpleString("addressA"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java index 3ada09d6069..e562b4860c3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/WildCardRoutingTest.java @@ -16,9 +16,7 @@ */ package org.apache.activemq.artemis.tests.integration.client; -import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -28,18 +26,18 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class WildCardRoutingTest extends ServiceTestBase +public class WildCardRoutingTest extends ActiveMQTestBase { private ActiveMQServer server; private ServerLocator locator; private ClientSession clientSession; - private ClientSessionFactory sessionFactory; + private ClientSessionFactory sf; @Test public void testBasicWildcardRouting() throws Exception @@ -781,45 +779,22 @@ public void testLargeWildcardRouting() throws Exception public void setUp() throws Exception { super.setUp(); - TransportConfiguration transportConfig = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY); - - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setWildcardRoutingEnabled(true) - .setSecurityEnabled(false) - .setTransactionTimeoutScanPeriod(500) - .addAcceptorConfiguration(transportConfig); - + .setTransactionTimeoutScanPeriod(500); server = ActiveMQServers.newActiveMQServer(configuration, false); - // start the server server.start(); server.getManagementService().enableNotifications(false); - // then we create a client as normal locator = createInVMNonHALocator(); - sessionFactory = createSessionFactory(locator); - clientSession = sessionFactory.createSession(false, true, true); + sf = createSessionFactory(locator); + clientSession = addClientSession(sf.createSession(false, true, true)); } @Override @After public void tearDown() throws Exception { - if (clientSession != null) - { - try - { - clientSession.close(); - } - catch (ActiveMQException e1) - { - // - } - } - closeSessionFactory(sessionFactory); stopComponent(server); - closeServerLocator(locator); - locator = null; - server = null; - clientSession = null; super.tearDown(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java index 4baae7c274e..7872dc1f09d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.clientcrash; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Assert; @@ -23,7 +23,7 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; -public abstract class ClientTestBase extends ServiceTestBase +public abstract class ClientTestBase extends ActiveMQTestBase { protected ActiveMQServer server; @@ -34,8 +34,7 @@ public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig(true) - .setSecurityEnabled(false); + Configuration config = createDefaultNettyConfig(); server = createServer(false, config); server.start(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java index 4ef0de99ca6..ab6a434ff84 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java @@ -21,7 +21,7 @@ import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.core.server.impl.InVMNodeManager; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE; @@ -36,7 +36,7 @@ import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.START_LIVE; import static org.apache.activemq.artemis.tests.integration.cluster.NodeManagerAction.STOP_BACKUP; -public class NodeManagerTest extends ServiceTestBase +public class NodeManagerTest extends ActiveMQTestBase { @Test public void testLive() throws Exception diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java index d81abcdfcb7..4ff083f45b4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/RealNodeManagerTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.activemq.artemis.tests.util.SpawnedVMSupport; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; import org.apache.activemq.artemis.utils.UUID; @@ -37,7 +37,7 @@ public void testId() throws Exception UUID id1 = nodeManager.getUUID(); nodeManager.stop(); nodeManager.start(); - ServiceTestBase.assertEqualsByteArrays(id1.asBytes(), nodeManager.getUUID().asBytes()); + ActiveMQTestBase.assertEqualsByteArrays(id1.asBytes(), nodeManager.getUUID().asBytes()); nodeManager.stop(); } 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 74954e2aa5d..f66918440fd 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 @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.BridgeConfiguration; import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; @@ -45,7 +45,7 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class BridgeStartTest extends ServiceTestBase +public class BridgeStartTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "isNetty={0}") 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 219429ad1a5..15a7b0fc2df 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 @@ -52,7 +52,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; 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.apache.activemq.artemis.utils.LinkedListIterator; import org.apache.activemq.artemis.utils.ReusableLatch; import org.junit.Assert; @@ -74,7 +74,7 @@ import java.util.concurrent.atomic.AtomicInteger; @RunWith(value = Parameterized.class) -public class BridgeTest extends ServiceTestBase +public class BridgeTest extends ActiveMQTestBase { private ActiveMQServer server0; @@ -233,7 +233,7 @@ public void internaltestSimpleBridge(final boolean largeMessage, final boolean u if (largeMessage) { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(1024 * 1024)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(1024 * 1024)); } message.putIntProperty(propKey, i); @@ -410,7 +410,7 @@ public boolean intercept(Packet packet, RemotingConnection connection) throws Ac if (largeMessage) { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(1024 * 1024)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(1024 * 1024)); } message.putIntProperty(propKey, i); @@ -595,7 +595,7 @@ public void internalTestWithFilter(final boolean largeMessage, final boolean use if (largeMessage) { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(1024 * 1024)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(1024 * 1024)); } producer0.send(message); @@ -613,7 +613,7 @@ public void internalTestWithFilter(final boolean largeMessage, final boolean use if (largeMessage) { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(1024 * 1024)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(1024 * 1024)); } producer0.send(message); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java index dd542f5f35f..9b2a0daf45a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTestBase.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.tests.util.InVMNodeManagerServer; import org.junit.After; -public abstract class BridgeTestBase extends ServiceTestBase +public abstract class BridgeTestBase extends ActiveMQTestBase { @Override diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java index 1832e368448..ad7cbf9a04d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java @@ -42,14 +42,14 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.cluster.Bridge; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase +public class BridgeWithDiscoveryGroupStartTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "isNetty={0}") 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 e3e63db9a22..ace36cf975a 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 @@ -62,7 +62,7 @@ import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; import org.apache.activemq.artemis.core.server.impl.InVMNodeManager; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -82,7 +82,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -public abstract class ClusterTestBase extends ServiceTestBase +public abstract class ClusterTestBase extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -137,7 +137,7 @@ public void setUp() throws Exception forceGC(); - ServiceTestBase.checkFreePort(ClusterTestBase.PORTS); + ActiveMQTestBase.checkFreePort(ClusterTestBase.PORTS); consumers = new ConsumerHolder[ClusterTestBase.MAX_CONSUMERS]; @@ -186,7 +186,7 @@ public void tearDown() throws Exception super.tearDown(); - ServiceTestBase.checkFreePort(ClusterTestBase.PORTS); + ActiveMQTestBase.checkFreePort(ClusterTestBase.PORTS); } @@ -434,7 +434,7 @@ protected void waitForMessages(final int node, final String address, final int c Thread.sleep(10); } - while (System.currentTimeMillis() - start < ServiceTestBase.WAIT_TIMEOUT); + while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); throw new IllegalStateException("Timed out waiting for messages (messageCount = " + messageCount + ", expecting = " + @@ -443,7 +443,7 @@ protected void waitForMessages(final int node, final String address, final int c protected void waitForServerRestart(final int node) throws Exception { - long waitTimeout = ServiceTestBase.WAIT_TIMEOUT; + long waitTimeout = ActiveMQTestBase.WAIT_TIMEOUT; if (!isSharedStore()) { //it should be greater than @@ -483,7 +483,7 @@ protected void waitForBindings(final int node, throw new IllegalArgumentException("No server at " + node); } - long timeout = ServiceTestBase.WAIT_TIMEOUT; + long timeout = ActiveMQTestBase.WAIT_TIMEOUT; if (waitForBindings(server, address, local, expectedBindingCount, expectedConsumerCount, timeout)) @@ -662,7 +662,7 @@ protected void addConsumer(final int consumerID, final int node, final String qu { // Proxy the failure and print a dump into System.out, so it is captured by Jenkins reports e.printStackTrace(); - System.out.println(ServiceTestBase.threadDump(" - fired by ClusterTestBase::addConsumer")); + System.out.println(ActiveMQTestBase.threadDump(" - fired by ClusterTestBase::addConsumer")); throw e; } @@ -1540,7 +1540,7 @@ protected void setupSessionFactory(final int node, final boolean netty, boolean if (netty) { - serverTotc = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY, params); + serverTotc = new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY, params); } else { @@ -1581,7 +1581,7 @@ protected void setupSessionFactory(final int node, final boolean netty, int reco if (netty) { - serverTotc = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY, params); + serverTotc = new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY, params); } else { @@ -2024,14 +2024,14 @@ protected void setupClusterConnection(final String name, serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); pairs.add(serverTotc.getName()); } - Configuration conf = serverFrom.getConfiguration(); + Configuration config = serverFrom.getConfiguration(); ClusterConnectionConfiguration clusterConf = createClusterConfig(name, address, forwardWhenNoConsumers, maxHops, connectorFrom, pairs); - conf.getClusterConfigurations().add(clusterConf); + config.getClusterConfigurations().add(clusterConf); } protected void setupClusterConnection(final String name, @@ -2061,7 +2061,7 @@ protected void setupClusterConnection(final String name, serverFrom.getConfiguration().getConnectorConfigurations().put(serverTotc.getName(), serverTotc); pairs.add(serverTotc.getName()); } - Configuration conf = serverFrom.getConfiguration(); + Configuration config = serverFrom.getConfiguration(); ClusterConnectionConfiguration clusterConf = new ClusterConnectionConfiguration() .setName(name) @@ -2076,7 +2076,7 @@ protected void setupClusterConnection(final String name, .setConfirmationWindowSize(1024) .setStaticConnectors(pairs); - conf.getClusterConfigurations().add(clusterConf); + config.getClusterConfigurations().add(clusterConf); } private ClusterConnectionConfiguration createClusterConfig(final String name, final String address, @@ -2151,7 +2151,7 @@ protected void setupDiscoveryClusterConnection(final String name, TransportConfiguration connectorConfig = createTransportConfiguration(netty, false, generateParams(node, netty)); server.getConfiguration().getConnectorConfigurations().put(name, connectorConfig); - Configuration conf = server.getConfiguration(); + Configuration config = server.getConfiguration(); ClusterConnectionConfiguration clusterConf = new ClusterConnectionConfiguration() .setName(name) .setAddress(address) @@ -2162,7 +2162,7 @@ protected void setupDiscoveryClusterConnection(final String name, .setMaxHops(maxHops) .setConfirmationWindowSize(1024) .setDiscoveryGroupName(discoveryGroupName); - List clusterConfs = conf.getClusterConfigurations(); + List clusterConfs = config.getClusterConfigurations(); clusterConfs.add(clusterConf); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java index f117f76dd0e..42b76098ea7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.cluster.distribution; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; @@ -34,9 +34,9 @@ public class MessageRedistributionWithDiscoveryTest extends ClusterTestBase { - protected final String groupAddress = ServiceTestBase.getUDPDiscoveryAddress(); + protected final String groupAddress = ActiveMQTestBase.getUDPDiscoveryAddress(); - protected final int groupPort = ServiceTestBase.getUDPDiscoveryPort(); + protected final int groupPort = ActiveMQTestBase.getUDPDiscoveryPort(); protected boolean isNetty() { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java index 71c83c0ba4b..02f4dbf598f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.integration.cluster.distribution; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -153,7 +153,7 @@ public void testStopAllStartAll() throws Throwable } catch (Throwable e) { - System.out.println(ServiceTestBase.threadDump("SymmetricClusterTest::testStopAllStartAll")); + System.out.println(ActiveMQTestBase.threadDump("SymmetricClusterTest::testStopAllStartAll")); throw e; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java index cd1d35cfa33..79deac387d3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java @@ -18,7 +18,7 @@ import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; public class SymmetricClusterWithBackupTest extends SymmetricClusterTest @@ -121,7 +121,7 @@ public void testStopAllStartAll() throws Throwable } catch (Throwable e) { - System.out.println(ServiceTestBase.threadDump("SymmetricClusterWithBackupTest::testStopAllStartAll")); + System.out.println(ActiveMQTestBase.threadDump("SymmetricClusterWithBackupTest::testStopAllStartAll")); throw e; } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java index eee7afaf2a4..b38c518c014 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java @@ -18,15 +18,15 @@ import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; public class SymmetricClusterWithDiscoveryTest extends SymmetricClusterTest { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - protected final String groupAddress = ServiceTestBase.getUDPDiscoveryAddress(); + protected final String groupAddress = ActiveMQTestBase.getUDPDiscoveryAddress(); - protected final int groupPort = ServiceTestBase.getUDPDiscoveryPort(); + protected final int groupPort = ActiveMQTestBase.getUDPDiscoveryPort(); protected boolean isNetty() { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java index d25195450a9..7dfa3d43168 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java @@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +47,7 @@ import java.util.Set; @RunWith(value = Parameterized.class) -public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase +public class AutomaticColocatedQuorumVoteTest extends ActiveMQTestBase { private final boolean replicated; @@ -309,7 +309,7 @@ private ActiveMQServer createServer(int node, int remoteNode, boolean scaleDown) private Configuration getConfiguration(String identity, boolean scaleDown, TransportConfiguration liveConnector, TransportConfiguration liveAcceptor, TransportConfiguration... otherLiveNodes) throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(liveAcceptor) .addConnectorConfiguration(liveConnector.getName(), liveConnector) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java index 386c306e328..72325a06aa8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java @@ -18,7 +18,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.io.File; @@ -130,7 +130,7 @@ public void testBackupStartsWhenLiveIsReceivingLargeMessage() throws Exception final ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS); final ClientMessage message = session.createMessage(true); final int largeMessageSize = 1000 * MIN_LARGE_MESSAGE; - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(largeMessageSize)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(largeMessageSize)); final AtomicBoolean caughtException = new AtomicBoolean(false); final CountDownLatch latch = new CountDownLatch(1); @@ -162,7 +162,7 @@ public void run() Executors.defaultThreadFactory().newThread(r).start(); waitForLatch(latch); startBackupFinishSyncing(); - ServiceTestBase.waitForLatch(latch2); + ActiveMQTestBase.waitForLatch(latch2); crash(session); assertFalse("no exceptions while sending message", caughtException.get()); @@ -174,7 +174,7 @@ public void run() for (int j = 0; j < largeMessageSize; j++) { Assert.assertTrue("large msg , expecting " + largeMessageSize + " bytes, got " + j, buffer.readable()); - Assert.assertEquals("equal at " + j, ServiceTestBase.getSamplebyte(j), buffer.readByte()); + Assert.assertEquals("equal at " + j, ActiveMQTestBase.getSamplebyte(j), buffer.readByte()); } receiveMessages(consumer, 0, 20, true); assertNull("there should be no more messages!", consumer.receiveImmediate()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java index 4d781c6660f..608d0603ebc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackAutoTest.java @@ -260,10 +260,9 @@ protected void createConfigs() throws Exception TransportConfiguration liveConnector = getConnectorTransportConfiguration(true); TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); - backupConfig = super.createDefaultConfig() + backupConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(false)) - .setSecurityEnabled(false) .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration() .setFailbackDelay(1000) .setRestartBackup(true)) @@ -273,10 +272,9 @@ protected void createConfigs() throws Exception backupServer = createTestableServer(backupConfig); - liveConfig = super.createDefaultConfig() + liveConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true)) - .setSecurityEnabled(false) .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration() .setFailbackDelay(100)) .addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName(), backupConnector.getName())) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java index 9ac925ee229..d28598a03ed 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java @@ -112,10 +112,9 @@ protected void createConfigs() throws Exception TransportConfiguration liveConnector = getConnectorTransportConfiguration(true); TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); - backupConfig = super.createDefaultConfig() + backupConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(false)) - .setSecurityEnabled(false) .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration() .setAllowFailBack(false)) .addConnectorConfiguration(liveConnector.getName(), liveConnector) @@ -124,10 +123,9 @@ protected void createConfigs() throws Exception backupServer = createTestableServer(backupConfig); - liveConfig = super.createDefaultConfig() + liveConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true)) - .setSecurityEnabled(false) .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration()) .addConnectorConfiguration(liveConnector.getName(), liveConnector) .addConnectorConfiguration(backupConnector.getName(), backupConnector) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java index 3e30ff94a99..89162cdba52 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverListenerTest.java @@ -200,10 +200,9 @@ protected void createConfigs() throws Exception TransportConfiguration liveConnector = getConnectorTransportConfiguration(true); TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); - backupConfig = super.createDefaultConfig() + backupConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(false)) - .setSecurityEnabled(false) .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration() .setFailbackDelay(1000)) .addConnectorConfiguration(liveConnector.getName(), liveConnector) @@ -212,10 +211,9 @@ protected void createConfigs() throws Exception backupServer = createTestableServer(backupConfig); - liveConfig = super.createDefaultConfig() + liveConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true)) - .setSecurityEnabled(false) .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration() .setFailbackDelay(1000)) .addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName(), backupConnector.getName())) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java index fbc6cd0e125..b6a4b7fb43a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java @@ -41,7 +41,7 @@ import org.apache.activemq.artemis.tests.integration.cluster.util.SameProcessActiveMQServer; import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer; import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -53,7 +53,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public abstract class FailoverTestBase extends ServiceTestBase +public abstract class FailoverTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -142,7 +142,7 @@ protected static void setLargeMessageBody(final int i, final ClientMessage messa { try { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(LARGE_MESSAGE_SIZE)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(LARGE_MESSAGE_SIZE)); } catch (Exception e) { @@ -163,7 +163,7 @@ protected static void assertLargeMessageBody(final int i, final ClientMessage me for (int j = 0; j < LARGE_MESSAGE_SIZE; j++) { Assert.assertTrue("msg " + i + ", expecting " + LARGE_MESSAGE_SIZE + " bytes, got " + j, buffer.readable()); - Assert.assertEquals("equal at " + j, ServiceTestBase.getSamplebyte(j), buffer.readByte()); + Assert.assertEquals("equal at " + j, ActiveMQTestBase.getSamplebyte(j), buffer.readByte()); } } @@ -173,7 +173,7 @@ protected void createConfigs() throws Exception TransportConfiguration liveConnector = getConnectorTransportConfiguration(true); TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); - backupConfig = super.createDefaultConfig() + backupConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(false)) .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration() @@ -184,7 +184,7 @@ protected void createConfigs() throws Exception backupServer = createTestableServer(backupConfig); - liveConfig = super.createDefaultConfig() + liveConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true)) .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration() @@ -201,8 +201,8 @@ protected void createReplicatedConfigs() throws Exception final TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); final TransportConfiguration backupAcceptor = getAcceptorTransportConfiguration(false); - backupConfig = createDefaultConfig(); - liveConfig = createDefaultConfig(); + backupConfig = createDefaultInVMConfig(); + liveConfig = createDefaultInVMConfig(); ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, null); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java index 5c2b660d996..4def2018f0d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/GroupingFailoverTestBase.java @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivation; import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; public abstract class GroupingFailoverTestBase extends ClusterTestBase @@ -129,7 +129,7 @@ public void waitForBackupTopologyAnnouncement(ClientSessionFactory sf) throws Ex Thread.sleep(10); } - while (System.currentTimeMillis() - start < ServiceTestBase.WAIT_TIMEOUT); + while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); throw new IllegalStateException("Timed out waiting for backup announce"); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java index ed99b57722b..1eee9d5b444 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java @@ -32,7 +32,6 @@ import org.junit.Assert; import org.junit.Test; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -57,7 +56,7 @@ protected void createConfigs() throws Exception TransportConfiguration liveConnector0 = getConnectorTransportConfiguration(true, 0); TransportConfiguration liveConnector1 = getConnectorTransportConfiguration(true, 1); - backupConfig = super.createDefaultConfig(1, new HashMap(), INVM_ACCEPTOR_FACTORY) + backupConfig = super.createDefaultInVMConfig(1) .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true, 1)) .setHAPolicyConfiguration(new ColocatedPolicyConfiguration() @@ -73,7 +72,7 @@ protected void createConfigs() throws Exception backupServer = createColocatedTestableServer(backupConfig, nodeManager1, nodeManager0, 1); - liveConfig = super.createDefaultConfig(0, new HashMap(), INVM_ACCEPTOR_FACTORY) + liveConfig = super.createDefaultInVMConfig(0) .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true, 0)) .setHAPolicyConfiguration(new ColocatedPolicyConfiguration() diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java index a9449dc3db2..c0798cefa23 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java @@ -29,14 +29,14 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; import org.junit.Assert; -public abstract class MultipleBackupsFailoverTestBase extends ServiceTestBase +public abstract class MultipleBackupsFailoverTestBase extends ActiveMQTestBase { IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java index 3c6c2d73a20..ead625b694d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java @@ -156,10 +156,9 @@ protected void createBackupConfig(NodeManager nodeManager, int[] otherBackupNodes, int... otherClusterNodes) throws Exception { - Configuration config1 = super.createDefaultConfig() + Configuration config1 = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(nodeid, isNetty()))) - .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicaPolicyConfiguration()) .setBindingsDirectory(getBindingsDir() + "_" + liveNode) .setJournalDirectory(getJournalDir() + "_" + liveNode) @@ -191,10 +190,9 @@ protected void createLiveConfig(NodeManager nodeManager, int liveNode, int... ot { TransportConfiguration liveConnector = createTransportConfiguration(isNetty(), false,generateParams(liveNode, isNetty())); - Configuration config0 = super.createDefaultConfig() + Configuration config0 = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(liveNode, isNetty()))) - .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration()) .setBindingsDirectory(getBindingsDir() + "_" + liveNode) .setJournalDirectory(getJournalDir() + "_" + liveNode) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java index f4ca1c6a7f3..67d29191d54 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.cluster.util.TestableServer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.HAPolicyConfiguration; @@ -43,7 +43,7 @@ import org.junit.After; import org.junit.Before; -public abstract class MultipleServerFailoverTestBase extends ServiceTestBase +public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -65,7 +65,7 @@ public abstract class MultipleServerFailoverTestBase extends ServiceTestBase public abstract int getBackupServerCount(); - public abstract boolean useNetty(); + public abstract boolean isNetty(); public abstract boolean isSharedStore(); @@ -99,7 +99,7 @@ public void setUp() throws Exception } } - Configuration configuration = createDefaultConfig(useNetty()) + Configuration configuration = createDefaultConfig(isNetty()) .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true, i)) .setHAPolicyConfiguration(haPolicyConfiguration); @@ -157,7 +157,7 @@ public void setUp() throws Exception } } - Configuration configuration = createDefaultConfig(useNetty()) + Configuration configuration = createDefaultConfig(isNetty()) .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(false, i)) .setHAPolicyConfiguration(haPolicyConfiguration); @@ -243,7 +243,7 @@ public void tearDown() throws Exception protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live, int node) { TransportConfiguration transportConfiguration; - if (useNetty()) + if (isNetty()) { transportConfiguration = TransportConfigurationUtils.getNettyAcceptor(live, node, (live ? "live-" : "backup-") + node); } @@ -257,7 +257,7 @@ protected TransportConfiguration getAcceptorTransportConfiguration(final boolean protected TransportConfiguration getConnectorTransportConfiguration(final boolean live, int node) { TransportConfiguration transportConfiguration; - if (useNetty()) + if (isNetty()) { transportConfiguration = TransportConfigurationUtils.getNettyConnector(live, node, (live ? "live-" : "backup-") + node); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java index 93d3f17bc8a..894e217d49c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumVoteServerConnectTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.integration.cluster.failover; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.cluster.qourum.BooleanVote; import org.apache.activemq.artemis.core.server.cluster.qourum.QuorumVoteServerConnect; import org.apache.activemq.artemis.tests.integration.server.FakeStorageManager; @@ -29,7 +29,7 @@ import java.util.Collection; @RunWith(Parameterized.class) -public class QuorumVoteServerConnectTest extends ServiceTestBase +public class QuorumVoteServerConnectTest extends ActiveMQTestBase { private final int size; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java index f49fde9317b..7554c6165d2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverTest.java @@ -162,7 +162,7 @@ public int getBackupServerCount() } @Override - public boolean useNetty() + public boolean isNetty() { return false; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java index 6803d318112..5636e6c02c5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java @@ -94,7 +94,7 @@ protected void createConfigs() throws Exception TransportConfiguration liveConnector = getConnectorTransportConfiguration(true); TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); - backupConfig = super.createDefaultConfig() + backupConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(false)) .setSecurityEnabled(true) @@ -108,7 +108,7 @@ protected void createConfigs() throws Exception ActiveMQSecurityManagerImpl securityManager = installSecurity(backupServer); securityManager.getConfiguration().setDefaultUser(null); - liveConfig = super.createDefaultConfig() + liveConfig = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(getAcceptorTransportConfiguration(true)) .setSecurityEnabled(true) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java index efed08058c6..c1b04e01956 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java @@ -133,10 +133,9 @@ protected void createBackupConfig(int liveNode, int nodeid, int... nodes) throws { TransportConfiguration backupConnector = createTransportConfiguration(isNetty(), false, generateParams(nodeid, isNetty())); - Configuration config1 = super.createDefaultConfig() + Configuration config1 = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(nodeid, isNetty()))) - .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicatedPolicyConfiguration()) .addConnectorConfiguration(backupConnector.getName(), backupConnector) .setBindingsDirectory(getBindingsDir() + "_" + liveNode) @@ -160,10 +159,9 @@ protected void createLiveConfig(int liveNode) throws Exception { TransportConfiguration liveConnector = createTransportConfiguration(isNetty(), false, generateParams(liveNode, isNetty())); - Configuration config0 = super.createDefaultConfig() + Configuration config0 = super.createDefaultInVMConfig() .clearAcceptorConfigurations() .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(liveNode, isNetty()))) - .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration()) .addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName())) .addConnectorConfiguration(liveConnector.getName(), liveConnector) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java index edeebac5cf9..9db54753657 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.cluster.reattach; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.core.config.Configuration; @@ -29,9 +28,7 @@ public class MultiThreadRandomReattachTest extends MultiThreadRandomReattachTest @Override protected void start() throws Exception { - Configuration liveConf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); + Configuration liveConf = createDefaultInVMConfig(); liveServer = createServer(false, liveConf); liveServer.start(); waitForServer(liveServer); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java index 65fb198239e..8be4b8c66ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.integration.cluster.reattach; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -1277,7 +1277,7 @@ public void setUp() throws Exception @After public void tearDown() throws Exception { - ServiceTestBase.stopComponent(liveServer); + ActiveMQTestBase.stopComponent(liveServer); liveServer = null; @@ -1317,7 +1317,7 @@ protected ServerLocator createLocator() throws Exception @Override protected void stop() throws Exception { - ServiceTestBase.stopComponent(liveServer); + ActiveMQTestBase.stopComponent(liveServer); System.gc(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java index cb6c3ada16f..0614403ef24 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.protocol.core.impl.RemotingConnectionImpl; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -35,7 +35,7 @@ import java.util.Timer; import java.util.TimerTask; -public abstract class MultiThreadReattachSupportTestBase extends ServiceTestBase +public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBase { private final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -120,8 +120,8 @@ public void run() // Case a failure happened here, it should print the Thread dump // Sending it to System.out, as it would show on the Tests report - System.out.println(ServiceTestBase.threadDump(" - fired by MultiThreadRandomReattachTestBase::runTestMultipleThreads (" + t.getLocalizedMessage() + - ")")); + System.out.println(ActiveMQTestBase.threadDump(" - fired by MultiThreadRandomReattachTestBase::runTestMultipleThreads (" + t.getLocalizedMessage() + + ")")); } } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java index 65fe58b0b47..937903828e9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.cluster.reattach; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.config.Configuration; @@ -25,11 +24,7 @@ public class NettyMultiThreadRandomReattachTest extends MultiThreadRandomReattac @Override protected void start() throws Exception { - Configuration liveConf = createDefaultConfig() - .setJMXManagementEnabled(false) - .setSecurityEnabled(false) - .clearAcceptorConfigurations() - .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY)); + Configuration liveConf = createDefaultNettyConfig(); liveServer = createServer(false, liveConf); liveServer.start(); waitForServer(liveServer); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java index 8883fe5847a..4c99bbaa2d7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java @@ -40,9 +40,9 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class OrderReattachTest extends ServiceTestBase +public class OrderReattachTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java index bc573c4ea21..0291ea1d107 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java @@ -36,7 +36,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -50,7 +50,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class RandomReattachTest extends ServiceTestBase +public class RandomReattachTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -249,7 +249,7 @@ public void runTest(final RunnableT runnable) throws Exception { RandomReattachTest.log.info("####" + getName() + " iteration #" + its); start(); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY)); locator.setReconnectAttempts(-1); locator.setConfirmationWindowSize(1024 * 1024); @@ -1493,9 +1493,7 @@ private Failer startFailer(final long time, final ClientSession session) private void start() throws Exception { - Configuration liveConf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory")); + Configuration liveConf = createDefaultInVMConfig(); liveService = ActiveMQServers.newActiveMQServer(liveConf, false); liveService.start(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java index 4182a0a1f42..efe3bfa5598 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.core.client.SessionFailureListener; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.protocol.core.Packet; @@ -49,7 +49,7 @@ import org.junit.Before; import org.junit.Test; -public class ReattachTest extends ServiceTestBase +public class ReattachTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java index 0ad26c4919d..3ad9f09f605 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/HAClientTopologyTest.java @@ -19,7 +19,7 @@ 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.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; public class HAClientTopologyTest extends TopologyClusterTestBase { @@ -57,7 +57,7 @@ protected void setupServers() throws Exception @Override protected ServerLocator createHAServerLocator() { - TransportConfiguration tc = ServiceTestBase.createTransportConfiguration(isNetty(), false, ServiceTestBase.generateParams(0, isNetty())); + TransportConfiguration tc = ActiveMQTestBase.createTransportConfiguration(isNetty(), false, ActiveMQTestBase.generateParams(0, isNetty())); ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithHA(tc)); locator.setBlockOnNonDurableSend(true); locator.setBlockOnDurableSend(true); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java index e27e1034c8a..893b3afdeed 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/IsolatedTopologyTest.java @@ -23,7 +23,7 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; 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.Assert; import org.junit.Test; @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; -public class IsolatedTopologyTest extends ServiceTestBase +public class IsolatedTopologyTest extends ActiveMQTestBase { @Test @@ -108,7 +108,7 @@ private ActiveMQServer createServer1() throws Exception params.put(TransportConstants.CLUSTER_CONNECTION, "cc1"); params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "1"); - TransportConfiguration acceptor1VM1 = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, + TransportConfiguration acceptor1VM1 = new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, params, "acceptor-cc1"); @@ -116,7 +116,7 @@ private ActiveMQServer createServer1() throws Exception params.put(TransportConstants.CLUSTER_CONNECTION, "cc2"); params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "2"); - TransportConfiguration acceptor2VM1 = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, + TransportConfiguration acceptor2VM1 = new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, params, "acceptor-cc2"); @@ -145,7 +145,7 @@ private ActiveMQServer createServer1() throws Exception // Server1 with two acceptors, each acceptor on a different cluster connection // talking to a different connector. // i.e. two cluster connections isolated on the same node - Configuration config1 = createBasicConfig(0) + Configuration config1 = createBasicConfig(1) .addConnectorConfiguration("local-cc1", createInVMTransportConnectorConfig(1, "local-cc1")) .addConnectorConfiguration("local-cc2", createInVMTransportConnectorConfig(2, "local-cc2")) .addConnectorConfiguration("other-cc1", createInVMTransportConnectorConfig(3, "other-cc1")) @@ -165,7 +165,7 @@ private ActiveMQServer createServer2() throws Exception params.put(TransportConstants.CLUSTER_CONNECTION, "cc1"); params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "3"); - TransportConfiguration acceptor1VM1 = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, + TransportConfiguration acceptor1VM1 = new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, params, "acceptor-cc1"); @@ -173,7 +173,7 @@ private ActiveMQServer createServer2() throws Exception params.put(TransportConstants.CLUSTER_CONNECTION, "cc2"); params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, "4"); - TransportConfiguration acceptor2VM1 = new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, + TransportConfiguration acceptor2VM1 = new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, params, "acceptor-cc2"); @@ -199,10 +199,10 @@ private ActiveMQServer createServer2() throws Exception .setConfirmationWindowSize(1024) .setStaticConnectors(connectTo2); - // Server1 with two acceptors, each acceptor on a different cluster connection + // Server2 with two acceptors, each acceptor on a different cluster connection // talking to a different connector. // i.e. two cluster connections isolated on the same node - Configuration config1 = createBasicConfig(3) + Configuration config1 = createBasicConfig(2) .addAcceptorConfiguration(acceptor1VM1) .addAcceptorConfiguration(acceptor2VM1) .addConnectorConfiguration("local-cc1", createInVMTransportConnectorConfig(3, "local-cc1")) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java index df305f6ac93..544993fafb4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/NonHATopologyTest.java @@ -30,7 +30,7 @@ import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; /** * I have added this test to help validate if the connectors from Recovery will be @@ -38,7 +38,7 @@ * * Created to verify HORNETQ-913 / AS7-4548 */ -public class NonHATopologyTest extends ServiceTestBase +public class NonHATopologyTest extends ActiveMQTestBase { @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java index 54c37342083..e5c87a51a8b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/topology/TopologyClusterTestBase.java @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase; 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.After; import org.junit.Assert; import org.junit.Before; @@ -224,7 +224,7 @@ protected void waitForClusterConnections(final int node, final int expected) thr Thread.sleep(10); } - while (System.currentTimeMillis() - start < ServiceTestBase.WAIT_TIMEOUT); + while (System.currentTimeMillis() - start < ActiveMQTestBase.WAIT_TIMEOUT); log.error(clusterDescription(servers[node])); Assert.assertEquals("Timed out waiting for cluster connections for server " + node, expected, nodesCount); @@ -395,7 +395,7 @@ public void testWrongPasswordTriggersClusterConnectionStop() throws Exception s.getConfiguration().setSecurityEnabled(true); } } - Assert.assertEquals(ServiceTestBase.CLUSTER_PASSWORD, config.getClusterPassword()); + Assert.assertEquals(ActiveMQTestBase.CLUSTER_PASSWORD, config.getClusterPassword()); config.setClusterPassword(config.getClusterPassword() + "-1-2-3-"); startServers(0, 1, 2, 4, 3); int n = 0; @@ -411,7 +411,7 @@ public void testWrongPasswordTriggersClusterConnectionStop() throws Exception final String address = "foo1235"; ServerLocator locator = createNonHALocator(isNetty()); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(config.getClusterUser(), ServiceTestBase.CLUSTER_PASSWORD, false, true, true, false, 1); + ClientSession session = sf.createSession(config.getClusterUser(), ActiveMQTestBase.CLUSTER_PASSWORD, false, true, true, false, 1); session.createQueue(address, address, true); ClientProducer producer = session.createProducer(address); sendMessages(session, producer, 100); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java index 1b20beea7b9..0489173bc3a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.cluster.util; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; @@ -36,7 +36,7 @@ import org.apache.activemq.artemis.core.server.NodeManager; import org.apache.activemq.artemis.core.server.impl.InVMNodeManager; -public class MultiServerTestBase extends ServiceTestBase +public class MultiServerTestBase extends ActiveMQTestBase { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java index 0cc4e4ce3aa..993d2ecc293 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.cluster.DiscoveryEntry; import org.apache.activemq.artemis.core.cluster.DiscoveryGroup; import org.apache.activemq.artemis.core.cluster.DiscoveryListener; @@ -39,7 +39,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Assert; -public class DiscoveryBaseTest extends ServiceTestBase +public class DiscoveryBaseTest extends ActiveMQTestBase { protected static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java index 786823730e7..7a6b12f141f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java @@ -16,9 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.divert; -import java.util.ArrayList; -import java.util.List; - import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; @@ -32,18 +29,17 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; -public class DivertTest extends ServiceTestBase +public class DivertTest extends ActiveMQTestBase { private static final int TIMEOUT = 500; @Test public void testSingleNonExclusiveDivert() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress = "forwardAddress"; @@ -54,15 +50,12 @@ public void testSingleNonExclusiveDivert() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf); - - conf.setDivertConfigurations(divertConfs); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); @@ -124,31 +117,20 @@ public void testSingleNonExclusiveDivert() throws Exception } Assert.assertNull(consumer2.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testSingleDivertWithExpiry() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress = "forwardAddress"; final String expiryAddress = "expiryAddress"; - conf.getAddressesSettings().clear(); - - AddressSettings expirySettings = new AddressSettings(); - expirySettings.setExpiryAddress(new SimpleString(expiryAddress)); - - conf.getAddressesSettings().put("#", expirySettings); + AddressSettings expirySettings = new AddressSettings() + .setExpiryAddress(new SimpleString(expiryAddress)); DivertConfiguration divertConf = new DivertConfiguration() .setName("divert1") @@ -156,16 +138,14 @@ public void testSingleDivertWithExpiry() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf) + .clearAddressesSettings() + .addAddressesSetting("#", expirySettings); - conf.setDivertConfigurations(divertConfs); - - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, true)); - - messagingService.start(); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true)); + server.start(); ServerLocator locator = createInVMNonHALocator(); @@ -263,18 +243,11 @@ else if (message.getStringProperty(MessageImpl.HDR_ORIGINAL_QUEUE).equals("queue assertEquals(numMessages, countOriginal1); assertEquals(numMessages, countOriginal2); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testSingleNonExclusiveDivert2() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress = "forwardAddress"; @@ -285,15 +258,12 @@ public void testSingleNonExclusiveDivert2() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf); - conf.setDivertConfigurations(divertConfs); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); @@ -393,18 +363,11 @@ public void testSingleNonExclusiveDivert2() throws Exception } Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testSingleNonExclusiveDivert3() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress = "forwardAddress"; @@ -415,15 +378,12 @@ public void testSingleNonExclusiveDivert3() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf); - - conf.setDivertConfigurations(divertConfs); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); @@ -465,18 +425,11 @@ public void testSingleNonExclusiveDivert3() throws Exception } Assert.assertNull(consumer1.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testSingleExclusiveDivert() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress = "forwardAddress"; @@ -488,15 +441,12 @@ public void testSingleExclusiveDivert() throws Exception .setForwardingAddress(forwardAddress) .setExclusive(true); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf); - conf.setDivertConfigurations(divertConfs); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); @@ -560,19 +510,11 @@ public void testSingleExclusiveDivert() throws Exception Assert.assertNull(consumer3.receiveImmediate()); Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testMultipleNonExclusiveDivert() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -597,17 +539,14 @@ public void testMultipleNonExclusiveDivert() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - conf.setDivertConfigurations(divertConfs); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); @@ -706,18 +645,11 @@ public void testMultipleNonExclusiveDivert() throws Exception } Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testMultipleExclusiveDivert() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -745,19 +677,17 @@ public void testMultipleExclusiveDivert() throws Exception .setForwardingAddress(forwardAddress3) .setExclusive(true); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - conf.setDivertConfigurations(divertConfs); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -843,19 +773,11 @@ public void testMultipleExclusiveDivert() throws Exception Assert.assertNull(consumer3.receiveImmediate()); Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testMixExclusiveAndNonExclusiveDiverts() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -882,17 +804,14 @@ public void testMixExclusiveAndNonExclusiveDiverts() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - conf.setDivertConfigurations(divertConfs); - - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); @@ -969,19 +888,12 @@ public void testMixExclusiveAndNonExclusiveDiverts() throws Exception Assert.assertNull(consumer3.receiveImmediate()); Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } // If no exclusive diverts match then non exclusive ones should be called @Test public void testSingleExclusiveNonMatchingAndNonExclusiveDiverts() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -1010,19 +922,17 @@ public void testSingleExclusiveNonMatchingAndNonExclusiveDiverts() throws Except .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - conf.setDivertConfigurations(divertConfs); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1151,18 +1061,11 @@ public void testSingleExclusiveNonMatchingAndNonExclusiveDiverts() throws Except Assert.assertNull(consumer3.receiveImmediate()); Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testRoundRobinDiverts() throws Exception { - Configuration conf = createDefaultConfig(); final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -1187,19 +1090,17 @@ public void testRoundRobinDiverts() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - conf.setDivertConfigurations(divertConfs); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - - messagingService.start(); + server.start(); ServerLocator locator = createInVMNonHALocator(); + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1304,19 +1205,11 @@ public void testRoundRobinDiverts() throws Exception } Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } @Test public void testDeployDivertsSameUniqueName() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -1341,21 +1234,19 @@ public void testDeployDivertsSameUniqueName() throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); - - conf.setDivertConfigurations(divertConfs); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); - messagingService.start(); + server.start(); // Only the first and third should be deployed ServerLocator locator = createInVMNonHALocator(); + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -1441,12 +1332,6 @@ public void testDeployDivertsSameUniqueName() throws Exception } Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); - - messagingService.stop(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java index fa3d0764624..62a19143dd5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/PersistentDivertTest.java @@ -28,14 +28,11 @@ import org.apache.activemq.artemis.core.config.DivertConfiguration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - -public class PersistentDivertTest extends ServiceTestBase +public class PersistentDivertTest extends ActiveMQTestBase { final int minLargeMessageSize = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 2; @@ -53,8 +50,6 @@ public void testPersistentDiverLargeMessage() throws Exception public void doTestPersistentDivert(final boolean largeMessage) throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -81,23 +76,19 @@ public void doTestPersistentDivert(final boolean largeMessage) throws Exception .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); - - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); - - conf.setDivertConfigurations(divertConfs); - - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf)); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - messagingService.start(); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config)); - ServerLocator locator = createInVMNonHALocator(); + server.start(); - locator.setBlockOnAcknowledge(true); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnAcknowledge(true) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true); ClientSessionFactory sf = createSessionFactory(locator); @@ -141,7 +132,7 @@ public void doTestPersistentDivert(final boolean largeMessage) throws Exception if (largeMessage) { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(minLargeMessageSize)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(minLargeMessageSize)); } message.putIntProperty(propKey, i); @@ -220,9 +211,6 @@ public void doTestPersistentDivert(final boolean largeMessage) throws Exception } Assert.assertNull(consumer4.receiveImmediate()); - session.close(); - - sf.close(); } /** @@ -232,7 +220,7 @@ private void checkLargeMessage(final ClientMessage message) { for (int j = 0; j < minLargeMessageSize; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), message.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), message.getBodyBuffer().readByte()); } } @@ -250,8 +238,6 @@ public void testPersistentDivertRestartBeforeConsumeLargeMessage() throws Except public void doTestPersistentDivertRestartBeforeConsume(final boolean largeMessage) throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String forwardAddress1 = "forwardAddress1"; @@ -278,22 +264,19 @@ public void doTestPersistentDivertRestartBeforeConsume(final boolean largeMessag .setAddress(testAddress) .setForwardingAddress(forwardAddress3); - List divertConfs = new ArrayList(); + Configuration config = createDefaultInVMConfig() + .addDivertConfiguration(divertConf1) + .addDivertConfiguration(divertConf2) + .addDivertConfiguration(divertConf3); - divertConfs.add(divertConf1); - divertConfs.add(divertConf2); - divertConfs.add(divertConf3); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config)); - conf.setDivertConfigurations(divertConfs); + server.start(); - ActiveMQServer messagingService = addServer(ActiveMQServers.newActiveMQServer(conf)); - - messagingService.start(); - - ServerLocator locator = createInVMNonHALocator(); - locator.setBlockOnAcknowledge(true); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnAcknowledge(true) + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true); ClientSessionFactory sf = createSessionFactory(locator); @@ -329,7 +312,7 @@ public void doTestPersistentDivertRestartBeforeConsume(final boolean largeMessag if (largeMessage) { - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(minLargeMessageSize)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(minLargeMessageSize)); } producer.send(message); @@ -339,12 +322,14 @@ public void doTestPersistentDivertRestartBeforeConsume(final boolean largeMessag sf.close(); - messagingService.stop(); + server.stop(); - messagingService.start(); + waitForServerToStop(server); - ServerLocator locator2 = createInVMNonHALocator(); - locator2.setBlockOnDurableSend(true); + server.start(); + + ServerLocator locator2 = createInVMNonHALocator() + .setBlockOnDurableSend(true); sf = createSessionFactory(locator2); session = sf.createSession(false, true, true); @@ -435,12 +420,14 @@ public void doTestPersistentDivertRestartBeforeConsume(final boolean largeMessag sf.close(); - messagingService.stop(); + server.stop(); + + waitForServerToStop(server); - messagingService.start(); + server.start(); - ServerLocator locator3 = createInVMNonHALocator(); - locator3.setBlockOnDurableSend(true); + ServerLocator locator3 = createInVMNonHALocator() + .setBlockOnDurableSend(true); sf = createSessionFactory(locator3); @@ -461,10 +448,6 @@ public void doTestPersistentDivertRestartBeforeConsume(final boolean largeMessag Assert.assertNull(consumer3.receiveImmediate()); Assert.assertNull(consumer4.receiveImmediate()); - - session.close(); - - sf.close(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java index afc2129c73c..6b8afbc8e9a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/embedded/ValidateAIOTest.java @@ -20,19 +20,19 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.JournalType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; /** * Validate if the embedded server will start even with AIO selected */ -public class ValidateAIOTest extends ServiceTestBase +public class ValidateAIOTest extends ActiveMQTestBase { @Test public void testValidateAIO() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() // This will force AsyncIO .setJournalType(JournalType.ASYNCIO); ActiveMQServer server = ActiveMQServers.newActiveMQServer(config, true); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java index 611bcb5c2f1..98e7df987c0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/http/CoreClientOverHttpTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.http; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -40,7 +40,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; -public class CoreClientOverHttpTest extends ServiceTestBase +public class CoreClientOverHttpTest extends ActiveMQTestBase { private static final SimpleString QUEUE = new SimpleString("CoreClientOverHttpTestQueue"); private Configuration conf; @@ -55,15 +55,13 @@ public void setUp() throws Exception HashMap params = new HashMap(); params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); - conf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY)); + conf = createDefaultInVMConfig() + .clearAcceptorConfigurations() + .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params)); server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); - server.start(); - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY, params)); - addServerLocator(locator); + locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY, params))); } @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java index 15d14286de0..e39e4dac16e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.integration.jms; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.junit.Before; @@ -50,7 +50,7 @@ * * A ActiveMQConnectionFactoryTest */ -public class ActiveMQConnectionFactoryTest extends ServiceTestBase +public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java index 68f93d28fe8..c8cab6ce7cc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java @@ -15,16 +15,23 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; + +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; +import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; -import org.junit.After; - import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - import javax.jms.BytesMessage; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -33,25 +40,14 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.api.core.client.ActiveMQClient; -import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; -import org.apache.activemq.artemis.api.jms.JMSFactoryType; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; -import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import java.util.ArrayList; +import java.util.List; /** * * A FloodServerTest */ -public class FloodServerTest extends ServiceTestBase +public class FloodServerTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -85,9 +81,8 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - server = ActiveMQServers.newActiveMQServer(conf, false); + Configuration config = createDefaultNettyConfig(); + server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); serverManager = new JMSServerManagerImpl(server); @@ -100,22 +95,6 @@ public void setUp() throws Exception registerConnectionFactory(); } - @Override - @After - public void tearDown() throws Exception - { - - serverManager.stop(); - - server.stop(); - - server = null; - - serverManager = null; - - super.tearDown(); - } - // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java index cf44121ef5a..3c89b2feacf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java @@ -15,19 +15,24 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; + +import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.jms.server.JMSServerManager; +import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; +import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.Assert; import org.junit.Before; -import org.junit.After; - import org.junit.Test; -import static java.util.concurrent.TimeUnit.SECONDS; - -import java.util.ArrayList; -import java.util.Date; -import java.util.concurrent.CountDownLatch; - import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.Destination; @@ -40,23 +45,13 @@ import javax.jms.Queue; import javax.jms.Session; import javax.naming.Context; +import java.util.ArrayList; +import java.util.Date; +import java.util.concurrent.CountDownLatch; -import org.junit.Assert; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.jms.server.JMSServerManager; -import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.artemis.jms.server.config.JMSConfiguration; -import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl; -import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import static java.util.concurrent.TimeUnit.SECONDS; -public class ManualReconnectionToSingleServerTest extends ServiceTestBase +public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -152,10 +147,7 @@ public void setUp() throws Exception context = new InVMNamingContext(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY)); - - server = createServer(false, conf); + server = createServer(false, createDefaultNettyConfig()); JMSConfiguration configuration = new JMSConfigurationImpl(); serverManager = new JMSServerManagerImpl(server, configuration); @@ -181,26 +173,6 @@ public void setUp() throws Exception allMessagesReceived = new CountDownLatch(1); } - @Override - @After - public void tearDown() throws Exception - { - try - { - serverManager.stop(); - serverManager = null; - if (connection != null) - { - connection.close(); - } - connection = null; - } - finally - { - super.tearDown(); - } - } - // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java index ed0c9bbadbc..3924c8dfc87 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java @@ -40,7 +40,7 @@ import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; import org.apache.activemq.artemis.api.jms.JMSFactoryType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; @@ -56,7 +56,7 @@ * * A ActiveMQConnectionFactoryTest */ -public class SimpleJNDIClientTest extends ServiceTestBase +public class SimpleJNDIClientTest extends ActiveMQTestBase { private final String groupAddress = getUDPDiscoveryAddress(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java index 74a96b4aca4..c2737d8a922 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java @@ -43,10 +43,8 @@ public class ExpiryMessageTest extends JMSTestBase @Override protected Configuration createDefaultConfig(boolean netty) throws Exception { - Configuration conf = super.createDefaultConfig(netty) - .setMessageExpiryScanPeriod(1000); - - return conf; + return super.createDefaultConfig(netty) + .setMessageExpiryScanPeriod(1000); } @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java index fb6f12514ba..ce6f418794f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.tests.util.JMSTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -71,7 +71,7 @@ public void testResendWithLargeMessage() throws Exception { BytesMessage bm = sess.createBytesMessage(); bm.setObjectProperty(ActiveMQJMSConstants.JMS_ACTIVEMQ_INPUT_STREAM, - ServiceTestBase.createFakeLargeStream(2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); + ActiveMQTestBase.createFakeLargeStream(2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); msgs.add(bm); MapMessage mm = sess.createMapMessage(); @@ -168,7 +168,7 @@ public void internalTestResend(final ArrayList msgs, final Session sess for (int i = 0; i < copiedBytes.getBodyLength(); i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), copiedBytes.readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), copiedBytes.readByte()); } } else if (copiedMessage instanceof MapMessage) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java index 801467b218b..b52661239f9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -42,10 +42,8 @@ /** * test Written to replicate https://issues.jboss.org/browse/HORNETQ-1312 */ -public class RemoteConnectionStressTest extends ServiceTestBase +public class RemoteConnectionStressTest extends ActiveMQTestBase { - - ActiveMQServer server; MBeanServer mbeanServer; JMSServerManagerImpl jmsServer; @@ -55,12 +53,12 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = ServiceTestBase.createBasicConfigNoDataFolder(); - conf.getAcceptorConfigurations().add(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory")); + Configuration config = createDefaultNettyConfig() + .setPersistenceEnabled(false); mbeanServer = MBeanServerFactory.createMBeanServer(); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false); + server = ActiveMQServers.newActiveMQServer(config, mbeanServer, false); InVMNamingContext namingContext = new InVMNamingContext(); jmsServer = new JMSServerManagerImpl(server); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java index f2d4726778f..82415d1b61e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java @@ -57,7 +57,7 @@ import org.apache.activemq.artemis.tests.integration.jms.server.management.JMSUtil; import org.apache.activemq.artemis.tests.util.InVMNodeManagerServer; 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.After; import org.junit.Assert; import org.junit.Before; @@ -68,7 +68,7 @@ *

* A simple test to test setFailoverListener when using the JMS API. */ -public class JMSFailoverListenerTest extends ServiceTestBase +public class JMSFailoverListenerTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -294,7 +294,7 @@ protected void startServers() throws Exception backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1); - backupConf = createBasicConfig(0) + backupConf = createBasicConfig() .addAcceptorConfiguration(backupAcceptortc) .addConnectorConfiguration(livetc.getName(), livetc) .addConnectorConfiguration(backuptc.getName(), backuptc) @@ -319,7 +319,7 @@ protected void startServers() throws Exception log.info("Starting backup"); backupJMSService.start(); - liveConf = createBasicConfig(0) + liveConf = createBasicConfig() .setJournalDirectory(getJournalDir()) .setBindingsDirectory(getBindingsDir()) .addAcceptorConfiguration(liveAcceptortc) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java index bdb012690d9..51e6ce99f06 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java @@ -41,7 +41,7 @@ import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration; @@ -76,7 +76,7 @@ * A simple test to test failover when using the JMS API. * Most of the failover tests are done on the Core API. */ -public class JMSFailoverTest extends ServiceTestBase +public class JMSFailoverTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -520,7 +520,7 @@ protected void startServers() throws Exception backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1); - backupConf = createBasicConfig(0) + backupConf = createBasicConfig() .addAcceptorConfiguration(backupAcceptortc) .addConnectorConfiguration(livetc.getName(), livetc) .addConnectorConfiguration(backuptc.getName(), backuptc) @@ -546,7 +546,7 @@ protected void startServers() throws Exception log.info("Starting backup"); backupJMSService.start(); - liveConf = createBasicConfig(0) + liveConf = createBasicConfig() .setJournalDirectory(getJournalDir()) .setBindingsDirectory(getBindingsDir()) .setSecurityEnabled(false) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java index f9912452e55..58b4d87ed62 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.integration.jms.cluster; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -54,7 +54,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class JMSReconnectTest extends ServiceTestBase +public class JMSReconnectTest extends ActiveMQTestBase { private ActiveMQServer liveService; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index 5b751f5374d..14c8438e0c3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java @@ -16,18 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.jms.cluster; -import javax.jms.BytesMessage; -import javax.jms.Connection; -import javax.jms.MapMessage; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; - -import java.util.Arrays; -import java.util.Collection; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; @@ -40,6 +28,17 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import javax.jms.BytesMessage; +import javax.jms.Connection; +import javax.jms.MapMessage; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import java.util.Arrays; +import java.util.Collection; + @RunWith(value = Parameterized.class) public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { @@ -168,16 +167,6 @@ public void testSendMapMessageOverCluster() throws Exception } - protected Configuration createConfigServer2() - { - Configuration config = super.createConfigServer2(); - - installHack(config); - - return config; - } - - /** * the hack to create the failing condition in certain tests * @@ -194,13 +183,12 @@ private void installHack(Configuration config) } } - protected Configuration createConfigServer1() + protected Configuration createConfigServer(final int source, final int destination) throws Exception { - Configuration config = super.createConfigServer1(); + Configuration config = super.createConfigServer(source, destination); installHack(config); - return config; } @@ -273,7 +261,7 @@ public void testSendLargeForBridge() throws Exception Queue queue = (Queue) context1.lookup("queue/Q1"); - ActiveMQConnectionFactory cf1 = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY, generateInVMParams(0))); + ActiveMQConnectionFactory cf1 = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY, generateInVMParams(1))); cf1.setMinLargeMessageSize(200 * 1024); Connection conn1 = cf1.createConnection(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java index 4c5f9d0726c..893b7476133 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java @@ -34,7 +34,7 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase public void testMultipleOpen() throws Exception { cf1 = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(0))); + generateInVMParams(1))); final int numberOfOpens = 2000; int numberOfThreads = 20; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java index a47eb6a0b63..89cb988c40c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.integration.jms.connection; import org.apache.activemq.artemis.tests.util.JMSTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -93,7 +93,7 @@ public void connectionClosed() conn = null; - ServiceTestBase.checkWeakReferences(wr); + ActiveMQTestBase.checkWeakReferences(wr); latch.await(5000, TimeUnit.MILLISECONDS); Assert.assertEquals(0, server.getRemotingService().getConnections().size()); @@ -130,7 +130,7 @@ public void connectionClosed() conn2 = null; conn3 = null; - ServiceTestBase.checkWeakReferences(wr1, wr2, wr3); + ActiveMQTestBase.checkWeakReferences(wr1, wr2, wr3); latch.await(5000, TimeUnit.MILLISECONDS); @@ -174,7 +174,7 @@ public void connectionClosed() conn2 = null; conn3 = null; - ServiceTestBase.checkWeakReferences(wr1, wr2, wr3); + ActiveMQTestBase.checkWeakReferences(wr1, wr2, wr3); latch.await(5000, TimeUnit.MILLISECONDS); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java index 4f4724cbb9f..fdc94eb14bb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java @@ -15,29 +15,13 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms.connection; -import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import javax.jms.Connection; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Session; - -import org.junit.Assert; +import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; -import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.client.ActiveMQConnection; @@ -45,12 +29,24 @@ import org.apache.activemq.artemis.jms.client.ActiveMQSession; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.integration.jms.server.management.NullInitialContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import javax.jms.Connection; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.Session; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * * A ExceptionListenerTest */ -public class ExceptionListenerTest extends ServiceTestBase +public class ExceptionListenerTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -66,9 +62,7 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory")); - server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), false)); jmsServer = new JMSServerManagerImpl(server); jmsServer.setRegistry(new JndiBindingRegistry(new NullInitialContext())); jmsServer.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java index 5f44531b4d2..1bd95560a41 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java @@ -16,26 +16,22 @@ */ package org.apache.activemq.artemis.tests.integration.jms.divert; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; +import org.apache.activemq.artemis.api.jms.JMSFactoryType; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.DivertConfiguration; import org.apache.activemq.artemis.tests.util.JMSTestBase; +import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - import javax.jms.Connection; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; - -import org.junit.Assert; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.api.core.client.ActiveMQClient; -import org.apache.activemq.artemis.api.jms.JMSFactoryType; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.config.DivertConfiguration; +import java.util.List; /** * A DivertAndACKClientTest @@ -102,8 +98,6 @@ protected boolean usePersistence() @Override protected Configuration createDefaultConfig(final boolean netty) throws Exception { - Configuration config = super.createDefaultConfig(netty); - DivertConfiguration divert = new DivertConfiguration() .setName("local-divert") .setRoutingName("some-name") @@ -111,10 +105,8 @@ protected Configuration createDefaultConfig(final boolean netty) throws Exceptio .setForwardingAddress("jms.queue.Dest") .setExclusive(true); - ArrayList divertList = new ArrayList(); - divertList.add(divert); - - config.setDivertConfigurations(divertList); + Configuration config = super.createDefaultConfig(netty) + .addDivertConfiguration(divert); return config; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java index 8c63be557ac..eb4f3fe18a4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.artemis.tests.util.JMSTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; @@ -86,7 +86,7 @@ public void testSimpleLargeMessage() throws Exception BytesMessage m = session.createBytesMessage(); - m.setObjectProperty("JMS_AMQ_InputStream", ServiceTestBase.createFakeLargeStream(1024 * 1024)); + m.setObjectProperty("JMS_AMQ_InputStream", ActiveMQTestBase.createFakeLargeStream(1024 * 1024)); prod.send(m); @@ -112,7 +112,7 @@ public void testSimpleLargeMessage() throws Exception Assert.assertEquals(1024, numberOfBytes); for (int j = 0; j < 1024; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i + j), data[j]); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i + j), data[j]); } } @@ -130,7 +130,7 @@ public void testSimpleLargeMessage2() throws Exception BytesMessage m = session.createBytesMessage(); - m.setObjectProperty("JMS_AMQ_InputStream", ServiceTestBase.createFakeLargeStream(10)); + m.setObjectProperty("JMS_AMQ_InputStream", ActiveMQTestBase.createFakeLargeStream(10)); prod.send(m); @@ -154,7 +154,7 @@ public void testSimpleLargeMessage2() throws Exception Assert.assertEquals(10, numberOfBytes); for (int j = 0; j < numberOfBytes; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), data[j]); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), data[j]); } Assert.assertNotNull(rm); @@ -171,7 +171,7 @@ public void testExceptionsOnSettingNonStreaming() throws Exception try { - msg.setObjectProperty("JMS_AMQ_InputStream", ServiceTestBase.createFakeLargeStream(10)); + msg.setObjectProperty("JMS_AMQ_InputStream", ActiveMQTestBase.createFakeLargeStream(10)); Assert.fail("Exception was expected"); } catch (JMSException e) @@ -232,7 +232,7 @@ public void testWaitOnOutputStream() throws Exception BytesMessage m = session.createBytesMessage(); - m.setObjectProperty("JMS_AMQ_InputStream", ServiceTestBase.createFakeLargeStream(msgSize)); + m.setObjectProperty("JMS_AMQ_InputStream", ActiveMQTestBase.createFakeLargeStream(msgSize)); prod.send(m); @@ -262,7 +262,7 @@ public void testWaitOnOutputStream() throws Exception public void write(final int b) throws IOException { numberOfBytes.incrementAndGet(); - if (ServiceTestBase.getSamplebyte(position++) != b) + if (ActiveMQTestBase.getSamplebyte(position++) != b) { System.out.println("Wrong byte at position " + position); numberOfErrors.incrementAndGet(); @@ -273,7 +273,7 @@ public void write(final int b) throws IOException try { - rm.setObjectProperty("JMS_AMQ_InputStream", ServiceTestBase.createFakeLargeStream(100)); + rm.setObjectProperty("JMS_AMQ_InputStream", ActiveMQTestBase.createFakeLargeStream(100)); Assert.fail("Exception expected!"); } catch (MessageNotWriteableException expected) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java index 4f31da227a1..335bba0dfaf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; @@ -37,7 +37,7 @@ import org.junit.Before; import org.junit.Test; -public class JMSServerDeployerTest extends ServiceTestBase +public class JMSServerDeployerTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java index 88c67f7231d..585c194e060 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerStartStopTest.java @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.FileDeploymentManager; import org.apache.activemq.artemis.core.config.impl.FileConfiguration; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -44,7 +44,7 @@ import org.junit.Assert; import org.junit.Test; -public class JMSServerStartStopTest extends ServiceTestBase +public class JMSServerStartStopTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java index 048e710c73e..ac72ded2480 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSConfigurationTest.java @@ -16,24 +16,8 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.config; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Queue; -import javax.jms.Topic; -import javax.naming.Context; - -import org.junit.Assert; - import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; @@ -46,18 +30,28 @@ import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl; import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.junit.Assert; +import org.junit.Test; -public class JMSConfigurationTest extends ServiceTestBase -{ +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; +import javax.naming.Context; +import java.util.ArrayList; +import java.util.List; +public class JMSConfigurationTest extends ActiveMQTestBase +{ @Test public void testSetupJMSConfiguration() throws Exception { Context context = new InVMNamingContext(); - Configuration coreConfiguration = createDefaultConfig(); - ActiveMQServer coreServer = new ActiveMQServerImpl(coreConfiguration); + ActiveMQServer coreServer = new ActiveMQServerImpl(createDefaultInVMConfig()); JMSConfiguration jmsConfiguration = new JMSConfigurationImpl(); TransportConfiguration connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java index 1e95872854b..f4ed48d121f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java @@ -24,9 +24,9 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration; import org.apache.activemq.artemis.jms.server.config.TopicConfiguration; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class JMSServerConfigParserTest extends ServiceTestBase +public class JMSServerConfigParserTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -43,7 +43,7 @@ public class JMSServerConfigParserTest extends ServiceTestBase @Test public void testParsing() throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() // anything so the parsing will work .addConnectorConfiguration("netty", new TransportConfiguration()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java index d810dbfac21..a004bb31d50 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/ConnectionFactoryControlTest.java @@ -23,11 +23,9 @@ import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.junit.Assert; import org.junit.Before; -import org.junit.After; import org.junit.Test; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; @@ -53,7 +51,7 @@ public class ConnectionFactoryControlTest extends ManagementTestBase private ActiveMQServer server; - private JMSServerManagerImpl serverManager; + private JMSServerManagerImpl jmsServerManager; private InVMNamingContext ctx; @@ -80,9 +78,9 @@ public void testCreateCF() throws Exception cf = (ActiveMQConnectionFactory)ctx.lookup("test"); Assert.assertTrue(cf.isCompressLargeMessage()); - stopServer(); + server.stop(); - Thread.sleep(500); + waitForServerToStop(server); startServer(); @@ -102,18 +100,18 @@ public void testCreateCFNotification() throws Exception List connectors = new ArrayList(); connectors.add("invm"); - this.serverManager.createConnectionFactory("NewCF", - false, - JMSFactoryType.CF, - connectors, - "/NewConnectionFactory"); + this.jmsServerManager.createConnectionFactory("NewCF", + false, + JMSFactoryType.CF, + connectors, + "/NewConnectionFactory"); Notification notif = listener.getNotification(); Assert.assertEquals(JMSNotificationType.CONNECTION_FACTORY_CREATED.toString(), notif.getType()); Assert.assertEquals("NewCF", notif.getMessage()); - this.serverManager.destroyConnectionFactory("NewCF"); + this.jmsServerManager.destroyConnectionFactory("NewCF"); notif = listener.getNotification(); Assert.assertEquals(JMSNotificationType.CONNECTION_FACTORY_DESTROYED.toString(), notif.getType()); @@ -155,44 +153,19 @@ public void setUp() throws Exception */ protected void startServer() throws Exception { - Configuration conf = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)) - .setSecurityEnabled(false) - .setJMXManagementEnabled(true) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, true); + .setJMXManagementEnabled(true); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, true)); server.start(); - serverManager = new JMSServerManagerImpl(server); - serverManager.start(); + jmsServerManager = new JMSServerManagerImpl(server); + jmsServerManager.start(); ctx = new InVMNamingContext(); - serverManager.setRegistry(new JndiBindingRegistry(ctx)); - serverManager.activated(); - } - - @Override - @After - public void tearDown() throws Exception - { - stopServer(); - - super.tearDown(); - } - - /** - * @throws Exception - */ - protected void stopServer() throws Exception - { - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; + jmsServerManager.setRegistry(new JndiBindingRegistry(ctx)); + jmsServerManager.activated(); } protected ConnectionFactoryControl createCFControl(String name) throws Exception diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java index 6e61753e98f..758324b52d4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java @@ -1386,9 +1386,9 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - server = createServer(this.getName().contains("WithRealData"), conf); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = createServer(this.getName().contains("WithRealData"), config); server.setMBeanServer(mbeanServer); serverManager = new JMSServerManagerImpl(server); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java index 27e59018a7e..4e6ba8f7670 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java @@ -78,9 +78,9 @@ public class JMSServerControl2Test extends ManagementTestBase private void startActiveMQServer(final String acceptorFactory) throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(new TransportConfiguration(acceptorFactory)); - server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true)); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, true)); server.start(); context = new InVMNamingContext(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java index 9d4c8dbf985..7469a2e435c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlRestartTest.java @@ -16,38 +16,37 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.Queue; -import javax.jms.QueueRequestor; -import javax.jms.QueueSession; -import javax.jms.Session; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; -import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.jms.server.JMSServerManager; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.Queue; +import javax.jms.QueueRequestor; +import javax.jms.QueueSession; +import javax.jms.Session; + public class JMSServerControlRestartTest extends ManagementTestBase { @@ -61,13 +60,13 @@ public void testCreateDurableQueueUsingJMXAndRestartServer() throws Exception String queueName = RandomUtil.randomString(); String binding = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = ManagementControlHelper.createJMSServerControl(mbeanServer); control.createQueue(queueName, binding); - Object o = ServiceTestBase.checkBinding(context, binding); + Object o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -75,13 +74,13 @@ public void testCreateDurableQueueUsingJMXAndRestartServer() throws Exception serverManager.stop(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); serverManager = createJMSServer(); serverManager.start(); - o = ServiceTestBase.checkBinding(context, binding); + o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -94,7 +93,7 @@ public void testCreateDurableQueueUsingJMSAndRestartServer() throws Exception String queueName = RandomUtil.randomString(); String binding = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName()); @@ -109,7 +108,7 @@ public void testCreateDurableQueueUsingJMSAndRestartServer() throws Exception Assert.assertTrue(JMSManagementHelper.hasOperationSucceeded(reply)); connection.close(); - Object o = ServiceTestBase.checkBinding(context, binding); + Object o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -117,13 +116,13 @@ public void testCreateDurableQueueUsingJMSAndRestartServer() throws Exception serverManager.stop(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); serverManager = createJMSServer(); serverManager.start(); - o = ServiceTestBase.checkBinding(context, binding); + o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -146,13 +145,11 @@ public void setUp() throws Exception private JMSServerManager createJMSServer() throws Exception { - Configuration conf = createDefaultConfig() - .setSecurityEnabled(false) + Configuration config = createDefaultInVMConfig() .setJMXManagementEnabled(true) - .setPersistenceEnabled(true) - .setJournalType(JournalType.NIO) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, mbeanServer); + .setJournalType(JournalType.NIO); + + ActiveMQServer server = ActiveMQServers.newActiveMQServer(config, mbeanServer); context = new InVMNamingContext(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java index 2cecabb3455..1c969315738 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java @@ -16,28 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XASession; -import javax.naming.NamingException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException; import org.apache.activemq.artemis.api.core.SimpleString; @@ -48,10 +26,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; -import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.postoffice.QueueBinding; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; @@ -64,18 +38,43 @@ import org.apache.activemq.artemis.jms.client.ActiveMQMessageConsumer; import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory; import org.apache.activemq.artemis.jms.persistence.JMSStorageManager; +import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory; import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination; -import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings; import org.apache.activemq.artemis.jms.persistence.config.PersistedType; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.json.JSONArray; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; +import javax.jms.XASession; +import javax.naming.NamingException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class JMSServerControlTest extends ManagementTestBase { // Attributes ---------------------------------------------------- @@ -134,22 +133,22 @@ public void testCreateQueueWithBindings() throws Exception String queueName = RandomUtil.randomString(); String bindingsCSV = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, bindingsCSV); + ActiveMQTestBase.checkNoBinding(context, bindingsCSV); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, bindingsCSV); - Object o = ServiceTestBase.checkBinding(context, bindings[0]); + Object o = ActiveMQTestBase.checkBinding(context, bindings[0]); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, bindings[1]); + o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, bindings[2]); + o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -172,22 +171,22 @@ public void testCreateQueueWithCommaBindings() throws Exception String queueName = RandomUtil.randomString(); String bindingsCSV = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, bindingsCSV); + ActiveMQTestBase.checkNoBinding(context, bindingsCSV); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, bindingsCSV); - Object o = ServiceTestBase.checkBinding(context, "first,first"); + Object o = ActiveMQTestBase.checkBinding(context, "first,first"); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, "second,second"); + o = ActiveMQTestBase.checkBinding(context, "second,second"); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - o = ServiceTestBase.checkBinding(context, "third,third"); + o = ActiveMQTestBase.checkBinding(context, "third,third"); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -210,7 +209,7 @@ public void testCreateQueueWithSelector() throws Exception String queueName = RandomUtil.randomString(); String bindingsCSV = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, bindingsCSV); + ActiveMQTestBase.checkNoBinding(context, bindingsCSV); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); @@ -218,7 +217,7 @@ public void testCreateQueueWithSelector() throws Exception String selector = "foo='bar'"; control.createQueue(queueName, bindingsCSV, selector); - Object o = ServiceTestBase.checkBinding(context, bindings[0]); + Object o = ActiveMQTestBase.checkBinding(context, bindings[0]); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; // assertEquals(((ActiveMQDestination)queue).get); @@ -228,7 +227,7 @@ public void testCreateQueueWithSelector() throws Exception .getFilter() .getFilterString() .toString()); - o = ServiceTestBase.checkBinding(context, bindings[1]); + o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -237,7 +236,7 @@ public void testCreateQueueWithSelector() throws Exception .getFilter() .getFilterString() .toString()); - o = ServiceTestBase.checkBinding(context, bindings[2]); + o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -261,13 +260,13 @@ public void testCreateNonDurableQueue() throws Exception String queueName = RandomUtil.randomString(); String binding = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, binding); + ActiveMQTestBase.checkNoBinding(context, binding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, binding, null, false); - Object o = ServiceTestBase.checkBinding(context, binding); + Object o = ActiveMQTestBase.checkBinding(context, binding); Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); @@ -287,18 +286,18 @@ public void testDestroyQueue() throws Exception String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); control.destroyQueue(queueName); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -310,13 +309,13 @@ public void testDestroyQueueWithConsumers() throws Exception String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); ActiveMQConnectionFactory cf = @@ -330,7 +329,7 @@ public void testDestroyQueueWithConsumers() throws Exception control.destroyQueue(queueName, true); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -367,13 +366,13 @@ public void testDestroyQueueWithConsumersWithoutForcingTheConsumersToClose() thr String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); @@ -397,7 +396,7 @@ public void testDestroyQueueWithConsumersWithoutForcingTheConsumersToClose() thr Assert.assertTrue(e.getMessage().startsWith("AMQ119025")); } - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNotNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -422,13 +421,13 @@ public void testDestroyTopicWithConsumersWithoutForcingTheConsumersToClose() thr String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); control.createTopic(topicName, topicJNDIBinding); - ServiceTestBase.checkBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkBinding(context, topicJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); @@ -452,7 +451,7 @@ public void testDestroyTopicWithConsumersWithoutForcingTheConsumersToClose() thr Assert.assertTrue(e.getMessage().startsWith("AMQ119025")); } - ServiceTestBase.checkBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkBinding(context, topicJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Assert.assertFalse(cons.isClosed()); @@ -474,13 +473,13 @@ public void testDestroyTopicWithConsumers() throws Exception String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); control.createTopic(topicName, topicJNDIBinding); - ServiceTestBase.checkBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkBinding(context, topicJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); ActiveMQConnectionFactory cf = @@ -494,7 +493,7 @@ public void testDestroyTopicWithConsumers() throws Exception control.destroyTopic(topicName, true); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); long time = System.currentTimeMillis(); @@ -529,17 +528,17 @@ public void testDestroyQueueWithConsumersNetty() throws Exception String queueJNDIBinding = RandomUtil.randomString(); String queueName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); JMSServerControl control = createManagementControl(); control.createQueue(queueName, queueJNDIBinding); - ServiceTestBase.checkBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkBinding(context, queueJNDIBinding); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); ActiveMQConnectionFactory cf = - new ActiveMQConnectionFactory(false, new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY)); + new ActiveMQConnectionFactory(false, new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY)); cf.setReconnectAttempts(-1); ActiveMQConnection connection = (ActiveMQConnection) cf.createConnection(); try @@ -550,7 +549,7 @@ public void testDestroyQueueWithConsumersNetty() throws Exception control.destroyQueue(queueName, true); - ServiceTestBase.checkNoBinding(context, queueJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, queueJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -610,24 +609,24 @@ public void testCreateTopic() throws Exception bindings[1] = RandomUtil.randomString(); bindings[2] = RandomUtil.randomString(); String topicJNDIBinding = JMSServerControlTest.toCSV(bindings); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); control.createTopic(topicName, topicJNDIBinding); - Object o = ServiceTestBase.checkBinding(context, bindings[0]); + Object o = ActiveMQTestBase.checkBinding(context, bindings[0]); Assert.assertTrue(o instanceof Topic); Topic topic = (Topic) o; Assert.assertEquals(topicName, topic.getTopicName()); - o = ServiceTestBase.checkBinding(context, bindings[1]); + o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Topic); topic = (Topic) o; Assert.assertEquals(topicName, topic.getTopicName()); - o = ServiceTestBase.checkBinding(context, bindings[2]); + o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Topic); topic = (Topic) o; Assert.assertEquals(topicName, topic.getTopicName()); @@ -646,7 +645,7 @@ public void testDestroyTopic() throws Exception String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); @@ -673,7 +672,7 @@ public void testDestroyTopic() throws Exception control.destroyTopic(topicName); Assert.assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress)); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(topicName)); @@ -685,7 +684,7 @@ public void testListAllConsumers() throws Exception String topicJNDIBinding = RandomUtil.randomString(); String topicName = RandomUtil.randomString(); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); JMSServerControl control = createManagementControl(); @@ -722,7 +721,7 @@ public void testListAllConsumers() throws Exception control.destroyTopic(topicName); Assert.assertNull(server.getManagementService().getResource(ResourceNames.CORE_ADDRESS + topicAddress)); - ServiceTestBase.checkNoBinding(context, topicJNDIBinding); + ActiveMQTestBase.checkNoBinding(context, topicJNDIBinding); checkNoResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Assert.assertNull(fakeJMSStorageManager.destinationMap.get(topicName)); @@ -841,7 +840,9 @@ public void testCreateConnectionFactory_CompleteList() throws Exception Assert.assertEquals(true, cf.isFailoverOnInitialConnection()); Assert.assertEquals("tst", cf.getGroupID()); - stopServer(); + server.stop(); + + waitForServerToStop(server); startServer(); @@ -883,7 +884,9 @@ public void testCreateConnectionFactory_CompleteList() throws Exception ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(ActiveMQDefaultConfiguration.getDefaultJmxDomain()); Assert.assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test"))); - stopServer(); + server.stop(); + + waitForServerToStop(server); startServer(); @@ -1064,14 +1067,12 @@ public void setUp() throws Exception */ protected void startServer() throws Exception { - Configuration conf = createBasicConfig() - .setPersistenceEnabled(true) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY)) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)) - .addConnectorConfiguration("netty", new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY)) - .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + Configuration config = createDefaultNettyConfig() + .setJMXManagementEnabled(true) + .addConnectorConfiguration("netty", new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY)) + .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true)); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, true)); serverManager = new JMSServerManagerImpl(server); context = new InVMNamingContext(); @@ -1084,34 +1085,6 @@ protected void startServer() throws Exception serverManager.replaceStorageManager(fakeJMSStorageManager); } - @Override - @After - public void tearDown() throws Exception - { - try - { - stopServer(); - } - finally - { - super.tearDown(); - } - } - - /** - * @throws Exception - */ - protected void stopServer() throws Exception - { - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; - } - protected JMSServerControl createManagementControl() throws Exception { return ManagementControlHelper.createJMSServerControl(mbeanServer); @@ -1130,7 +1103,7 @@ private void doCreateConnectionFactory(final ConnectionFactoryCreator creator) t for (Object cfJNDIBinding : cfJNDIBindings) { - ServiceTestBase.checkNoBinding(context, cfJNDIBinding.toString()); + ActiveMQTestBase.checkNoBinding(context, cfJNDIBinding.toString()); } checkNoResource(ObjectNameBuilder.DEFAULT.getConnectionFactoryObjectName(cfName)); @@ -1139,7 +1112,7 @@ private void doCreateConnectionFactory(final ConnectionFactoryCreator creator) t for (Object cfJNDIBinding : cfJNDIBindings) { - Object o = ServiceTestBase.checkBinding(context, cfJNDIBinding.toString()); + Object o = ActiveMQTestBase.checkBinding(context, cfJNDIBinding.toString()); Assert.assertTrue(o instanceof ConnectionFactory); ConnectionFactory cf = (ConnectionFactory) o; Connection connection = cf.createConnection(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java index ca35dd45580..292b448c767 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java @@ -16,29 +16,11 @@ */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.TopicSubscriber; -import javax.management.Notification; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.management.JMSServerControl; import org.apache.activemq.artemis.api.jms.management.SubscriptionInfo; import org.apache.activemq.artemis.api.jms.management.TopicControl; -import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.postoffice.Binding; import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; @@ -50,13 +32,28 @@ import org.apache.activemq.artemis.jms.client.ActiveMQTopic; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.jms.server.management.JMSNotificationType; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.json.JSONArray; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.TopicSubscriber; +import javax.management.Notification; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class TopicControlTest extends ManagementTestBase { @@ -599,9 +596,9 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory")); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, false)); server.start(); serverManager = new JMSServerManagerImpl(server); @@ -617,23 +614,6 @@ public void setUp() throws Exception topic = (ActiveMQTopic) ActiveMQJMSClient.createTopic(topicName); } - @Override - @After - public void tearDown() throws Exception - { - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; - - topic = null; - - super.tearDown(); - } - protected TopicControl createManagementControl() throws Exception { return ManagementControlHelper.createTopicControl(topic, mbeanServer); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java index bca3eeab024..6cbf04309ed 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java @@ -15,30 +15,13 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.jms.server.management; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; - -import javax.jms.Connection; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.QueueConnection; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TopicSubscriber; - -import org.junit.Assert; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; @@ -48,7 +31,21 @@ import org.apache.activemq.artemis.jms.client.ActiveMQTopic; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.QueueConnection; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TopicSubscriber; + +import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; public class TopicControlUsingJMSTest extends ManagementTestBase { @@ -443,9 +440,9 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory")); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, false)); server.start(); serverManager = new JMSServerManagerImpl(server); @@ -471,32 +468,6 @@ public void setUp() throws Exception proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_TOPIC + topic.getTopicName()); } - @Override - @After - public void tearDown() throws Exception - { - - session.close(); - - connection.close(); - - serverManager.stop(); - - server.stop(); - - serverManager = null; - - server = null; - - session = null; - - connection = null; - - proxy = null; - - super.tearDown(); - } - // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java index 4b3ea24f46e..605fa39663e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOImportExportTest.java @@ -18,7 +18,7 @@ import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.junit.BeforeClass; @@ -36,7 +36,7 @@ protected SequentialFileFactory getFileFactory() throws Exception { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java index dd634600277..2da8915351c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOJournalCompactTest.java @@ -18,7 +18,7 @@ import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.JournalConstants; @@ -37,7 +37,7 @@ protected SequentialFileFactory getFileFactory() throws Exception { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java index 02efaa3f659..0a558a382e9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalPerfTuneTest.java @@ -21,7 +21,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.EncodingSupport; import org.apache.activemq.artemis.core.journal.IOCompletion; import org.apache.activemq.artemis.core.journal.Journal; @@ -37,7 +37,7 @@ import org.junit.Test; @Ignore -public class JournalPerfTuneTest extends ServiceTestBase +public class JournalPerfTuneTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java index da39e88bebc..28ca43d07d3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOBufferedJournalCompactTest.java @@ -18,7 +18,7 @@ import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; @@ -30,7 +30,7 @@ protected SequentialFileFactory getFileFactory() throws Exception { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java index 66e001b3225..da7573b7ee8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.integration.journal; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Test; @@ -39,7 +39,7 @@ protected SequentialFileFactory getFileFactory() throws Exception { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java index acc98c8baad..bf14e774f7d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java @@ -48,7 +48,7 @@ import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.IDGenerator; import org.apache.activemq.artemis.utils.OrderedExecutorFactory; import org.apache.activemq.artemis.utils.SimpleIDGenerator; @@ -556,7 +556,7 @@ public void onCompactDone() System.out.println("Waiting on Compact"); try { - ServiceTestBase.waitForLatch(latchWait); + ActiveMQTestBase.waitForLatch(latchWait); } catch (InterruptedException e) { @@ -650,7 +650,7 @@ public void run() t.start(); - ServiceTestBase.waitForLatch(latchDone); + ActiveMQTestBase.waitForLatch(latchDone); int nextID = NIOJournalCompactTest.NUMBER_OF_RECORDS; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java index e99775b2fec..7301dee8f82 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalImplTest.java @@ -20,7 +20,7 @@ import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestUnit; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; @@ -35,7 +35,7 @@ protected SequentialFileFactory getFileFactory() throws Exception NIOJournalImplTest.log.debug("deleting directory " + getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java index 95ce97cc390..6506421565a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.artemis.tests.util.SpawnedVMSupport; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.journal.LoaderCallback; import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; @@ -37,7 +37,7 @@ /** * This test spawns a remote VM, as we want to "crash" the VM right after the journal is filled with data */ -public class ValidateTransactionHealthTest extends ServiceTestBase +public class ValidateTransactionHealthTest extends ActiveMQTestBase { private static final int OK = 10; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java index d80ee587bda..5c5aecfd410 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.DataConstants; import org.apache.activemq.artemis.utils.DeflaterReader; import org.junit.Assert; @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -public abstract class LargeMessageTestBase extends ServiceTestBase +public abstract class LargeMessageTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -299,7 +299,7 @@ public void onMessage(final ClientMessage message) @Override public void write(final byte[] b) throws IOException { - if (b[0] == ServiceTestBase.getSamplebyte(bytesRead.get())) + if (b[0] == ActiveMQTestBase.getSamplebyte(bytesRead.get())) { bytesRead.addAndGet(b.length); LargeMessageTestBase.log.debug("Read position " + bytesRead.get() + " on consumer"); @@ -313,7 +313,7 @@ public void write(final byte[] b) throws IOException @Override public void write(final int b) throws IOException { - if (b == ServiceTestBase.getSamplebyte(bytesRead.get())) + if (b == ActiveMQTestBase.getSamplebyte(bytesRead.get())) { bytesRead.incrementAndGet(); } @@ -338,7 +338,7 @@ public void write(final int b) throws IOException LargeMessageTestBase.log.debug("Read " + b + " bytes"); } - Assert.assertEquals(ServiceTestBase.getSamplebyte(b), buffer.readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(b), buffer.readByte()); } try @@ -418,7 +418,7 @@ public void write(final int b) throws IOException @Override public void write(final byte[] b) throws IOException { - if (b[0] == ServiceTestBase.getSamplebyte(bytesRead.get())) + if (b[0] == ActiveMQTestBase.getSamplebyte(bytesRead.get())) { bytesRead.addAndGet(b.length); } @@ -460,7 +460,7 @@ public void write(final int b) throws IOException { LargeMessageTestBase.log.debug("Read " + b + " bytes"); } - Assert.assertEquals(ServiceTestBase.getSamplebyte(b), buffer.readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(b), buffer.readByte()); } } @@ -546,7 +546,7 @@ private void sendMessages(final int numberOfMessages, if (numberOfBytes > 1024 * 1024 || i % 2 == 0) { LargeMessageTestBase.log.debug("Sending message (stream)" + i); - message.setBodyInputStream(ServiceTestBase.createFakeLargeStream(numberOfBytes)); + message.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(numberOfBytes)); } else { @@ -554,7 +554,7 @@ private void sendMessages(final int numberOfMessages, byte[] bytes = new byte[(int) numberOfBytes]; for (int j = 0; j < bytes.length; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(j); + bytes[j] = ActiveMQTestBase.getSamplebyte(j); } message.getBodyBuffer().writeBytes(bytes); } @@ -606,7 +606,7 @@ protected ClientMessage createLargeClientMessageStreaming(final ClientSession se ClientMessage clientMessage = session.createMessage(persistent); - clientMessage.setBodyInputStream(ServiceTestBase.createFakeLargeStream(numberOfBytes)); + clientMessage.setBodyInputStream(ActiveMQTestBase.createFakeLargeStream(numberOfBytes)); return clientMessage; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java index 83aa6d533bd..df8ce86e969 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl; 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.Assert; import org.junit.Test; -public class ServerLargeMessageTest extends ServiceTestBase +public class ServerLargeMessageTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -66,7 +66,7 @@ public void testSendServerMessage() throws Exception for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { - fileMessage.addBytes(new byte[]{ServiceTestBase.getSamplebyte(i)}); + fileMessage.addBytes(new byte[]{ActiveMQTestBase.getSamplebyte(i)}); } // The server would be doing this fileMessage.putLongProperty(Message.HDR_LARGE_BODY_SIZE, 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); @@ -96,7 +96,7 @@ public void testSendServerMessage() throws Exception for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } msg.acknowledge(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java index 1f739357975..bfd7edfd47b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java @@ -51,9 +51,9 @@ public void testAttributes() throws Exception new HashMap(), RandomUtil.randomString()); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(acceptorConfig); - ActiveMQServer service = createServer(false, conf); + ActiveMQServer service = createServer(false, config); service.setMBeanServer(mbeanServer); service.start(); @@ -69,9 +69,9 @@ public void testStartStop() throws Exception TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), new HashMap(), RandomUtil.randomString()); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(acceptorConfig); - ActiveMQServer service = createServer(false, conf); + ActiveMQServer service = createServer(false, config); service.setMBeanServer(mbeanServer); service.start(); @@ -129,9 +129,9 @@ public void testNotifications() throws Exception TransportConfiguration acceptorConfig = new TransportConfiguration(InVMAcceptorFactory.class.getName(), new HashMap(), RandomUtil.randomString()); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .addAcceptorConfiguration(acceptorConfig); - ActiveMQServer service = createServer(false, conf); + ActiveMQServer service = createServer(false, config); service.setMBeanServer(mbeanServer); service.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 7df47ea7859..d6c912faabd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -36,7 +36,6 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; 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.ActiveMQServers; @@ -54,7 +53,6 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.HashMap; -import java.util.Map; public class ActiveMQServerControlTest extends ManagementTestBase { @@ -1008,48 +1006,43 @@ public void scaleDown(ActiveMQServerControl control) throws Exception protected void scaleDown(ScaleDownHandler handler) throws Exception { SimpleString address = new SimpleString("testQueue"); - Configuration conf = createDefaultConfig(2, new HashMap(), INVM_ACCEPTOR_FACTORY); - conf.setSecurityEnabled(false); - conf.getAcceptorConfigurations().clear(); - HashMap params = new HashMap(); + HashMap params = new HashMap<>(); params.put(TransportConstants.SERVER_ID_PROP_NAME, "2"); - conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName(), params)); - ActiveMQServer server2 = ActiveMQServers.newActiveMQServer(conf, null, true); - this.conf.getConnectorConfigurations().clear(); - this.conf.getConnectorConfigurations().put("server2-connector", new TransportConfiguration(INVM_CONNECTOR_FACTORY, params)); - try + Configuration config = createDefaultInVMConfig(2) + .clearAcceptorConfigurations() + .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName(), params)); + ActiveMQServer server2 = addServer(ActiveMQServers.newActiveMQServer(config, null, true)); + + this.conf + .clearConnectorConfigurations() + .addConnectorConfiguration("server2-connector", new TransportConfiguration(INVM_CONNECTOR_FACTORY, params)); + + server2.start(); + server.createQueue(address, address, null, true, false); + server2.createQueue(address, address, null, true, false); + ServerLocator locator = createInVMNonHALocator(); + ClientSessionFactory csf = createSessionFactory(locator); + ClientSession session = csf.createSession(); + ClientProducer producer = session.createProducer(address); + for (int i = 0; i < 100; i++) { - server2.start(); - server.createQueue(address, address, null, true, false); - server2.createQueue(address, address, null, true, false); - ServerLocator locator = createInVMNonHALocator(); - ClientSessionFactory csf = createSessionFactory(locator); - ClientSession session = csf.createSession(); - ClientProducer producer = session.createProducer(address); - for (int i = 0; i < 100; i++) - { - ClientMessage message = session.createMessage(true); - message.getBodyBuffer().writeString("m" + i); - producer.send(message); - } - - ActiveMQServerControl managementControl = createManagementControl(); - handler.scaleDown(managementControl); - locator.close(); - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY, params)); - csf = createSessionFactory(locator); - session = csf.createSession(); - session.start(); - ClientConsumer consumer = session.createConsumer(address); - for (int i = 0; i < 100; i++) - { - ClientMessage m = consumer.receive(5000); - assertNotNull(m); - } + ClientMessage message = session.createMessage(true); + message.getBodyBuffer().writeString("m" + i); + producer.send(message); } - finally + + ActiveMQServerControl managementControl = createManagementControl(); + handler.scaleDown(managementControl); + locator.close(); + locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY, params))); + csf = createSessionFactory(locator); + session = csf.createSession(); + session.start(); + ClientConsumer consumer = session.createConsumer(address); + for (int i = 0; i < 100; i++) { - server2.stop(); + ClientMessage m = consumer.receive(5000); + assertNotNull(m); } } // Package protected --------------------------------------------- @@ -1065,17 +1058,10 @@ public void setUp() throws Exception { super.setUp(); - Map params = new HashMap(); - //params.put(RandomUtil.randomString(), RandomUtil.randomBoolean()); - connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName(), - params, - RandomUtil.randomString()); + connectorConfig = new TransportConfiguration(INVM_CONNECTOR_FACTORY); - conf = createDefaultConfig() - .setSecurityEnabled(false) + conf = createDefaultInVMConfig() .setJMXManagementEnabled(true) - .clearAcceptorConfigurations() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) .addConnectorConfiguration(connectorConfig.getName(), connectorConfig); server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, true); server.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java index 93bff071567..da69764d883 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java @@ -28,7 +28,6 @@ import org.apache.activemq.artemis.api.core.management.AddressControl; import org.apache.activemq.artemis.api.core.management.RoleInfo; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.security.CheckType; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -307,9 +306,9 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = createServer(false, conf); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = createServer(false, config); server.setMBeanServer(mbeanServer); server.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java index cf1fdb67cd7..0c72ed55dec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java @@ -15,31 +15,27 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.management; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; - -import java.util.HashSet; -import java.util.Set; - -import org.junit.Assert; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; 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.api.core.management.AddressControl; import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.security.CheckType; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.HashSet; +import java.util.Set; + +import static org.apache.activemq.artemis.tests.util.RandomUtil.randomString; public class AddressControlUsingCoreTest extends ManagementTestBase { @@ -179,9 +175,9 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = createServer(false, conf); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); + server = createServer(false, config); server.setMBeanServer(mbeanServer); server.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java index ed5db0b5be2..53851f84be0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java @@ -16,14 +16,6 @@ */ package org.apache.activemq.artemis.tests.integration.management; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Assert; - import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; @@ -32,54 +24,24 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.api.core.Pair; import org.apache.activemq.artemis.utils.json.JSONArray; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class BroadcastGroupControlTest extends ManagementTestBase { - private ActiveMQServer service; - - // Static -------------------------------------------------------- - - public static BroadcastGroupConfiguration randomBroadcastGroupConfiguration(final List connectorInfos) - { - return new BroadcastGroupConfiguration() - .setName(RandomUtil.randomString()) - .setBroadcastPeriod(RandomUtil.randomPositiveInt()) - .setConnectorInfos(connectorInfos) - .setEndpointFactory(new UDPBroadcastEndpointFactory() - .setGroupAddress("231.7.7.7") - .setGroupPort(1199) - .setLocalBindPort(1198)); - } - - public static Pair randomPair() - { - return new Pair(RandomUtil.randomString(), RandomUtil.randomString()); - } - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- + private ActiveMQServer server; + BroadcastGroupConfiguration broadcastGroupConfig; + BroadcastGroupControl broadcastGroupControl; @Test public void testAttributes() throws Exception { - TransportConfiguration connectorConfiguration = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY); - List connectorInfos = new ArrayList(); - connectorInfos.add(connectorConfiguration.getName()); - BroadcastGroupConfiguration broadcastGroupConfig = BroadcastGroupControlTest.randomBroadcastGroupConfiguration(connectorInfos); - - Configuration conf = createBasicConfig() - .addConnectorConfiguration(connectorConfiguration.getName(), connectorConfiguration) - .addBroadcastGroupConfiguration(broadcastGroupConfig) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)); - service = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, false)); - service.start(); - - BroadcastGroupControl broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName()); - UDPBroadcastEndpointFactory udpCfg = (UDPBroadcastEndpointFactory) broadcastGroupConfig.getEndpointFactory(); Assert.assertEquals(broadcastGroupConfig.getName(), broadcastGroupControl.getName()); Assert.assertEquals(udpCfg.getGroupAddress(), broadcastGroupControl.getGroupAddress()); @@ -104,20 +66,6 @@ public void testAttributes() throws Exception @Test public void testStartStop() throws Exception { - TransportConfiguration connectorConfiguration = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY); - List connectorInfos = new ArrayList(); - connectorInfos.add(connectorConfiguration.getName()); - BroadcastGroupConfiguration broadcastGroupConfig = BroadcastGroupControlTest.randomBroadcastGroupConfiguration(connectorInfos); - - Configuration conf = createBasicConfig() - .addConnectorConfiguration(connectorConfiguration.getName(), connectorConfiguration) - .addBroadcastGroupConfiguration(broadcastGroupConfig) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)); - service = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, false)); - service.start(); - - BroadcastGroupControl broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName()); - // started by the server Assert.assertTrue(broadcastGroupControl.isStarted()); @@ -132,4 +80,32 @@ protected BroadcastGroupControl createManagementControl(final String name) throw { return ManagementControlHelper.createBroadcastGroupControl(name, mbeanServer); } + + @Override + @Before + public void setUp() throws Exception + { + super.setUp(); + + TransportConfiguration connectorConfiguration = new TransportConfiguration(NETTY_CONNECTOR_FACTORY); + List connectorInfos = new ArrayList(); + connectorInfos.add(connectorConfiguration.getName()); + broadcastGroupConfig = new BroadcastGroupConfiguration() + .setName(RandomUtil.randomString()) + .setBroadcastPeriod(RandomUtil.randomPositiveInt()) + .setConnectorInfos(connectorInfos) + .setEndpointFactory(new UDPBroadcastEndpointFactory() + .setGroupAddress("231.7.7.7") + .setGroupPort(1199) + .setLocalBindPort(1198)); + + Configuration conf = createDefaultInVMConfig() + .setJMXManagementEnabled(true) + .addConnectorConfiguration(connectorConfiguration.getName(), connectorConfiguration) + .addBroadcastGroupConfiguration(broadcastGroupConfig); + server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, false)); + server.start(); + + broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName()); + } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java index 34f046ff468..afcdfd28c3b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.management; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -108,12 +108,12 @@ public void setUp() throws Exception Map acceptorParams_1 = new HashMap(); acceptorParams_1.put(TransportConstants.PORT_PROP_NAME, port_1); - TransportConfiguration acceptorConfig_0 = new TransportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY); + TransportConfiguration acceptorConfig_0 = new TransportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY); - TransportConfiguration acceptorConfig_1 = new TransportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY, acceptorParams_1); + TransportConfiguration acceptorConfig_1 = new TransportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY, acceptorParams_1); - TransportConfiguration connectorConfig_1 = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY, acceptorParams_1); - TransportConfiguration connectorConfig_0 = new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY); + TransportConfiguration connectorConfig_1 = new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY, acceptorParams_1); + TransportConfiguration connectorConfig_0 = new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY); CoreQueueConfiguration queueConfig = new CoreQueueConfiguration() .setAddress(RandomUtil.randomString()) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java index 83e14cbb2bd..9fdbead06f9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java @@ -15,12 +15,6 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.management; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import org.junit.Assert; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.DivertControl; @@ -28,11 +22,12 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.config.DivertConfiguration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class DivertControlTest extends ManagementTestBase { @@ -41,7 +36,7 @@ public class DivertControlTest extends ManagementTestBase // Attributes ---------------------------------------------------- - private ActiveMQServer service; + private ActiveMQServer server; private DivertConfiguration divertConfig; @@ -81,8 +76,6 @@ public void setUp() throws Exception { super.setUp(); - TransportConfiguration connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName()); - CoreQueueConfiguration queueConfig = new CoreQueueConfiguration() .setAddress(RandomUtil.randomString()) .setName(RandomUtil.randomString()) @@ -99,30 +92,17 @@ public void setUp() throws Exception .setForwardingAddress(forwardQueueConfig.getAddress()) .setExclusive(RandomUtil.randomBoolean()); - Configuration conf = createBasicConfig() - .addQueueConfiguration(queueConfig) - .addQueueConfiguration(forwardQueueConfig) - .addDivertConfiguration(divertConfig) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) - .addConnectorConfiguration(connectorConfig.getName(), connectorConfig); - - service = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false); - service.start(); - } - - @Override - @After - public void tearDown() throws Exception - { - service.stop(); - - checkNoResource(ObjectNameBuilder.DEFAULT.getDivertObjectName(divertConfig.getName())); - - service = null; + TransportConfiguration connectorConfig = new TransportConfiguration(INVM_CONNECTOR_FACTORY); - divertConfig = null; + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true) + .addQueueConfiguration(queueConfig) + .addQueueConfiguration(forwardQueueConfig) + .addDivertConfiguration(divertConfig) + .addConnectorConfiguration(connectorConfig.getName(), connectorConfig); - super.tearDown(); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, false)); + server.start(); } protected DivertControl createManagementControl(final String name) throws Exception diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java index a3da04c0ae2..54567827bfe 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/JMXDomainTest.java @@ -38,7 +38,7 @@ public class JMXDomainTest extends ManagementTestBase @Test public void test2ActiveMQServersManagedFrom1MBeanServer() throws Exception { - Configuration config_0 = createDefaultConfig() + Configuration config_0 = createDefaultInVMConfig() .setJMXManagementEnabled(true); String jmxDomain_1 = ActiveMQDefaultConfiguration.getDefaultJmxDomain() + ".1"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java index 0cf3b95b5f6..d72cdae411e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.integration.management; import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.junit.Assert; @@ -38,7 +38,7 @@ import org.apache.activemq.artemis.tests.integration.server.FakeStorageManager; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class ManagementServiceImplTest extends ServiceTestBase +public class ManagementServiceImplTest extends ActiveMQTestBase { @Test public void testHandleManagementMessageWithOperation() throws Exception @@ -46,10 +46,10 @@ public void testHandleManagementMessageWithOperation() throws Exception String queue = RandomUtil.randomString(); String address = RandomUtil.randomString(); - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJMXManagementEnabled(false); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); // invoke attribute and operation on the server @@ -59,17 +59,15 @@ public void testHandleManagementMessageWithOperation() throws Exception ServerMessage reply = server.getManagementService().handleMessage(message); Assert.assertTrue(ManagementHelper.hasOperationSucceeded(reply)); - - server.stop(); } @Test public void testHandleManagementMessageWithOperationWhichFails() throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJMXManagementEnabled(false); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); // invoke attribute and operation on the server @@ -80,16 +78,15 @@ public void testHandleManagementMessageWithOperationWhichFails() throws Exceptio Assert.assertFalse(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertNotNull(ManagementHelper.getResult(reply)); - server.stop(); } @Test public void testHandleManagementMessageWithUnknowResource() throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJMXManagementEnabled(false); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); // invoke attribute and operation on the server @@ -100,16 +97,15 @@ public void testHandleManagementMessageWithUnknowResource() throws Exception Assert.assertFalse(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertNotNull(ManagementHelper.getResult(reply)); - server.stop(); } @Test public void testHandleManagementMessageWithUnknownAttribute() throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJMXManagementEnabled(false); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); // invoke attribute and operation on the server @@ -120,17 +116,16 @@ public void testHandleManagementMessageWithUnknownAttribute() throws Exception ServerMessage reply = server.getManagementService().handleMessage(message); Assert.assertTrue(ManagementHelper.hasOperationSucceeded(reply)); - Assert.assertTrue((Boolean)ManagementHelper.getResult(reply)); - server.stop(); + Assert.assertTrue((Boolean) ManagementHelper.getResult(reply)); } @Test public void testHandleManagementMessageWithKnownAttribute() throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJMXManagementEnabled(false); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); // invoke attribute and operation on the server @@ -142,15 +137,14 @@ public void testHandleManagementMessageWithKnownAttribute() throws Exception Assert.assertFalse(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertNotNull(ManagementHelper.getResult(reply)); - server.stop(); } @Test public void testGetResources() throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createBasicConfig() .setJMXManagementEnabled(false); - ManagementServiceImpl managementService = new ManagementServiceImpl(null, conf); + ManagementServiceImpl managementService = new ManagementServiceImpl(null, config); managementService.setStorageManager(new NullStorageManager()); SimpleString address = RandomUtil.randomSimpleString(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java index 8472eb9b9cf..5ee015cba43 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java @@ -30,9 +30,9 @@ import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientSession; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public abstract class ManagementTestBase extends ServiceTestBase +public abstract class ManagementTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java index b838155013c..6a19a73ef35 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java @@ -16,11 +16,8 @@ */ package org.apache.activemq.artemis.tests.integration.management; -import java.nio.ByteBuffer; - import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -35,11 +32,12 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.json.JSONArray; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.nio.ByteBuffer; + /** * This class contains tests for core management * functionalities that are affected by a server @@ -200,24 +198,24 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); + Configuration config = createDefaultInVMConfig() + .setJMXManagementEnabled(true); - server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, true)); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, true)); - AddressSettings defaultSetting = new AddressSettings(); - defaultSetting.setPageSizeBytes(5120); - defaultSetting.setMaxSizeBytes(10240); - defaultSetting.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); + AddressSettings defaultSetting = new AddressSettings() + .setPageSizeBytes(5120) + .setMaxSizeBytes(10240) + .setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE); server.getAddressSettingsRepository().addMatch("#", defaultSetting); server.start(); - locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(false); - locator.setBlockOnNonDurableSend(false); - locator.setConsumerWindowSize(0); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(false) + .setBlockOnNonDurableSend(false) + .setConsumerWindowSize(0); ClientSessionFactory sf = createSessionFactory(locator); session1 = sf.createSession(false, true, false); session1.start(); @@ -225,22 +223,6 @@ public void setUp() throws Exception session2.start(); } - @Override - @After - public void tearDown() throws Exception - { - session1.close(); - session1 = null; - session2.close(); - session2 = null; - locator.close(); - locator = null; - server.stop(); - server = null; - - super.tearDown(); - } - private class SenderThread extends Thread { private SimpleString address; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java index 065d7eb4adc..c3235b7e2cd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithStompTest.java @@ -15,24 +15,8 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.management; -import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Assert; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientSession; @@ -41,12 +25,24 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.protocol.stomp.Stomp; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.tests.util.RandomUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; public class ManagementWithStompTest extends ManagementTestBase { @@ -174,17 +170,16 @@ public void setUp() throws Exception params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT); TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(stompTransport) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); + Configuration config = createDefaultInVMConfig() + .addAcceptorConfiguration(stompTransport); - server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, false, "brianm", "wombats"); + server = addServer(ActiveMQServers.newActiveMQServer(config, mbeanServer, false, "brianm", "wombats")); server.start(); - locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnNonDurableSend(true); ClientSessionFactory sf = createSessionFactory(locator); session = sf.createSession(false, true, false); session.start(); @@ -193,23 +188,6 @@ public void setUp() throws Exception inputBuffer = new ByteArrayOutputStream(); } - @Override - @After - public void tearDown() throws Exception - { - session.close(); - - server.stop(); - - locator.close(); - - session = null; - - server = null; - - super.tearDown(); - } - // Private ------------------------------------------------------- public void sendFrame(String data) throws Exception diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java index 8f691408ba2..aa25a6ee4dc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java @@ -19,23 +19,17 @@ import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; 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.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.core.management.ManagementHelper; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -45,14 +39,14 @@ import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.CONSUMER_CLOSED; import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.CONSUMER_CREATED; -public class NotificationTest extends ServiceTestBase +public class NotificationTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- - private ActiveMQServer service; + private ActiveMQServer server; private ClientSession session; @@ -251,13 +245,10 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - // the notifications are independent of JMX - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = ActiveMQServers.newActiveMQServer(conf, false); - service.start(); + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), false)); + server.start(); - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(InVMConnectorFactory.class.getName())); + locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); session = sf.createSession(false, true, true); session.start(); @@ -269,25 +260,6 @@ public void setUp() throws Exception notifConsumer = session.createConsumer(notifQueue); } - @Override - @After - public void tearDown() throws Exception - { - notifConsumer.close(); - - session.deleteQueue(notifQueue); - session.close(); - - if (locator != null) - { - locator.close(); - } - - service.stop(); - - super.tearDown(); - } - // Private ------------------------------------------------------- private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index b96d8024e72..6362c72709f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -19,7 +19,6 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; @@ -33,7 +32,6 @@ import org.apache.activemq.artemis.api.core.management.MessageCounterInfo; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.core.management.QueueControl; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.message.impl.MessageImpl; import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -43,7 +41,6 @@ import org.apache.activemq.artemis.tests.integration.jms.server.management.JMSUtil; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.activemq.artemis.utils.json.JSONArray; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -2028,31 +2025,18 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - server = addServer(ActiveMQServers.newActiveMQServer(conf, mbeanServer, false)); + server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), mbeanServer, false)); server.start(); - locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnNonDurableSend(true); - locator.setConsumerWindowSize(0); + locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnNonDurableSend(true) + .setConsumerWindowSize(0); ClientSessionFactory sf = createSessionFactory(locator); session = sf.createSession(false, true, false); session.start(); } - @Override - @After - public void tearDown() throws Exception - { - session = null; - locator = null; - server = null; - - super.tearDown(); - } - protected QueueControl createManagementControl(final SimpleString address, final SimpleString queue) throws Exception { QueueControl queueControl = ManagementControlHelper.createQueueControl(address, queue, mbeanServer); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java index e3d303529c0..32092f294b2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.integration.management; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.core.server.ActiveMQServer; -public abstract class SecurityManagementTestBase extends ServiceTestBase +public abstract class SecurityManagementTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java index 5220bf06b71..76a5e05497c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java @@ -17,17 +17,15 @@ package org.apache.activemq.artemis.tests.integration.management; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; -import org.junit.Test; - -import java.util.Set; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.settings.HierarchicalRepository; import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; +import org.junit.Test; + +import java.util.Set; public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManagementTestBase { @@ -85,10 +83,9 @@ public void testSendManagementMessageWithoutUserCredentials() throws Exception @Override protected ActiveMQServer setupAndStartActiveMQServer() throws Exception { - Configuration conf = createBasicConfig() - .setSecurityEnabled(true) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + Configuration config = createDefaultInVMConfig() + .setSecurityEnabled(true); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl)server.getSecurityManager(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java index 14947d80abb..eb8925b6b66 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java @@ -17,13 +17,10 @@ package org.apache.activemq.artemis.tests.integration.management; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; -import org.junit.Test; - -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.junit.Test; public class SecurityManagementWithDefaultConfigurationTest extends SecurityManagementTestBase { @@ -55,11 +52,10 @@ public void testSendManagementMessageWithoutUserCredentials() throws Exception @Override protected ActiveMQServer setupAndStartActiveMQServer() throws Exception { - Configuration conf = createBasicConfig() + Configuration config = createDefaultInVMConfig() .setClusterPassword(ActiveMQDefaultConfiguration.getDefaultClusterPassword()) - .setSecurityEnabled(true) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); + .setSecurityEnabled(true); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); return server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java index ec8fc6f242b..b76104e0688 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java @@ -19,7 +19,6 @@ import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientSession; @@ -27,15 +26,13 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.core.management.ManagementHelper; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.security.CheckType; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,7 +43,7 @@ import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.SECURITY_AUTHENTICATION_VIOLATION; import static org.apache.activemq.artemis.api.core.management.CoreNotificationType.SECURITY_PERMISSION_VIOLATION; -public class SecurityNotificationTest extends ServiceTestBase +public class SecurityNotificationTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -143,12 +140,9 @@ public void setUp() throws Exception { super.setUp(); - Configuration conf = createBasicConfig() - .setSecurityEnabled(true) - // the notifications are independent of JMX - .setJMXManagementEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = ActiveMQServers.newActiveMQServer(conf, false); + Configuration config = createDefaultInVMConfig() + .setSecurityEnabled(true); + server = addServer(ActiveMQServers.newActiveMQServer(config, false)); server.start(); notifQueue = RandomUtil.randomSimpleString(); @@ -176,20 +170,6 @@ public void setUp() throws Exception notifConsumer = adminSession.createConsumer(notifQueue); } - @Override - @After - public void tearDown() throws Exception - { - notifConsumer.close(); - - adminSession.deleteQueue(notifQueue); - adminSession.close(); - - server.stop(); - - super.tearDown(); - } - // Private ------------------------------------------------------- private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java index 193b0ccbcf9..1231e3e0c96 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.api.jms.management.JMSServerControl; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.security.Role; @@ -44,7 +44,7 @@ import org.junit.After; import org.junit.Before; -public class OpenWireTestBase extends ServiceTestBase +public class OpenWireTestBase extends ActiveMQTestBase { public static final String OWHOST = "localhost"; public static final int OWPORT = 61616; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java index 6b2f15df045..97797c32f3f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MultipleProducersPagingTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; @@ -52,7 +52,7 @@ import org.junit.Before; import org.junit.Test; -public class MultipleProducersPagingTest extends ServiceTestBase +public class MultipleProducersPagingTest extends ActiveMQTestBase { private static final int CONSUMER_WAIT_TIME_MS = 250; private static final int PRODUCERS = 5; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java index 8c1020bcf65..fb008a12b11 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PageCountSyncOnNonTXTest.java @@ -26,11 +26,11 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; 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.Before; import org.junit.Test; -public class PageCountSyncOnNonTXTest extends ServiceTestBase +public class PageCountSyncOnNonTXTest extends ActiveMQTestBase { // We will add a random factor on the wait time diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java index 720f8f5f3bd..30ff1f0b8d4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java @@ -22,7 +22,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter; import org.apache.activemq.artemis.core.paging.cursor.impl.PageSubscriptionCounterImpl; @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Test; -public class PagingCounterTest extends ServiceTestBase +public class PagingCounterTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java index 56014b8bdcc..992ddde935f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java @@ -23,7 +23,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; 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; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; -public class PagingReceiveTest extends ServiceTestBase +public class PagingReceiveTest extends ActiveMQTestBase { private static final SimpleString ADDRESS = new SimpleString("jms.queue.catalog-service.price.change.bm"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java index 840f0ae92a2..3acf879ec00 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java @@ -34,7 +34,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -46,7 +46,7 @@ import org.junit.Before; import org.junit.Test; -public class PagingSendTest extends ServiceTestBase +public class PagingSendTest extends ActiveMQTestBase { public static final SimpleString ADDRESS = new SimpleString("SimpleAddress"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java index 2b8487b5942..1d40dd17623 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Test; -public class PagingWithFailoverAndCountersTest extends ServiceTestBase +public class PagingWithFailoverAndCountersTest extends ActiveMQTestBase { Process liveProcess; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java index 7dce83fe319..bfd5fd9e189 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/SpawnedServerSupport.java @@ -36,7 +36,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers; 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; /** * Support class for server that are using an external process on the testsuite @@ -46,8 +46,7 @@ public class SpawnedServerSupport static ActiveMQServer createServer(String folder) { - Configuration conf = createConfig(folder); - return ActiveMQServers.newActiveMQServer(conf, true); + return ActiveMQServers.newActiveMQServer(createConfig(folder), true); } static Configuration createConfig(String folder) @@ -58,23 +57,23 @@ static Configuration createConfig(String folder) settings.setPageSizeBytes(10 * 1024); settings.setMaxSizeBytes(100 * 1024); - Configuration conf = new ConfigurationImpl() + Configuration config = new ConfigurationImpl() .setSecurityEnabled(false) .setJournalMinFiles(2) .setJournalFileSize(100 * 1024) - .setJournalType(ServiceTestBase.getDefaultJournalType()) + .setJournalType(ActiveMQTestBase.getDefaultJournalType()) .setJournalCompactMinFiles(0) .setJournalCompactPercentage(0) - .setClusterPassword(ServiceTestBase.CLUSTER_PASSWORD) - .setJournalDirectory(ServiceTestBase.getJournalDir(folder, 0, false)) - .setBindingsDirectory(ServiceTestBase.getBindingsDir(folder, 0, false)) - .setPagingDirectory(ServiceTestBase.getPageDir(folder, 0, false)) - .setLargeMessagesDirectory(ServiceTestBase.getLargeMessagesDir(folder, 0, false)) + .setClusterPassword(ActiveMQTestBase.CLUSTER_PASSWORD) + .setJournalDirectory(ActiveMQTestBase.getJournalDir(folder, 0, false)) + .setBindingsDirectory(ActiveMQTestBase.getBindingsDir(folder, 0, false)) + .setPagingDirectory(ActiveMQTestBase.getPageDir(folder, 0, false)) + .setLargeMessagesDirectory(ActiveMQTestBase.getLargeMessagesDir(folder, 0, false)) .setPersistenceEnabled(true) .addAddressesSetting("#", settings) - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY)); - return conf; + return config; } static Configuration createSharedFolderConfig(String folder, int thisport, int otherport, boolean isBackup) @@ -91,7 +90,7 @@ static Configuration createSharedFolderConfig(String folder, int thisport, int o haPolicyConfiguration = new SharedStoreMasterPolicyConfiguration(); } - Configuration conf = createConfig(folder) + Configuration config = createConfig(folder) .clearAcceptorConfigurations() .setJournalFileSize(15 * 1024 * 1024) .addAcceptorConfiguration(createTransportConfigiguration(true, thisport)) @@ -101,7 +100,7 @@ static Configuration createSharedFolderConfig(String folder, int thisport, int o .addClusterConfiguration(isBackup ? setupClusterConn("thisServer", "otherServer") : setupClusterConn("thisServer")) .setHAPolicyConfiguration(haPolicyConfiguration); - return conf; + return config; } protected static final ClusterConnectionConfiguration setupClusterConn(String connectorName, String... connectors) @@ -153,7 +152,6 @@ static TransportConfiguration createTransportConfigiguration(boolean acceptor, i static ActiveMQServer createSharedFolderServer(String folder, int thisPort, int otherPort, boolean isBackup) { - Configuration conf = createSharedFolderConfig(folder, thisPort, otherPort, isBackup); - return ActiveMQServers.newActiveMQServer(conf, true); + return ActiveMQServers.newActiveMQServer(createSharedFolderConfig(folder, thisPort, otherPort, isBackup), true); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java index c7ae62283ee..d3deffb3716 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage; -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 DeleteQueueRestartTest extends ServiceTestBase +public class DeleteQueueRestartTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java index 87ccd0201a3..0f7c9781aa0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java @@ -27,11 +27,11 @@ import org.apache.activemq.artemis.cli.commands.tools.DecodeJournal; import org.apache.activemq.artemis.cli.commands.tools.EncodeJournal; 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.Ignore; import org.junit.Test; -public class ExportFormatTest extends ServiceTestBase +public class ExportFormatTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java index 96e6bdc4f93..0e003b027c0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java @@ -15,28 +15,28 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.persistence; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.persistence.GroupingInfo; import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.postoffice.PostOffice; import org.apache.activemq.artemis.core.server.Queue; +import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeJournalLoader; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ExecutorFactory; import org.junit.Before; import org.junit.Test; -public class RestartSMTest extends ServiceTestBase +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; + +public class RestartSMTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -69,11 +69,9 @@ public void testRestartStorageManager() throws Exception File testdir = new File(getTestDir()); deleteDirectory(testdir); - Configuration configuration = createDefaultConfig(); - PostOffice postOffice = new FakePostOffice(); - final JournalStorageManager journal = new JournalStorageManager(configuration, execFactory, null); + final JournalStorageManager journal = new JournalStorageManager(createDefaultInVMConfig(), execFactory, null); try { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java index 9fcf90da422..66a93b0d354 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java @@ -15,27 +15,25 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.persistence; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.persistence.GroupingInfo; import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.jms.persistence.JMSStorageManager; import org.apache.activemq.artemis.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeJournalLoader; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ExecutorFactory; import org.apache.activemq.artemis.utils.TimeAndCounterIDGenerator; import org.junit.After; import org.junit.Before; -public abstract class StorageManagerTestBase extends ServiceTestBase +import java.util.ArrayList; +import java.util.concurrent.ExecutorService; + +public abstract class StorageManagerTestBase extends ActiveMQTestBase { protected ExecutorService executor; @@ -100,16 +98,12 @@ public void tearDown() throws Exception */ protected void createStorage() throws Exception { - Configuration configuration = createDefaultConfig(); - - journal = createJournalStorageManager(configuration); + journal = createJournalStorageManager(createDefaultInVMConfig()); journal.start(); journal.loadBindingJournal(new ArrayList(), new ArrayList()); - Map queues = new HashMap(); - journal.loadMessageJournal(new FakePostOffice(), null, null, null, null, null, null, new FakeJournalLoader()); } @@ -128,9 +122,7 @@ protected JournalStorageManager createJournalStorageManager(Configuration config */ protected void createJMSStorage() throws Exception { - Configuration configuration = createDefaultConfig(); - - jmsJournal = new JMSJournalStorageManagerImpl(new TimeAndCounterIDGenerator(), configuration, null); + jmsJournal = new JMSJournalStorageManagerImpl(new TimeAndCounterIDGenerator(), createDefaultInVMConfig(), null); jmsJournal.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java index 98061d10c4c..4054da097ad 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java @@ -49,14 +49,14 @@ import org.apache.activemq.artemis.jms.server.JMSServerManager; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.artemis.tests.unit.util.InVMContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Test; /** * A test of the XML export/import functionality */ -public class XmlImportExportTest extends ServiceTestBase +public class XmlImportExportTest extends ActiveMQTestBase { public static final int CONSUMER_TIMEOUT = 5000; private static final String QUEUE_NAME = "A1"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java index 61871e3f79e..57777a3a8e6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java @@ -41,7 +41,7 @@ import java.util.Random; import org.apache.activemq.artemis.api.core.management.ResourceNames; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; import org.apache.qpid.amqp_1_0.client.Receiver; import org.apache.qpid.amqp_1_0.client.Sender; @@ -64,7 +64,7 @@ import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -public class ProtonTest extends ServiceTestBase +public class ProtonTest extends ActiveMQTestBase { // this will ensure that all tests in this class are run twice, diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java index 397bf520c8b..c4be828b1fd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java @@ -20,9 +20,9 @@ import org.junit.Test; import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class ActiveMQActivationTest extends ServiceTestBase +public class ActiveMQActivationTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java index 45fc6cb078d..3b00f93143c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRAClusteredTestBase.java @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; public class ActiveMQRAClusteredTestBase extends ActiveMQRATestBase @@ -45,9 +45,8 @@ public void setUp() throws Exception HashMap params = new HashMap(); params.put(TransportConstants.SERVER_ID_PROP_NAME, "1"); secondaryConnector = new TransportConfiguration(INVM_CONNECTOR_FACTORY, params); - Configuration conf = createSecondaryDefaultConfig(true, true); - secondaryServer = ActiveMQServers.newActiveMQServer(conf, mbeanServer, usePersistence()); + secondaryServer = ActiveMQServers.newActiveMQServer(createSecondaryDefaultConfig(true, true), mbeanServer, usePersistence()); addServer(secondaryServer); secondaryJmsServer = new JMSServerManagerImpl(secondaryServer); secondaryJmsServer.start(); @@ -64,8 +63,7 @@ public void tearDown() throws Exception protected Configuration createDefaultConfig(boolean netty) throws Exception { - Configuration conf = createSecondaryDefaultConfig(netty, false); - return conf; + return createSecondaryDefaultConfig(netty, false); } protected Configuration createSecondaryDefaultConfig(boolean netty, boolean secondary) throws Exception @@ -85,7 +83,7 @@ protected Configuration createSecondaryDefaultConfig(boolean netty, boolean seco directoryPrefix = "second"; } - ConfigurationImpl configuration = createBasicConfig(-1) + ConfigurationImpl configuration = createBasicConfig() .setJMXManagementEnabled(false) .clearAcceptorConfigurations() .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, invmMap)) @@ -96,7 +94,7 @@ protected Configuration createSecondaryDefaultConfig(boolean netty, boolean seco .setPagingDirectory(getTestDir() + "/" + directoryPrefix + "Page / ") .addConnectorConfiguration(secondaryConnectorName, secondaryConnector) .addConnectorConfiguration(primaryConnectorName, primaryConnector) - .addClusterConfiguration(ServiceTestBase.basicClusterConnectionConfig(secondaryConnectorName, primaryConnectorName)); + .addClusterConfiguration(ActiveMQTestBase.basicClusterConnectionConfig(secondaryConnectorName, primaryConnectorName)); return configuration; } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java index 52b078c4377..6541dbebde7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/BatchDelayTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.remoting; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; @@ -36,7 +36,7 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; -public class BatchDelayTest extends ServiceTestBase +public class BatchDelayTest extends ActiveMQTestBase { private static final int N = 1000; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java index 25b1613f3e4..e5562b91cfd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.artemis.tests.integration.remoting; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; -public class DestroyConsumerTest extends ServiceTestBase +public class DestroyConsumerTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -39,7 +39,7 @@ public void testFoo() // public void testDestroyConsumer() throws Exception // { - // ActiveMQServer server = createService(false, false, createDefaultConfig(), new HashMap()); + // ActiveMQServer server = createService(false, false, createDefaultInVMConfig(), new HashMap()); // server.start(); // // SimpleString queue = new SimpleString("add1"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java index 84ba78e61cd..890066cf894 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.remoting; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -41,7 +41,7 @@ import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.impl.QueueImpl; -public class DirectDeliverTest extends ServiceTestBase +public class DirectDeliverTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java index 03712b04fc5..2b3a7112e36 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java @@ -31,14 +31,14 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.junit.Assert; import org.junit.Test; -public abstract class NetworkAddressTestBase extends ServiceTestBase +public abstract class NetworkAddressTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -208,7 +208,7 @@ public void testConnection(final String acceptorHost, final String connectorHost Set transportConfigs = new HashSet(); transportConfigs.add(acceptorConfig); - Configuration config = createDefaultConfig(true); + Configuration config = createDefaultNettyConfig(); config.setAcceptorConfigurations(transportConfigs); ActiveMQServer messagingService = createServer(false, config); try diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java index ec8db4c411e..1b8172e4f46 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java @@ -17,38 +17,34 @@ package org.apache.activemq.artemis.tests.integration.remoting; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; -import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping; -import org.junit.Before; - -import org.junit.Test; - -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import org.junit.Assert; - import org.apache.activemq.artemis.api.core.Interceptor; 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.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; -import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.core.client.SessionFailureListener; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.Ping; import org.apache.activemq.artemis.core.remoting.CloseListener; import org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; -public class PingTest extends ServiceTestBase +public class PingTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -71,8 +67,7 @@ public class PingTest extends ServiceTestBase public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig(true); - server = createServer(false, config); + server = createServer(false, createDefaultNettyConfig()); server.start(); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java index defa36a2ec1..fd681e21e07 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java @@ -32,9 +32,9 @@ import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -public class ReconnectTest extends ServiceTestBase +public class ReconnectTest extends ActiveMQTestBase { @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java index 17625f30caa..afc61abcb41 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.integration.remoting; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -30,7 +30,7 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; -public class SynchronousCloseTest extends ServiceTestBase +public class SynchronousCloseTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -67,11 +67,11 @@ protected ClientSessionFactory createSessionFactory() throws Exception ServerLocator locator; if (isNetty()) { - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY)); + locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY)); } else { - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY)); } return createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java index ddb0aead371..e45a905927f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java @@ -68,7 +68,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.util.ReplicatedBackupUtils; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils; import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.apache.activemq.artemis.utils.ExecutorFactory; @@ -92,7 +92,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public final class ReplicationTest extends ServiceTestBase +public final class ReplicationTest extends ActiveMQTestBase { private ThreadFactory tFactory; @@ -139,9 +139,9 @@ private void setupServer(boolean useNetty, boolean backup, backupAcceptor = TransportConfigurationUtils.getInVMAcceptor(false); } - Configuration liveConfig = createDefaultConfig(); + Configuration liveConfig = createDefaultInVMConfig(); - Configuration backupConfig = createDefaultConfig() + Configuration backupConfig = createDefaultInVMConfig() .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration()) .setBindingsDirectory(getBindingsDir(0, true)) .setJournalDirectory(getJournalDir(0, true)) @@ -176,7 +176,7 @@ private void setupServer(boolean useNetty, boolean backup, backupServer.start(); if (backup) { - ServiceTestBase.waitForRemoteBackup(null, 5, true, backupServer); + ActiveMQTestBase.waitForRemoteBackup(null, 5, true, backupServer); } int count = 0; waitForReplication(count); @@ -479,7 +479,7 @@ public void config(Configuration liveConfig, Configuration backupConfig) */ private JournalStorageManager getStorage() throws Exception { - return new JournalStorageManager(createDefaultConfig(), factory, null); + return new JournalStorageManager(createDefaultInVMConfig(), factory, null); } /** diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java index cff46fd9275..21f1696daac 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java @@ -22,22 +22,19 @@ 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.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class DelayedMessageTest extends ServiceTestBase +public class DelayedMessageTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private Configuration configuration; - private ActiveMQServer server; private static final long DELAY = 3000; @@ -59,10 +56,7 @@ public void setUp() throws Exception */ protected void initServer() throws Exception { - configuration = createDefaultConfig() - .setSecurityEnabled(false) - .setJournalMinFiles(2); - server = createServer(true, configuration); + server = createServer(true, createDefaultInVMConfig()); server.start(); AddressSettings qs = server.getAddressSettingsRepository().getMatch("*"); @@ -87,7 +81,7 @@ public void testDelayedRedeliveryDefaultOnClose() throws Exception final int NUM_MESSAGES = 5; - ServiceTestBase.forceGC(); + ActiveMQTestBase.forceGC(); for (int i = 0; i < NUM_MESSAGES; i++) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java index 7ffef991a62..76359205d37 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java @@ -22,22 +22,19 @@ 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.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class MultipliedDelayedMessageTest extends ServiceTestBase +public class MultipliedDelayedMessageTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; - private Configuration configuration; - private ActiveMQServer server; private static final long DELAY = 1000; @@ -63,18 +60,15 @@ public void setUp() throws Exception */ protected void initServer() throws Exception { - configuration = createDefaultConfig() - .setSecurityEnabled(false) - .setJournalMinFiles(2); - server = createServer(true, configuration); + server = createServer(true, createDefaultInVMConfig()); server.start(); // Create settings to enable multiplied redelivery delay AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch("*"); - AddressSettings newAddressSettings = new AddressSettings(); - newAddressSettings.setRedeliveryDelay(DELAY); - newAddressSettings.setRedeliveryMultiplier(MULTIPLIER); - newAddressSettings.setMaxRedeliveryDelay(MAX_DELAY); + AddressSettings newAddressSettings = new AddressSettings() + .setRedeliveryDelay(DELAY) + .setRedeliveryMultiplier(MULTIPLIER) + .setMaxRedeliveryDelay(MAX_DELAY); newAddressSettings.merge(addressSettings); server.getAddressSettingsRepository().addMatch(queueName, newAddressSettings); locator = createInVMNonHALocator(); @@ -93,7 +87,7 @@ public void testMultipliedDelayedRedeliveryOnClose() throws Exception // Session for sending the message session = sessionFactory.createSession(false, true, true); ClientProducer producer = session.createProducer(queueName); - ServiceTestBase.forceGC(); + ActiveMQTestBase.forceGC(); ClientMessage tm = createDurableMessage(session, "message"); producer.send(tm); session.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java index 377166b5649..180bd358e91 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java @@ -30,7 +30,7 @@ import org.apache.activemq.artemis.core.transaction.impl.XidImpl; import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Before; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; -public class ScheduledMessageTest extends ServiceTestBase +public class ScheduledMessageTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -68,9 +68,7 @@ public void setUp() throws Exception */ protected void startServer() throws Exception { - configuration = createDefaultConfig() - .setSecurityEnabled(false) - .setJournalMinFiles(2); + configuration = createDefaultInVMConfig(); server = createServer(true, configuration); server.start(); locator = createInVMNonHALocator(); @@ -751,8 +749,8 @@ public void testScheduledDeliveryNoTX() throws Exception @Test public void testRedeliveryAfterPrepare() throws Exception { - AddressSettings qs = new AddressSettings(); - qs.setRedeliveryDelay(5000L); + AddressSettings qs = new AddressSettings() + .setRedeliveryDelay(5000L); server.getAddressSettingsRepository().addMatch(atestq.toString(), qs); ClientSessionFactory sessionFactory = createSessionFactory(locator); @@ -797,9 +795,7 @@ public void testRedeliveryAfterPrepare() throws Exception server.stop(); - configuration = createDefaultConfig() - .setSecurityEnabled(false) - .setJournalMinFiles(2) + configuration = createDefaultInVMConfig() .addAddressesSetting(atestq.toString(), qs); server = createServer(true, configuration); @@ -863,7 +859,7 @@ public void run() private void scheduledDelivery(final boolean tx) throws Exception { - ServiceTestBase.forceGC(); + ActiveMQTestBase.forceGC(); Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java index 417306b0b11..6ec0ee47d69 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/NettySecurityClientTest.java @@ -23,13 +23,13 @@ import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.SpawnedVMSupport; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class NettySecurityClientTest extends ServiceTestBase +public class NettySecurityClientTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java index 0ad440e3283..d34756390d3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.util.CreateMessage; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -42,7 +42,7 @@ import org.junit.Before; import org.junit.Test; -public class SecurityTest extends ServiceTestBase +public class SecurityTest extends ActiveMQTestBase { /* * create session tests @@ -92,7 +92,7 @@ public void testCreateSessionWithNullUserPass() throws Exception */ private ActiveMQServer createServer() throws Exception { - configuration = createDefaultConfig() + configuration = createDefaultInVMConfig() .setSecurityEnabled(true); ActiveMQServer server = createServer(false, configuration); return server; @@ -569,7 +569,7 @@ public void testCreateConsumerWithoutRole() throws Exception @Test public void testSendMessageUpdateRoleCached() throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setSecurityEnabled(true) .setSecurityInvalidationInterval(10000); ActiveMQServer server = createServer(false, configuration); @@ -625,7 +625,7 @@ public void testSendMessageUpdateRoleCached() throws Exception @Test public void testSendMessageUpdateRoleCached2() throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setSecurityEnabled(true) .setSecurityInvalidationInterval(0); ActiveMQServer server = createServer(false, configuration); @@ -695,7 +695,7 @@ public void testSendMessageUpdateRoleCached2() throws Exception @Test public void testSendMessageUpdateSender() throws Exception { - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .setSecurityEnabled(true) .setSecurityInvalidationInterval(-1); ActiveMQServer server = createServer(false, configuration); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java index d948b888893..5a8248c7122 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/AddressFullLoggingTest.java @@ -34,13 +34,13 @@ import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.logs.AssertionLoggerHandler; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -public class AddressFullLoggingTest extends ServiceTestBase +public class AddressFullLoggingTest extends ActiveMQTestBase { @BeforeClass public static void prepareLogger() diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ConnectionLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ConnectionLimitTest.java index fc9f5f150fa..7f502f1c957 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ConnectionLimitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ConnectionLimitTest.java @@ -26,14 +26,14 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; import java.util.HashMap; import java.util.Map; -public class ConnectionLimitTest extends ServiceTestBase +public class ConnectionLimitTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java index cbeb2255747..df74ade0804 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java @@ -30,7 +30,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -41,7 +41,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class ExpiryRunnerTest extends ServiceTestBase +public class ExpiryRunnerTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -262,7 +262,7 @@ public void setUp() throws Exception ConfigurationImpl configuration = createBasicConfig() .setMessageExpiryScanPeriod(1000) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)); + .addAcceptorConfiguration(new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY)); server = ActiveMQServers.newActiveMQServer(configuration, false); // start the server server.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java index edc9f541cb5..6cf0bd7c8a0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FileLockTimeoutTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ha.SharedStoreMasterPolicyConfiguration; @@ -33,7 +33,7 @@ import org.junit.Assert; import org.junit.BeforeClass; -public class FileLockTimeoutTest extends ServiceTestBase +public class FileLockTimeoutTest extends ActiveMQTestBase { @BeforeClass public static void prepareLogger() @@ -56,7 +56,7 @@ protected void doTest(final boolean useAIO) throws Exception AsynchronousFileImpl.isLoaded() ); } - Configuration config = super.createDefaultConfig() + Configuration config = super.createDefaultInVMConfig() .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration()) .clearAcceptorConfigurations(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java index ddd2bc0f8cd..3d57cb5d320 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/GracefulShutdownTest.java @@ -27,23 +27,22 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; -public class GracefulShutdownTest extends ServiceTestBase +public class GracefulShutdownTest extends ActiveMQTestBase { @Test public void testGracefulShutdown() throws Exception { - Configuration conf = createDefaultConfig(); - - conf.setGracefulShutdownEnabled(true); + Configuration conf = createDefaultInVMConfig() + .setGracefulShutdownEnabled(true); final ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); server.start(); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY)); ClientSessionFactory sf = createSessionFactory(locator); @@ -117,21 +116,18 @@ public void testGracefulShutdownWithTimeout() throws Exception { long timeout = 10000; - Configuration conf = createDefaultConfig(); - - conf.setGracefulShutdownEnabled(true); - conf.setGracefulShutdownTimeout(timeout); + Configuration conf = createDefaultInVMConfig() + .setGracefulShutdownEnabled(true) + .setGracefulShutdownTimeout(timeout); final ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); server.start(); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY)); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(); - Thread t = new Thread(new Runnable() { public void run() diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java index de24818e3a6..bda6cb36e1e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQRecoveryTest.java @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.transaction.impl.XidImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -38,7 +38,7 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -public class LVQRecoveryTest extends ServiceTestBase +public class LVQRecoveryTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -218,20 +218,17 @@ public void setUp() throws Exception { super.setUp(); - configuration = createDefaultConfig() - .setSecurityEnabled(false); + configuration = createDefaultInVMConfig(); server = createServer(true, configuration); - // start the server server.start(); qs = new AddressSettings(); qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - locator = createInVMNonHALocator(); - - locator.setBlockOnAcknowledge(true); - locator.setAckBatchSize(0); + locator = createInVMNonHALocator() + .setBlockOnAcknowledge(true) + .setAckBatchSize(0); ClientSessionFactory sessionFactory = createSessionFactory(locator); clientSession = sessionFactory.createSession(false, true, true); clientSessionXa = sessionFactory.createSession(true, false, false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java index 83a432e4a3a..d6985eb0610 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/LVQTest.java @@ -31,13 +31,13 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class LVQTest extends ServiceTestBase +public class LVQTest extends ActiveMQTestBase { private ActiveMQServer server; @@ -672,7 +672,7 @@ public void setUp() throws Exception super.setUp(); ConfigurationImpl configuration = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)); + .addAcceptorConfiguration(new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY)); server = ActiveMQServers.newActiveMQServer(configuration, false); // start the server server.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java index bf20cc8fca0..7fba66a7054 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java @@ -16,39 +16,46 @@ */ package org.apache.activemq.artemis.tests.integration.server; -import java.util.ArrayList; -import java.util.List; - import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; 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.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.postoffice.Bindings; 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.junit.Assert; +import org.junit.Before; import org.junit.Test; -public class PredefinedQueueTest extends ServiceTestBase +import java.util.ArrayList; +import java.util.List; + +public class PredefinedQueueTest extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; + private Configuration configuration = null; + + @Override + @Before + public void setUp() throws Exception + { + super.setUp(); + configuration = createDefaultInVMConfig(); + } + @Test public void testFailOnCreatePredefinedQueues() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String queueName1 = "queue1"; @@ -75,17 +82,17 @@ public void testFailOnCreatePredefinedQueues() throws Exception queueConfs.add(queue2); queueConfs.add(queue3); - conf.setQueueConfigurations(queueConfs); + configuration.setQueueConfigurations(queueConfs); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); server.start(); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); + ClientSession session = addClientSession(sf.createSession(false, true, true)); try { @@ -129,21 +136,11 @@ public void testFailOnCreatePredefinedQueues() throws Exception { fail("Invalid Exception type:" + e.getType()); } - - session.close(); - - sf.close(); - - locator.close(); - - server.stop(); } @Test public void testDeploySameNames() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String queueName1 = "queue1"; @@ -158,36 +155,31 @@ public void testDeploySameNames() throws Exception .setAddress(testAddress) .setName(queueName2); - List queueConfs = new ArrayList(); + configuration + .addQueueConfiguration(queue1) + .addQueueConfiguration(queue2); - queueConfs.add(queue1); - queueConfs.add(queue2); - - conf.setQueueConfigurations(queueConfs); - - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); server.start(); - Bindings bindings = server.getPostOffice() - .getBindingsForAddress(new SimpleString(testAddress)); + Bindings bindings = server.getPostOffice().getBindingsForAddress(new SimpleString(testAddress)); - Assert.assertEquals(2, bindings.getBindings() - .size()); + Assert.assertEquals(2, bindings.getBindings().size()); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); + ClientSession session = addClientSession(sf.createSession(false, true, true)); session.start(); - ClientProducer producer = session.createProducer(new SimpleString(testAddress)); + ClientProducer producer = addClientProducer(session.createProducer(new SimpleString(testAddress))); - ClientConsumer consumer1 = session.createConsumer(queueName1); + ClientConsumer consumer1 = addClientConsumer(session.createConsumer(queueName1)); - ClientConsumer consumer2 = session.createConsumer(queueName2); + ClientConsumer consumer2 = addClientConsumer(session.createConsumer(queueName2)); final int numMessages = 10; @@ -217,21 +209,11 @@ public void testDeploySameNames() throws Exception Assert.assertNull(consumer1.receiveImmediate()); Assert.assertNull(consumer2.receiveImmediate()); - - session.close(); - - sf.close(); - - locator.close(); - - server.stop(); } @Test public void testDeployPreexistingQueues() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String queueName1 = "queue1"; @@ -240,15 +222,15 @@ public void testDeployPreexistingQueues() throws Exception final String queueName3 = "queue3"; - ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(conf)); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(configuration)); server.start(); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); + ClientSession session = addClientSession(sf.createSession(false, true, true)); session.createQueue(testAddress, queueName1, null, true); @@ -274,19 +256,16 @@ public void testDeployPreexistingQueues() throws Exception .setAddress(testAddress) .setName(queueName3); - List queueConfs = new ArrayList(); - - queueConfs.add(queue1); - queueConfs.add(queue2); - queueConfs.add(queue3); - - conf.setQueueConfigurations(queueConfs); + configuration + .addQueueConfiguration(queue1) + .addQueueConfiguration(queue2) + .addQueueConfiguration(queue3); server.start(); sf = createSessionFactory(locator); - session = sf.createSession(false, true, true); + session = addClientSession(sf.createSession(false, true, true)); session.start(); @@ -332,21 +311,11 @@ public void testDeployPreexistingQueues() throws Exception Assert.assertNull(consumer1.receiveImmediate()); Assert.assertNull(consumer2.receiveImmediate()); Assert.assertNull(consumer3.receiveImmediate()); - - session.close(); - - sf.close(); - - locator.close(); - - server.stop(); } @Test public void testDurableNonDurable() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String queueName1 = "queue1"; @@ -367,9 +336,11 @@ public void testDurableNonDurable() throws Exception queueConfs.add(queue1); queueConfs.add(queue2); - conf.setQueueConfigurations(queueConfs); + configuration + .addQueueConfiguration(queue1) + .addQueueConfiguration(queue2); - ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(conf)); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(configuration)); server.start(); @@ -377,7 +348,7 @@ public void testDurableNonDurable() throws Exception ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); + ClientSession session = addClientSession(sf.createSession(false, true, true)); ClientProducer producer = session.createProducer(new SimpleString(testAddress)); @@ -408,7 +379,7 @@ public void testDurableNonDurable() throws Exception sf = createSessionFactory(locator); - session = sf.createSession(false, true, true); + session = addClientSession(sf.createSession(false, true, true)); session.start(); @@ -430,21 +401,11 @@ public void testDurableNonDurable() throws Exception Assert.assertNull(consumer1.receiveImmediate()); Assert.assertNull(consumer2.receiveImmediate()); - - session.close(); - - sf.close(); - - locator.close(); - - server.stop(); } @Test public void testDeployWithFilter() throws Exception { - Configuration conf = createDefaultConfig(); - final String testAddress = "testAddress"; final String queueName1 = "queue1"; @@ -457,21 +418,17 @@ public void testDeployWithFilter() throws Exception .setFilterString(filter) .setDurable(false); - List queueConfs = new ArrayList(); - - queueConfs.add(queue1); - - conf.setQueueConfigurations(queueConfs); + configuration.addQueueConfiguration(queue1); - ActiveMQServer server = ActiveMQServers.newActiveMQServer(conf, false); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); server.start(); - ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory sf = createSessionFactory(locator); - ClientSession session = sf.createSession(false, true, true); + ClientSession session = addClientSession(sf.createSession(false, true, true)); ClientProducer producer = session.createProducer(new SimpleString(testAddress)); @@ -518,14 +475,6 @@ public void testDeployWithFilter() throws Exception } Assert.assertNull(consumer1.receiveImmediate()); - - session.close(); - - sf.close(); - - locator.close(); - - server.stop(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java index b96b9bcc1bd..e585d33a442 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java @@ -26,11 +26,11 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings; -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 ResourceLimitTest extends ServiceTestBase +public class ResourceLimitTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java index 0b76a60a270..3a4af0ec957 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDown3NodeTest.java @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -149,7 +149,7 @@ private void testBasicScaleDownInternal(int reconnectAttempts, boolean large) th for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { - fileMessage.addBytes(new byte[]{ServiceTestBase.getSamplebyte(i)}); + fileMessage.addBytes(new byte[]{ActiveMQTestBase.getSamplebyte(i)}); } fileMessage.putLongProperty(Message.HDR_LARGE_BODY_SIZE, 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); @@ -254,7 +254,7 @@ private void testBasicScaleDownInternal(int reconnectAttempts, boolean large) th for (int j = 0; j < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; j++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(j), clientMessage.getBodyBuffer().readByte()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(j), clientMessage.getBodyBuffer().readByte()); } } IntegrationTestLogger.LOGGER.info("Received: " + clientMessage); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java index 65a3af52b8a..61a584de91a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -414,7 +414,7 @@ public void testLargeMessage() throws Exception for (int i = 0; i < 2 * ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { byte byteRead = msg.getBodyBuffer().readByte(); - Assert.assertEquals(msg + " Is different", ServiceTestBase.getSamplebyte(i), byteRead); + Assert.assertEquals(msg + " Is different", ActiveMQTestBase.getSamplebyte(i), byteRead); } msg.acknowledge(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java index 17fec0ae2f0..7314aa1a8b2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SimpleStartStopTest.java @@ -23,11 +23,11 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.jboss.logmanager.Level; import org.junit.Test; -public class SimpleStartStopTest extends ServiceTestBase +public class SimpleStartStopTest extends ActiveMQTestBase { /** diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java index 64f4ef3b720..6cc21e605ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.artemis.core.server.impl.ServiceRegistry; @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; -public class SuppliedThreadPoolTest extends ServiceTestBase +public class SuppliedThreadPoolTest extends ActiveMQTestBase { private ActiveMQServer server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java index 1bd1e42f02e..f46d49d398e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/spring/SpringIntegrationTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; import org.junit.Assert; @@ -29,7 +29,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.jms.listener.DefaultMessageListenerContainer; -public class SpringIntegrationTest extends ServiceTestBase +public class SpringIntegrationTest extends ActiveMQTestBase { IntegrationTestLogger log = IntegrationTestLogger.LOGGER; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java index 1c3cd7b695a..c87038986db 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java @@ -37,7 +37,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; @@ -50,7 +50,7 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class CoreClientOverOneWaySSLTest extends ServiceTestBase +public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "storeType={0}") public static Collection getParameters() diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java index 2ffaabfd742..dab129f5572 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java @@ -37,7 +37,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; 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.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; @@ -52,7 +52,7 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class CoreClientOverTwoWaySSLTest extends ServiceTestBase +public class CoreClientOverTwoWaySSLTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "storeType={0}") public static Collection getParameters() diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java index f40d4bb7705..6dab7f4f30b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java @@ -51,7 +51,7 @@ import io.netty.handler.codec.string.StringEncoder; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; @@ -72,7 +72,7 @@ import org.junit.After; import org.junit.Before; -public abstract class StompTestBase extends ServiceTestBase +public abstract class StompTestBase extends ActiveMQTestBase { protected final int port = 61613; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java index 4db04656b50..563a5d0c161 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWebSocketTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.activemq.artemis.api.core.TransportConfiguration; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory; @@ -37,7 +37,7 @@ import org.junit.Before; import org.junit.Test; -public class StompWebSocketTest extends ServiceTestBase +public class StompWebSocketTest extends ActiveMQTestBase { private JMSServerManager server; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java index 4e884c8c550..cfb2d6b19a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.integration.stomp.v11; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.junit.Before; import org.junit.After; @@ -52,7 +52,7 @@ import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; -public abstract class StompV11TestBase extends ServiceTestBase +public abstract class StompV11TestBase extends ActiveMQTestBase { protected String hostname = "127.0.0.1"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java index defb6739141..bd9471d4f33 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/ActiveMQFrameDecoder2Test.java @@ -23,14 +23,14 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.remoting.impl.netty.ActiveMQFrameDecoder2; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ActiveMQFrameDecoder2Test extends ServiceTestBase +public class ActiveMQFrameDecoder2Test extends ActiveMQTestBase { private static final int MSG_CNT = 10000; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java index e3ccde32125..852097da5a1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java @@ -45,7 +45,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.artemis.core.remoting.impl.netty.PartialPooledByteBufAllocator; @@ -69,7 +69,7 @@ /** * Test that Netty Connector can connect to a Web Server and upgrade from a HTTP request to its remoting protocol. */ -public class NettyConnectorWithHTTPUpgradeTest extends ServiceTestBase +public class NettyConnectorWithHTTPUpgradeTest extends ActiveMQTestBase { private static final SimpleString QUEUE = new SimpleString("NettyConnectorWithHTTPUpgradeTest"); @@ -94,12 +94,9 @@ public void setUp() throws Exception httpParams.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true); httpParams.put(TransportConstants.PORT_PROP_NAME, HTTP_PORT); acceptorName = randomString(); - HashMap emptyParams = new HashMap<>(); - conf = createDefaultConfig() - .setSecurityEnabled(false) - .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, httpParams, acceptorName)) - .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, emptyParams, randomString())); + conf = createDefaultNettyConfig() + .addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, httpParams, acceptorName)); server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java index f4806558b6a..8cecf742e85 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.integration.vertx.VertxConstants; import org.apache.activemq.artemis.integration.vertx.VertxIncomingConnectorServiceFactory; import org.apache.activemq.artemis.integration.vertx.VertxOutgoingConnectorServiceFactory; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -51,7 +51,7 @@ * This class tests the basics of ActiveMQ * vertx integration */ -public class ActiveMQVertxUnitTest extends ServiceTestBase +public class ActiveMQVertxUnitTest extends ActiveMQTestBase { protected PlatformManager vertxManager; protected ActiveMQServer server; @@ -155,7 +155,7 @@ public void setUp() throws Exception .setParams(config5) .setName("test-vertx-outgoing-connector2"); - Configuration configuration = createDefaultConfig() + Configuration configuration = createDefaultInVMConfig() .addQueueConfiguration(qc1) .addQueueConfiguration(qc2) .addQueueConfiguration(qc3) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java index 7ee1a39c8aa..aaea5e89114 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; @@ -48,7 +48,7 @@ import java.util.HashMap; import java.util.Map; -public class BasicXaRecoveryTest extends ServiceTestBase +public class BasicXaRecoveryTest extends ActiveMQTestBase { private static IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -79,10 +79,7 @@ public void setUp() throws Exception super.setUp(); addressSettings.clear(); - configuration = createDefaultConfig() - .setSecurityEnabled(false) - .setJournalMinFiles(2) - .setPagingDirectory(getPageDir()) + configuration = createDefaultInVMConfig() .setJMXManagementEnabled(true); mbeanServer = MBeanServerFactory.createMBeanServer(); @@ -334,8 +331,8 @@ public void verifyPaging(final boolean restartServer) throws Exception Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN); Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); clientSession.commit(xid, false); @@ -413,8 +410,8 @@ public void testRollbackPaging(final boolean restartServer) throws Exception Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN); Assert.assertEquals(1, xids.length); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); clientSession.rollback(xid); @@ -458,8 +455,8 @@ public void testNonPersistent(final boolean commit) throws Exception Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); if (commit) @@ -537,8 +534,8 @@ public void testBasicSendWithCommit(final boolean stopServer) throws Exception Xid[] xids = clientSession.recover(XAResource.TMSTARTRSCAN); Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); @@ -593,8 +590,8 @@ public void testBasicSendWithRollback(final boolean stopServer) throws Exception Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); clientSession.rollback(xid); @@ -642,8 +639,8 @@ public void testMultipleBeforeSendWithCommit(final boolean stopServer) throws Ex Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); clientSession.commit(xid, false); @@ -893,8 +890,8 @@ public void testMultipleTxSameXidSendWithCommit(final boolean stopServer) throws Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); clientSession.commit(xid, false); @@ -973,8 +970,8 @@ public void testBasicReceiveWithCommit(final boolean stopServer) throws Exceptio Assert.assertEquals(xids.length, 1); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); clientSession.commit(xid, false); @@ -1047,8 +1044,8 @@ public void testBasicReceiveWithRollback(final boolean stopServer) throws Except Assert.assertEquals(1, xids.length); Assert.assertEquals(xids[0].getFormatId(), xid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getBranchQualifier(), xid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xids[0].getGlobalTransactionId(), xid.getGlobalTransactionId()); xids = clientSession.recover(XAResource.TMENDRSCAN); Assert.assertEquals(xids.length, 0); clientSession.rollback(xid); @@ -1347,8 +1344,8 @@ private void assertEqualXids(final Xid[] xids, final Xid... origXids) if (found) { Assert.assertEquals(xid.getFormatId(), origXid.getFormatId()); - ServiceTestBase.assertEqualsByteArrays(xid.getBranchQualifier(), origXid.getBranchQualifier()); - ServiceTestBase.assertEqualsByteArrays(xid.getGlobalTransactionId(), origXid.getGlobalTransactionId()); + ActiveMQTestBase.assertEqualsByteArrays(xid.getBranchQualifier(), origXid.getBranchQualifier()); + ActiveMQTestBase.assertEqualsByteArrays(xid.getGlobalTransactionId(), origXid.getGlobalTransactionId()); break; } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java index 3fa8b81208d..ac517df97d6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaTest.java @@ -39,13 +39,13 @@ import org.apache.activemq.artemis.core.transaction.impl.XidImpl; import org.apache.activemq.artemis.ra.ActiveMQRAXAResource; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class BasicXaTest extends ServiceTestBase +public class BasicXaTest extends ActiveMQTestBase { private static IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -70,10 +70,7 @@ public void setUp() throws Exception super.setUp(); addressSettings.clear(); - configuration = createDefaultConfig(true) - .setSecurityEnabled(false) - .setJournalMinFiles(2) - .setPagingDirectory(getPageDir()); + configuration = createDefaultNettyConfig(); messagingService = createServer(false, configuration, -1, -1, addressSettings); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java index 09cd7a2557c..b5c2c82057f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/XaTimeoutTest.java @@ -38,7 +38,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage; @@ -56,7 +56,7 @@ import org.junit.Before; import org.junit.Test; -public class XaTimeoutTest extends ServiceTestBase +public class XaTimeoutTest extends ActiveMQTestBase { private final Map addressSettings = new HashMap(); @@ -86,7 +86,7 @@ public void setUp() throws Exception addressSettings.clear(); configuration = createBasicConfig() .setTransactionTimeoutScanPeriod(500) - .addAcceptorConfiguration(new TransportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY)); + .addAcceptorConfiguration(new TransportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY)); messagingService = addServer(ActiveMQServers.newActiveMQServer(configuration, false)); // start the server messagingService.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java index daa49bff16d..5137d20697a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java @@ -16,21 +16,9 @@ */ package org.apache.activemq.artemis.tests.util; -import javax.jms.ConnectionFactory; -import javax.jms.Queue; -import javax.jms.Topic; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.JMSFactoryType; -import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; -import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; @@ -40,10 +28,19 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl; import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; +import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; import org.junit.After; import org.junit.Before; -public class JMSClusteredTestBase extends ServiceTestBase +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import java.util.ArrayList; + +public class JMSClusteredTestBase extends ActiveMQTestBase { private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; @@ -133,9 +130,9 @@ public void setUp() throws Exception waitForTopology(jmsServer2.getActiveMQServer(), 2); cf1 = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(0))); - cf2 = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(1))); + cf2 = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), + generateInVMParams(2))); } /** @@ -143,59 +140,28 @@ public void setUp() throws Exception */ private void setupServer2() throws Exception { - Configuration conf2 = createConfigServer2(); + Configuration configuration = createConfigServer(2, 1); JMSConfigurationImpl jmsconfig = new JMSConfigurationImpl(); mBeanServer2 = MBeanServerFactory.createMBeanServer(); - server2 = ActiveMQServers.newActiveMQServer(conf2, mBeanServer2, enablePersistence()); + server2 = ActiveMQServers.newActiveMQServer(configuration, mBeanServer2, enablePersistence()); jmsServer2 = new JMSServerManagerImpl(server2, jmsconfig); context2 = new InVMNamingContext(); jmsServer2.setRegistry(new JndiBindingRegistry(context2)); } - /** - * @return - */ - protected Configuration createConfigServer2() - { - List toOtherServerPair = new ArrayList(); - toOtherServerPair.add("toServer1"); - - Configuration conf2 = createDefaultConfig(1, generateInVMParams(1), INVM_ACCEPTOR_FACTORY); - conf2.setSecurityEnabled(false); - conf2.setPersistenceEnabled(false); - - conf2.getConnectorConfigurations().put("toServer1", - new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(0))); - conf2.getConnectorConfigurations().put("server2", - new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(1))); - - conf2.getClusterConfigurations().add(new ClusterConnectionConfiguration() - .setName("to-server1") - .setAddress("jms") - .setConnectorName("server2") - .setRetryInterval(1000) - .setMaxHops(MAX_HOPS) - .setConfirmationWindowSize(1024) - .setStaticConnectors(toOtherServerPair)); - - return conf2; - } - /** * @throws Exception */ private void setupServer1() throws Exception { - Configuration conf1 = createConfigServer1(); + Configuration configuration = createConfigServer(1, 2); JMSConfigurationImpl jmsconfig = new JMSConfigurationImpl(); mBeanServer1 = MBeanServerFactory.createMBeanServer(); - server1 = ActiveMQServers.newActiveMQServer(conf1, mBeanServer1, enablePersistence()); + server1 = ActiveMQServers.newActiveMQServer(configuration, mBeanServer1, enablePersistence()); jmsServer1 = new JMSServerManagerImpl(server1, jmsconfig); context1 = new InVMNamingContext(); jmsServer1.setRegistry(new JndiBindingRegistry(context1)); @@ -209,33 +175,26 @@ protected boolean enablePersistence() /** * @return */ - protected Configuration createConfigServer1() + protected Configuration createConfigServer(final int source, final int destination) throws Exception { - List toOtherServerPair = new ArrayList(); - toOtherServerPair.add("toServer2"); - - Configuration conf1 = createDefaultConfig(0, generateInVMParams(0), INVM_ACCEPTOR_FACTORY); - - conf1.setSecurityEnabled(false); - conf1.setPersistenceEnabled(false); - - conf1.getConnectorConfigurations().put("toServer2", - new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(1))); - conf1.getConnectorConfigurations().put("server1", - new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(0))); - - conf1.getClusterConfigurations().add(new ClusterConnectionConfiguration() - .setName("to-server2") - .setAddress("jms") - .setConnectorName("server1") - .setRetryInterval(1000) - .setMaxHops(MAX_HOPS) - .setConfirmationWindowSize(1024) - .setStaticConnectors(toOtherServerPair)); - - return conf1; + final String destinationLabel = "toServer" + destination; + final String sourceLabel = "server" + source; + + Configuration configuration = createDefaultInVMConfig(source) + .setSecurityEnabled(false) + .setPersistenceEnabled(false) + .addConnectorConfiguration(destinationLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(destination))) + .addConnectorConfiguration(sourceLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(source))) + .addClusterConfiguration(new ClusterConnectionConfiguration() + .setName(destinationLabel) + .setAddress("jms") + .setConnectorName(sourceLabel) + .setRetryInterval(1000) + .setMaxHops(MAX_HOPS) + .setConfirmationWindowSize(1024) + .setStaticConnectors(new ArrayList() { { add(destinationLabel); } } )); + + return configuration; } @Override @@ -294,14 +253,5 @@ public void tearDown() throws Exception // Inner classes ------------------------------------------------- - protected Map generateInVMParams(final int node) - { - Map params = new HashMap(); - - params.put(org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); - - return params; - } - } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java index 30912c7cf4c..b4956731a5a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSTestBase.java @@ -51,7 +51,7 @@ import org.junit.Assert; import org.junit.Before; -public class JMSTestBase extends ServiceTestBase +public class JMSTestBase extends ActiveMQTestBase { protected ActiveMQServer server; @@ -148,9 +148,8 @@ public void setUp() throws Exception mbeanServer = MBeanServerFactory.createMBeanServer(); - Configuration conf = createDefaultConfig(true) - .setSecurityEnabled(useSecurity()) - .addConnectorConfiguration("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + Configuration conf = createDefaultNettyConfig() + .setSecurityEnabled(useSecurity()); server = ActiveMQServers.newActiveMQServer(conf, mbeanServer, usePersistence()); addServer(server); @@ -166,7 +165,6 @@ public void setUp() throws Exception protected Configuration createDefaultConfig(boolean netty) throws Exception { Configuration conf = super.createDefaultConfig(netty) - .setSecurityEnabled(false) .setJMXManagementEnabled(true); return conf; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java index 379d7612796..877ad174e18 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/ReplicatedBackupUtils.java @@ -49,14 +49,14 @@ public static void configureReplicationPair(Configuration backupConfig, backupConfig.addConnectorConfiguration(BACKUP_NODE_NAME, backupConnector) .addConnectorConfiguration(LIVE_NODE_NAME, liveConnector) - .addClusterConfiguration(ServiceTestBase.basicClusterConnectionConfig(BACKUP_NODE_NAME, LIVE_NODE_NAME)) + .addClusterConfiguration(ActiveMQTestBase.basicClusterConnectionConfig(BACKUP_NODE_NAME, LIVE_NODE_NAME)) .setHAPolicyConfiguration(new ReplicaPolicyConfiguration()); liveConfig.setName(LIVE_NODE_NAME) .addConnectorConfiguration(LIVE_NODE_NAME, liveConnector) .addConnectorConfiguration(BACKUP_NODE_NAME, backupConnector) .setSecurityEnabled(false) - .addClusterConfiguration(ServiceTestBase.basicClusterConnectionConfig(LIVE_NODE_NAME, BACKUP_NODE_NAME)) + .addClusterConfiguration(ActiveMQTestBase.basicClusterConnectionConfig(LIVE_NODE_NAME, BACKUP_NODE_NAME)) .setHAPolicyConfiguration(new ReplicatedPolicyConfiguration()); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java index d373b7e68e0..81a40273557 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/TransportConfigurationUtils.java @@ -32,52 +32,52 @@ private TransportConfigurationUtils() public static TransportConfiguration getInVMAcceptor(final boolean live) { - return transportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, live); + return transportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, live); } public static TransportConfiguration getInVMConnector(final boolean live) { - return transportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, live); + return transportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY, live); } public static TransportConfiguration getInVMAcceptor(final boolean live, int server) { - return transportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, live, server); + return transportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, live, server); } public static TransportConfiguration getInVMConnector(final boolean live, int server) { - return transportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, live, server); + return transportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY, live, server); } public static TransportConfiguration getNettyAcceptor(final boolean live, int server) { - return transportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY, live, server); + return transportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY, live, server); } public static TransportConfiguration getNettyConnector(final boolean live, int server) { - return transportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY, live, server); + return transportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY, live, server); } public static TransportConfiguration getInVMAcceptor(final boolean live, int server, String name) { - return transportConfiguration(ServiceTestBase.INVM_ACCEPTOR_FACTORY, live, server, name); + return transportConfiguration(ActiveMQTestBase.INVM_ACCEPTOR_FACTORY, live, server, name); } public static TransportConfiguration getInVMConnector(final boolean live, int server, String name) { - return transportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, live, server, name); + return transportConfiguration(ActiveMQTestBase.INVM_CONNECTOR_FACTORY, live, server, name); } public static TransportConfiguration getNettyAcceptor(final boolean live, int server, String name) { - return transportConfiguration(ServiceTestBase.NETTY_ACCEPTOR_FACTORY, live, server, name); + return transportConfiguration(ActiveMQTestBase.NETTY_ACCEPTOR_FACTORY, live, server, name); } public static TransportConfiguration getNettyConnector(final boolean live, int server, String name) { - return transportConfiguration(ServiceTestBase.NETTY_CONNECTOR_FACTORY, live, server, name); + return transportConfiguration(ActiveMQTestBase.NETTY_CONNECTOR_FACTORY, live, server, name); } /** diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java index c88b1395e73..03ec3ba6135 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; @@ -4336,7 +4336,7 @@ private void failed(final String msg) public void waitForMessages() throws InterruptedException { - ServiceTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch); } public ExceptionRedelMessageListenerImpl(final Session sess) @@ -4459,7 +4459,7 @@ public RedelMessageListenerImpl(final boolean transacted) */ public void waitForMessages() throws InterruptedException { - ServiceTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch); } public void onMessage(final Message m) @@ -4557,7 +4557,7 @@ public MessageListenerImpl() */ public void waitForMessages() throws InterruptedException { - ServiceTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch); } public void onMessage(final Message m) diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java index 8aa175ee9e0..3bd269605f0 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java @@ -23,7 +23,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQMessage; import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -141,7 +141,7 @@ public void run() }, "receiver thread"); receiverThread.start(); - ServiceTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch); ProxyAssertSupport.assertNull(expectedMessage); } @@ -213,8 +213,8 @@ public void run() }, "sender thread"); senderThread.start(); - ServiceTestBase.waitForLatch(senderLatch); - ServiceTestBase.waitForLatch(receiverLatch); + ActiveMQTestBase.waitForLatch(senderLatch); + ActiveMQTestBase.waitForLatch(receiverLatch); if (testFailed) { @@ -298,7 +298,7 @@ public void run() queueConsumer.close(); // wait for the reading thread to conclude - ServiceTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch); log.trace("Expected message:" + expectedMessage); diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java index 93e741f4bd5..71ae94f1f2c 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java @@ -31,7 +31,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.jms.tests.ActiveMQServerTestCase; import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; @@ -635,8 +635,8 @@ public void run() } }, "consumer thread 2").start(); - ServiceTestBase.waitForLatch(latch); - ServiceTestBase.waitForLatch(latch2); + ActiveMQTestBase.waitForLatch(latch); + ActiveMQTestBase.waitForLatch(latch2); ProxyAssertSupport.assertEquals(5, received.size()); for (Message m : received) diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java index 6d708180438..2df904eb4e4 100644 --- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java @@ -23,16 +23,15 @@ 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.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.Test; import java.util.HashMap; import java.util.concurrent.CountDownLatch; -public class MeasurePagingMultiThreadTest extends ServiceTestBase +public class MeasurePagingMultiThreadTest extends ActiveMQTestBase { @Test @@ -43,16 +42,13 @@ public void testPagingMultipleSenders() throws Throwable final int NUMBER_OF_MESSAGES = 50000; final int SIZE_OF_MESSAGE = 1024; - Configuration config = createDefaultConfig(); - HashMap settings = new HashMap(); - ActiveMQServer messagingService = createServer(true, config, 10 * 1024, 20 * 1024, settings); + ActiveMQServer messagingService = createServer(true, createDefaultInVMConfig(), 10 * 1024, 20 * 1024, settings); messagingService.start(); ServerLocator locator = createInVMNonHALocator(); try { - final ClientSessionFactory factory = createSessionFactory(locator); final SimpleString adr = new SimpleString("test-adr"); @@ -98,7 +94,7 @@ public void run() try { latchAlign.countDown(); - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); long start = System.currentTimeMillis(); sendMessages(NUMBER_OF_MESSAGES, producer, msg); @@ -125,7 +121,7 @@ public void run() senders[i].start(); } - ServiceTestBase.waitForLatch(latchAlign); + ActiveMQTestBase.waitForLatch(latchAlign); long timeStart = System.currentTimeMillis(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java index 5fde67a1069..e2012a54024 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java @@ -28,11 +28,11 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.Before; import org.junit.Test; -public class ClientNonDivertedSoakTest extends ServiceTestBase +public class ClientNonDivertedSoakTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -41,12 +41,15 @@ public class ClientNonDivertedSoakTest extends ServiceTestBase private static final SimpleString ADDRESS = new SimpleString("ADD"); - private static final boolean IS_NETTY = false; - private static final boolean IS_JOURNAL = false; public static final int MIN_MESSAGES_ON_QUEUE = 5000; + protected boolean isNetty() + { + return false; + } + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -61,14 +64,14 @@ public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig(ClientNonDivertedSoakTest.IS_NETTY) + Configuration config = createDefaultConfig(isNetty()) .setJournalFileSize(10 * 1024 * 1024); server = createServer(IS_JOURNAL, config, -1, -1, new HashMap()); server.start(); - ServerLocator locator = createFactory(ClientNonDivertedSoakTest.IS_NETTY); + ServerLocator locator = createFactory(isNetty()); ClientSessionFactory sf = createSessionFactory(locator); @@ -87,7 +90,7 @@ public void setUp() throws Exception @Test public void testSoakClient() throws Exception { - ServerLocator locator = createFactory(ClientNonDivertedSoakTest.IS_NETTY); + ServerLocator locator = createFactory(isNetty()); final ClientSessionFactory sf = createSessionFactory(locator); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java index 920ef55c6a2..c377f3ed42d 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java @@ -26,7 +26,7 @@ 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.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.DivertConfiguration; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -35,7 +35,7 @@ import org.junit.Before; import org.junit.Test; -public class ClientSoakTest extends ServiceTestBase +public class ClientSoakTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -48,12 +48,15 @@ public class ClientSoakTest extends ServiceTestBase private static final SimpleString DIVERTED_AD2 = ClientSoakTest.ADDRESS.concat("-2"); - private static final boolean IS_NETTY = true; - private static final boolean IS_JOURNAL = true; public static final int MIN_MESSAGES_ON_QUEUE = 5000; + protected boolean isNetty() + { + return true; + } + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -68,7 +71,7 @@ public void setUp() throws Exception { clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(ClientSoakTest.IS_NETTY) + Configuration config = createDefaultConfig(isNetty()) .setJournalFileSize(10 * 1024 * 1024); server = createServer(IS_JOURNAL, config, -1, -1, new HashMap()); @@ -95,7 +98,7 @@ public void setUp() throws Exception server.start(); - ServerLocator locator = createFactory(IS_NETTY); + ServerLocator locator = createFactory(isNetty()); ClientSessionFactory sf = createSessionFactory(locator); @@ -126,7 +129,7 @@ public void tearDown() throws Exception @Test public void testSoakClient() throws Exception { - final ServerLocator locator = createFactory(IS_NETTY); + final ServerLocator locator = createFactory(isNetty()); final ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, false); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java index b6715500da9..9a531664dd4 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java @@ -31,9 +31,9 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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; -public class SimpleSendReceiveSoakTest extends ServiceTestBase +public class SimpleSendReceiveSoakTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -42,12 +42,15 @@ public class SimpleSendReceiveSoakTest extends ServiceTestBase private static final SimpleString ADDRESS = new SimpleString("ADD"); - private static final boolean IS_NETTY = false; - private static final boolean IS_JOURNAL = false; public static final int MIN_MESSAGES_ON_QUEUE = 1000; + protected boolean isNetty() + { + return false; + } + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -64,14 +67,14 @@ public void setUp() throws Exception clearDataRecreateServerDirs(); - Configuration config = createDefaultConfig(SimpleSendReceiveSoakTest.IS_NETTY) + Configuration config = createDefaultConfig(isNetty()) .setJournalFileSize(10 * 1024 * 1024); server = createServer(IS_JOURNAL, config, -1, -1, new HashMap()); server.start(); - ServerLocator locator = createFactory(IS_NETTY); + ServerLocator locator = createFactory(isNetty()); ClientSessionFactory sf = createSessionFactory(locator); @@ -85,7 +88,7 @@ public void setUp() throws Exception @Test public void testSoakClientTransactions() throws Exception { - final ServerLocator locator = createFactory(IS_NETTY); + final ServerLocator locator = createFactory(isNetty()); final ClientSessionFactory sf = createSessionFactory(locator); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java index 7c6ed13cf13..3d5145babf3 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java @@ -23,11 +23,11 @@ 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.Assert; import org.junit.Test; -public class SendStressTest extends ServiceTestBase +public class SendStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java index 3cbe91f3555..fa20e39bcc2 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.LoaderCallback; import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; import org.apache.activemq.artemis.core.journal.RecordInfo; @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.Test; -public class AddAndRemoveStressTest extends ServiceTestBase +public class AddAndRemoveStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java index 5b5b0093bbb..3a346fce729 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java @@ -28,14 +28,14 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.JournalType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; import org.junit.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -public class CompactingStressTest extends ServiceTestBase +public class CompactingStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -233,7 +233,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(true, true); sessionSlow = sf.createSession(false, false); ClientProducer prod = session.createProducer(CompactingStressTest.AD2); @@ -296,7 +296,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(true, true); session.start(); ClientConsumer cons = session.createConsumer(CompactingStressTest.Q2); @@ -332,7 +332,7 @@ public void run() FastProducer p1 = new FastProducer(); p1.start(); - ServiceTestBase.waitForLatch(latchReady); + ActiveMQTestBase.waitForLatch(latchReady); latchStart.countDown(); p1.join(); @@ -409,7 +409,7 @@ public void run() private void setupServer(final JournalType journalType) throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false) .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalType(journalType) @@ -421,9 +421,9 @@ private void setupServer(final JournalType journalType) throws Exception server.start(); - ServerLocator locator = createInVMNonHALocator(); - locator.setBlockOnDurableSend(false); - locator.setBlockOnAcknowledge(false); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnDurableSend(false) + .setBlockOnAcknowledge(false); sf = createSessionFactory(locator); ClientSession sess = addClientSession(sf.createSession()); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java index 36fcaed3846..417138adb81 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; 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.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.apache.activemq.artemis.utils.OrderedExecutorFactory; import org.apache.activemq.artemis.utils.SimpleIDGenerator; @@ -52,7 +52,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -public class JournalCleanupCompactStressTest extends ServiceTestBase +public class JournalCleanupCompactStressTest extends ActiveMQTestBase { public static SimpleIDGenerator idGen = new SimpleIDGenerator(1); @@ -266,7 +266,7 @@ public void run() } }); - ServiceTestBase.waitForLatch(latchExecutorDone); + ActiveMQTestBase.waitForLatch(latchExecutorDone); journal.stop(); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java index 8a381e4a554..e46405300fe 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java @@ -27,7 +27,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.core.server.ActiveMQServer; 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.Test; /** @@ -35,7 +35,7 @@ * and having multiple restarts, * To make sure the journal would survive at multiple restarts of the server */ -public class JournalRestartStressTest extends ServiceTestBase +public class JournalRestartStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java index aef89244b21..0b3df012846 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.JournalType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -35,7 +35,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -public class LargeJournalStressTest extends ServiceTestBase +public class LargeJournalStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -103,7 +103,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(true, true); sessionSlow = sf.createSession(false, false); ClientProducer prod = session.createProducer(LargeJournalStressTest.AD2); @@ -169,7 +169,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(true, true); session.start(); ClientConsumer cons = session.createConsumer(LargeJournalStressTest.Q2); @@ -205,7 +205,7 @@ public void run() FastProducer p1 = new FastProducer(); p1.start(); - ServiceTestBase.waitForLatch(latchReady); + ActiveMQTestBase.waitForLatch(latchReady); latchStart.countDown(); p1.join(); @@ -274,7 +274,7 @@ public void setUp() throws Exception */ private void setupServer(final JournalType journalType) throws Exception { - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(false) .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalType(journalType) diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java index 3f13c3e16b4..7afbba3e7c8 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java @@ -27,7 +27,7 @@ import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.JournalType; -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; @@ -40,7 +40,7 @@ *

* This test validates consuming / sending messages while compacting is working */ -public class MultiThreadConsumerStressTest extends ServiceTestBase +public class MultiThreadConsumerStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -112,7 +112,7 @@ public void testProduceAndConsume() throws Throwable threads.add(cons[i]); } - ServiceTestBase.waitForLatch(latchReady); + ActiveMQTestBase.waitForLatch(latchReady); latchStart.countDown(); for (BaseThread t : threads) @@ -154,7 +154,7 @@ public void testProduceAndConsume() throws Throwable private void setupServer(final JournalType journalType) throws Exception { - Configuration config = createDefaultConfig(true) + Configuration config = createDefaultNettyConfig() .setJournalType(journalType) .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles()) @@ -242,7 +242,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(false, false); ClientProducer prod = session.createProducer(ADDRESS); for (int i = 0; i < numberOfMessages; i++) @@ -303,7 +303,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(false, false); session.start(); ClientConsumer cons = session.createConsumer(QUEUE); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java index 0a85c5388e1..8ca60ce9d8a 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java @@ -33,7 +33,7 @@ import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.JournalType; -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; @@ -44,7 +44,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; -public class NIOMultiThreadCompactorStressTest extends ServiceTestBase +public class NIOMultiThreadCompactorStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -230,7 +230,7 @@ public void internalTestProduceAndConsume() throws Throwable threads.add(cons[i]); } - ServiceTestBase.waitForLatch(latchReady); + ActiveMQTestBase.waitForLatch(latchReady); latchStart.countDown(); for (BaseThread t : threads) @@ -345,7 +345,7 @@ private void setupServer(JournalType journalType) throws Exception } if (server == null) { - Configuration config = createDefaultConfig(true) + Configuration config = createDefaultNettyConfig() .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalType(journalType) .setJMXManagementEnabled(false) @@ -439,7 +439,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(!transactional, !transactional); ClientProducer prod = session.createProducer(ADDRESS); for (int i = 0; i < numberOfMessages; i++) @@ -508,7 +508,7 @@ public void run() latchReady.countDown(); try { - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); session = sf.createSession(!transactional, !transactional); session.start(); ClientConsumer cons = session.createConsumer(QUEUE); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java index 1f10fd5a54b..cec1704f666 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java @@ -30,10 +30,10 @@ import org.apache.activemq.artemis.cli.commands.tools.XmlDataExporter; import org.apache.activemq.artemis.cli.commands.tools.XmlDataImporter; 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.Test; -public class XmlImportExportStressTest extends ServiceTestBase +public class XmlImportExportStressTest extends ActiveMQTestBase { public static final int CONSUMER_TIMEOUT = 5000; diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java index 57d29490e6f..1f9a29abafa 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java @@ -15,17 +15,6 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.stress.paging; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Random; -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.Assert; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientConsumer; @@ -34,14 +23,22 @@ 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.config.Configuration; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.impl.QueueImpl; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Random; +import java.util.concurrent.atomic.AtomicInteger; -public class MultipleConsumersPageStressTest extends ServiceTestBase +public class MultipleConsumersPageStressTest extends ActiveMQTestBase { private final UnitTestLogger log = UnitTestLogger.LOGGER; @@ -103,11 +100,10 @@ public void testOpenConsumerEveryTimeDefaultFlowControl0() throws Throwable public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig(); HashMap settings = new HashMap(); - messagingService = createServer(true, config, 10024, 200024, settings); + messagingService = createServer(true, createDefaultInVMConfig(), 10024, 200024, settings); messagingService.start(); pagedServerQueue = (QueueImpl)messagingService.createQueue(ADDRESS, ADDRESS, null, true, false); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java index e1d478a45e6..490692cb1c9 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java @@ -27,7 +27,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.filter.Filter; import org.apache.activemq.artemis.core.paging.cursor.PageCache; @@ -54,7 +54,7 @@ import org.junit.Before; import org.junit.Test; -public class PageCursorStressTest extends ServiceTestBase +public class PageCursorStressTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -884,7 +884,7 @@ private void createServer() throws Exception { OperationContextImpl.clearContext(); - Configuration config = createDefaultConfig() + Configuration config = createDefaultInVMConfig() .setJournalSyncNonTransactional(true); server = createServer(true, config, PAGE_SIZE, PAGE_MAX, new HashMap()); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java index d954d65271f..e1d40a87bd5 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java @@ -30,7 +30,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQBytesMessage; -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; @@ -38,23 +38,18 @@ /** * This is an integration-tests that will take some time to run. */ -public class PageStressTest extends ServiceTestBase +public class PageStressTest extends ActiveMQTestBase { - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private ActiveMQServer messagingService; + private ActiveMQServer server; private ServerLocator locator; @Test public void testStopDuringDepage() throws Exception { - Configuration config = createDefaultConfig() - .setJournalSyncNonTransactional(false) - .setJournalSyncTransactional(false); + Configuration config = createDefaultInVMConfig() + .setJournalSyncNonTransactional(false) + .setJournalSyncTransactional(false); HashMap settings = new HashMap(); @@ -62,183 +57,159 @@ public void testStopDuringDepage() throws Exception setting.setMaxSizeBytes(20 * 1024 * 1024); settings.put("page-adr", setting); - messagingService = createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings); - messagingService.start(); + server = addServer(createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings)); + server.start(); + final int NUMBER_OF_MESSAGES = 60000; ClientSessionFactory factory = createSessionFactory(locator); - ClientSession session = null; - - try - { - - final int NUMBER_OF_MESSAGES = 60000; - - session = factory.createSession(null, null, false, false, true, false, 1024 * NUMBER_OF_MESSAGES); + ClientSession session = addClientSession(factory.createSession(null, null, false, false, true, false, 1024 * NUMBER_OF_MESSAGES)); - SimpleString address = new SimpleString("page-adr"); + SimpleString address = new SimpleString("page-adr"); - session.createQueue(address, address, null, true); + session.createQueue(address, address, null, true); - ClientProducer prod = session.createProducer(address); + ClientProducer prod = session.createProducer(address); - ClientMessage message = createBytesMessage(session, ActiveMQBytesMessage.TYPE, new byte[700], true); + ClientMessage message = createBytesMessage(session, ActiveMQBytesMessage.TYPE, new byte[700], true); - for (int i = 0; i < NUMBER_OF_MESSAGES; i++) + for (int i = 0; i < NUMBER_OF_MESSAGES; i++) + { + if (i % 10000 == 0) { - if (i % 10000 == 0) - { - System.out.println("Sent " + i); - } - prod.send(message); + System.out.println("Sent " + i); } + prod.send(message); + } - session.commit(); + session.commit(); - session.start(); + session.start(); - ClientConsumer consumer = session.createConsumer(address); + ClientConsumer consumer = session.createConsumer(address); - int msgs = 0; - ClientMessage msg = null; - do + int msgs = 0; + ClientMessage msg; + do + { + msg = consumer.receive(10000); + if (msg != null) { - msg = consumer.receive(10000); - if (msg != null) + msg.acknowledge(); + if (++msgs % 1000 == 0) { - msg.acknowledge(); - if (++msgs % 1000 == 0) - { - System.out.println("Received " + msgs); - } + System.out.println("Received " + msgs); } } - while (msg != null); + } + while (msg != null); - session.commit(); + session.commit(); - session.close(); + session.close(); - messagingService.stop(); + server.stop(); - System.out.println("server stopped, nr msgs: " + msgs); + System.out.println("server stopped, nr msgs: " + msgs); - messagingService = createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings); + server = addServer(createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings)); - messagingService.start(); + server.start(); - factory = createSessionFactory(locator); + factory = createSessionFactory(locator); - session = factory.createSession(false, false, false); + session = addClientSession(factory.createSession(false, false, false)); - consumer = session.createConsumer(address); + consumer = session.createConsumer(address); - session.start(); + session.start(); - msg = null; - do + do + { + msg = consumer.receive(10000); + if (msg != null) { - msg = consumer.receive(10000); - if (msg != null) + msg.acknowledge(); + session.commit(); + if (++msgs % 1000 == 0) { - msg.acknowledge(); - session.commit(); - if (++msgs % 1000 == 0) - { - System.out.println("Received " + msgs); - } + System.out.println("Received " + msgs); } } - while (msg != null); - - System.out.println("msgs second time: " + msgs); - - Assert.assertEquals(NUMBER_OF_MESSAGES, msgs); - } - finally - { - session.close(); } + while (msg != null); + System.out.println("msgs second time: " + msgs); + + Assert.assertEquals(NUMBER_OF_MESSAGES, msgs); } @Test public void testPageOnMultipleDestinations() throws Exception { - Configuration config = createDefaultConfig(); - - HashMap settings = new HashMap(); + HashMap settings = new HashMap<>(); - AddressSettings setting = new AddressSettings(); - setting.setMaxSizeBytes(20 * 1024 * 1024); + AddressSettings setting = new AddressSettings() + .setMaxSizeBytes(20 * 1024 * 1024); settings.put("page-adr", setting); - messagingService = createServer(true, config, 10 * 1024 * 1024, 20 * 1024 * 1024, settings); - messagingService.start(); + server = addServer(createServer(true, createDefaultInVMConfig(), 10 * 1024 * 1024, 20 * 1024 * 1024, settings)); + server.start(); ClientSessionFactory factory = createSessionFactory(locator); ClientSession session = null; - try - { - session = factory.createSession(false, false, false); + session = factory.createSession(false, false, false); - SimpleString address = new SimpleString("page-adr"); - SimpleString[] queue = new SimpleString[]{new SimpleString("queue1"), new SimpleString("queue2")}; + SimpleString address = new SimpleString("page-adr"); + SimpleString[] queue = new SimpleString[]{new SimpleString("queue1"), new SimpleString("queue2")}; - session.createQueue(address, queue[0], null, true); - session.createQueue(address, queue[1], null, true); + session.createQueue(address, queue[0], null, true); + session.createQueue(address, queue[1], null, true); - ClientProducer prod = session.createProducer(address); + ClientProducer prod = session.createProducer(address); - ClientMessage message = createBytesMessage(session, ActiveMQBytesMessage.TYPE, new byte[700], false); + ClientMessage message = createBytesMessage(session, ActiveMQBytesMessage.TYPE, new byte[700], false); - int NUMBER_OF_MESSAGES = 60000; + int NUMBER_OF_MESSAGES = 60000; - for (int i = 0; i < NUMBER_OF_MESSAGES; i++) + for (int i = 0; i < NUMBER_OF_MESSAGES; i++) + { + if (i % 10000 == 0) { - if (i % 10000 == 0) - { - System.out.println(i); - } - prod.send(message); + System.out.println(i); } + prod.send(message); + } - session.commit(); + session.commit(); - session.start(); + session.start(); - int[] counters = new int[2]; + int[] counters = new int[2]; - ClientConsumer[] consumers = new ClientConsumer[]{session.createConsumer(queue[0]), - session.createConsumer(queue[1])}; + ClientConsumer[] consumers = new ClientConsumer[]{session.createConsumer(queue[0]), + session.createConsumer(queue[1])}; - while (true) - { - int msgs1 = readMessages(session, consumers[0], queue[0]); - int msgs2 = readMessages(session, consumers[1], queue[1]); - counters[0] += msgs1; - counters[1] += msgs2; + while (true) + { + int msgs1 = readMessages(session, consumers[0], queue[0]); + int msgs2 = readMessages(session, consumers[1], queue[1]); + counters[0] += msgs1; + counters[1] += msgs2; - System.out.println("msgs1 = " + msgs1 + " msgs2 = " + msgs2); + System.out.println("msgs1 = " + msgs1 + " msgs2 = " + msgs2); - if (msgs1 + msgs2 == 0) - { - break; - } + if (msgs1 + msgs2 == 0) + { + break; } - - consumers[0].close(); - consumers[1].close(); - - Assert.assertEquals(NUMBER_OF_MESSAGES, counters[0]); - Assert.assertEquals(NUMBER_OF_MESSAGES, counters[1]); - } - finally - { - session.close(); - messagingService.stop(); } + consumers[0].close(); + consumers[1].close(); + + Assert.assertEquals(NUMBER_OF_MESSAGES, counters[0]); + Assert.assertEquals(NUMBER_OF_MESSAGES, counters[1]); } private int readMessages(final ClientSession session, final ClientConsumer consumer, final SimpleString queue) throws ActiveMQException @@ -272,9 +243,9 @@ private int readMessages(final ClientSession session, final ClientConsumer consu // Protected ----------------------------------------------------- @Override - protected Configuration createDefaultConfig() throws Exception + protected Configuration createDefaultInVMConfig() throws Exception { - Configuration config = super.createDefaultConfig() + Configuration config = super.createDefaultInVMConfig() .setJournalFileSize(10 * 1024 * 1024) .setJournalMinFiles(5); @@ -286,11 +257,9 @@ protected Configuration createDefaultConfig() throws Exception public void setUp() throws Exception { super.setUp(); - locator = createInVMNonHALocator(); - - locator.setBlockOnAcknowledge(true); - locator.setBlockOnDurableSend(false); - locator.setBlockOnNonDurableSend(false); - + locator = createInVMNonHALocator() + .setBlockOnAcknowledge(true) + .setBlockOnDurableSend(false) + .setBlockOnNonDurableSend(false); } } diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java index 4596e8dc0c4..ed292806779 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/remote/PingStressTest.java @@ -15,30 +15,28 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.stress.remote; -import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.junit.Before; - -import org.junit.Test; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Interceptor; 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.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; -import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; -import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.protocol.core.Packet; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.tests.util.RandomUtil; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.junit.Before; +import org.junit.Test; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; -public class PingStressTest extends ServiceTestBase +public class PingStressTest extends ActiveMQTestBase { private static final UnitTestLogger log = UnitTestLogger.LOGGER; @@ -51,8 +49,7 @@ public class PingStressTest extends ServiceTestBase public void setUp() throws Exception { super.setUp(); - Configuration config = createDefaultConfig(true); - server = createServer(false, config); + server = createServer(false, createDefaultNettyConfig()); server.start(); } diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java index e9d440479c0..15116ed9d9d 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/stomp/StompStressTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.stress.stomp; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -43,7 +43,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -public class StompStressTest extends ServiceTestBase +public class StompStressTest extends ActiveMQTestBase { private static final int COUNT = 1000; diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java index 972828d8f64..e581ed67bf5 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/AIOJournalImplTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.timing.core.journal.impl; import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.junit.BeforeClass; @@ -35,7 +35,7 @@ protected SequentialFileFactory getFileFactory() throws Exception { File file = new File(getTestDir()); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java index c4654dfb82b..51329a4451d 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/journal/impl/NIOJournalImplTest.java @@ -18,7 +18,7 @@ import java.io.File; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; @@ -36,7 +36,7 @@ protected SequentialFileFactory getFileFactory() throws Exception NIOJournalImplTest.log.debug("deleting directory " + journalDir); - ServiceTestBase.deleteDirectory(file); + ActiveMQTestBase.deleteDirectory(file); file.mkdir(); diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java index 1bdbb331650..777a122e334 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.timing.core.server.impl; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeQueueFactory; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -40,7 +40,7 @@ * * All the concurrent queue tests go in here */ -public class QueueConcurrentTest extends ServiceTestBase +public class QueueConcurrentTest extends ActiveMQTestBase { private static final UnitTestLogger log = UnitTestLogger.LOGGER; diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java index 96d1f62a082..b660be4ad85 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.timing.core.server.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -38,7 +38,7 @@ import org.apache.activemq.artemis.core.server.impl.QueueImpl; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer; -public class QueueImplTest extends ServiceTestBase +public class QueueImplTest extends ActiveMQTestBase { private static final SimpleString queue1 = new SimpleString("queue1"); diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java index a7c7440290f..366cfccc45e 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java @@ -50,7 +50,7 @@ import org.apache.activemq.artemis.api.jms.management.JMSQueueControl; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.registry.JndiBindingRegistry; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; @@ -71,7 +71,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -public class JMSBridgeImplTest extends ServiceTestBase +public class JMSBridgeImplTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java index 47ea01fcd0e..265a5dceb21 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/ReusableLatchTest.java @@ -16,14 +16,14 @@ */ package org.apache.activemq.artemis.tests.timing.util; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.junit.Assert; import org.apache.activemq.artemis.utils.ReusableLatch; -public class ReusableLatchTest extends ServiceTestBase +public class ReusableLatchTest extends ActiveMQTestBase { @Test public void testTimeout() throws Exception diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java index eabc9fb7171..99f282dfc42 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java @@ -21,12 +21,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl; import org.junit.Assert; import org.junit.Test; -public class TokenBucketLimiterImplTest extends ServiceTestBase +public class TokenBucketLimiterImplTest extends ActiveMQTestBase { private static final UnitTestLogger log = UnitTestLogger.LOGGER; diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java index a864a2ea42c..479aa748b28 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UTF8Test.java @@ -23,10 +23,10 @@ import org.junit.Assert; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UTF8Util; -public class UTF8Test extends ServiceTestBase +public class UTF8Test extends ActiveMQTestBase { private final String str = "abcdef&^*&!^ghijkl\uB5E2\uCAC7\uB2BB\uB7DD\uB7C7\uB3A3\uBCE4\uB5A5" + "abcdef&^*&!^ghijkl\uB5E2\uCAC7\uB2BB\uB7DD\uB7C7\uB3A3\uBCE4\uB5A5" diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java index ae88e0feed8..e89ee23666e 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AIOTestBase.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.asyncio.AIOCallback; import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.junit.After; @@ -32,7 +32,7 @@ /** * The base class for AIO Tests */ -public abstract class AIOTestBase extends ServiceTestBase +public abstract class AIOTestBase extends ActiveMQTestBase { // The AIO Test must use a local filesystem. Sometimes $HOME is on a NFS on // most enterprise systems diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java index 55471a9049d..d16e8b57add 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/AsynchronousFileTest.java @@ -39,7 +39,7 @@ import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.junit.After; import org.junit.Assert; @@ -151,7 +151,7 @@ public void testReleaseBuffers() throws Exception for (int i = 0; i < 1024; i++) { - write.put(ServiceTestBase.getSamplebyte(i)); + write.put(ActiveMQTestBase.getSamplebyte(i)); } final CountDownLatch latch = new CountDownLatch(1); @@ -177,7 +177,7 @@ public void done() write = null; - ServiceTestBase.forceGC(bufferCheck2, 5000); + ActiveMQTestBase.forceGC(bufferCheck2, 5000); assertNull(bufferCheck2.get()); @@ -185,7 +185,7 @@ public void done() controller = null; - ServiceTestBase.forceGC(bufferCheck, 5000); + ActiveMQTestBase.forceGC(bufferCheck, 5000); assertNull(bufferCheck.get()); } @@ -272,8 +272,8 @@ public void testTwoFiles() throws Exception } - ServiceTestBase.waitForLatch(latchDone); - ServiceTestBase.waitForLatch(latchDone2); + ActiveMQTestBase.waitForLatch(latchDone); + ActiveMQTestBase.waitForLatch(latchDone2); CountDownCallback.checkResults(numberOfLines, listResult1); CountDownCallback.checkResults(numberOfLines, listResult2); @@ -626,7 +626,7 @@ public void testRead() throws Exception final ByteBuffer buffer0 = AsynchronousFileImpl.newBuffer(SIZE); for (int j = 0; j < SIZE; j++) { - buffer0.put(ServiceTestBase.getSamplebyte(j)); + buffer0.put(ActiveMQTestBase.getSamplebyte(j)); } CountDownCallback aio = new CountDownCallback(latch, errors, result, i); @@ -673,7 +673,7 @@ public void testRead() throws Exception for (int count = 0; count < SIZE; count++) { Assert.assertEquals("byte position " + count + " differs on line " + i + " position = " + count, - ServiceTestBase.getSamplebyte(count), + ActiveMQTestBase.getSamplebyte(count), bytesRead[count]); } } @@ -803,7 +803,7 @@ private void asyncData(final int numberOfLines, final int size, final int aioLim } - ServiceTestBase.waitForLatch(latchDone); + ActiveMQTestBase.waitForLatch(latchDone); long timeTotal = System.currentTimeMillis() - valueInitial; @@ -853,7 +853,7 @@ public void testDirectSynchronous() throws Exception CountDownLatch latchDone = new CountDownLatch(1); CountDownCallback aioBlock = new CountDownCallback(latchDone, null, null, 0); controller.write(i * 512, 512, buffer, aioBlock); - ServiceTestBase.waitForLatch(latchDone); + ActiveMQTestBase.waitForLatch(latchDone); assertTrue(aioBlock.doneCalled); assertEquals(0, aioBlock.errorCalled); } @@ -922,7 +922,7 @@ public void testInvalidWrite() throws Exception CountDownCallback aioBlock = new CountDownCallback(latchDone, null, null, 0); controller.write(11, 512, buffer, aioBlock); - ServiceTestBase.waitForLatch(latchDone); + ActiveMQTestBase.waitForLatch(latchDone); assertTrue(aioBlock.errorCalled != 0); assertFalse(aioBlock.doneCalled); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java index be37b8336a6..20cb6b41c83 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java @@ -16,26 +16,26 @@ */ package org.apache.activemq.artemis.tests.unit.core.asyncio; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; - import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; import org.apache.activemq.artemis.core.asyncio.AIOCallback; import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ActiveMQThreadFactory; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; + /** * you need to define -Djava.library.path=${project-root}/native/src/.libs when calling the JVM * If you are running this test in eclipse you should do: @@ -125,7 +125,7 @@ private void executeTest(final boolean sync) throws Throwable } latchStart.countDown(); - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); long startTime = System.currentTimeMillis(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java index 4aa7391fc4f..472c76185a0 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java @@ -36,7 +36,7 @@ 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.MessageHandler; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal; import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageInternal; import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal; @@ -52,7 +52,7 @@ import org.junit.Before; import org.junit.Test; -public class LargeMessageBufferTest extends ServiceTestBase +public class LargeMessageBufferTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -340,7 +340,7 @@ public void run() t.start(); - ServiceTestBase.waitForLatch(latchGo); + ActiveMQTestBase.waitForLatch(latchGo); buffer.cancel(); @@ -632,7 +632,7 @@ public void write(final int b) throws IOException } }); - ServiceTestBase.waitForLatch(latchBytesWritten1); + ActiveMQTestBase.waitForLatch(latchBytesWritten1); try { diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java index a2f5d33df35..1931220e543 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java @@ -22,11 +22,11 @@ import org.junit.Assert; import org.apache.activemq.artemis.core.config.impl.FileConfiguration; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.XMLUtil; import org.w3c.dom.Element; -public class ConfigurationValidationTest extends ServiceTestBase +public class ConfigurationValidationTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java index a1557be5b93..b744d24b8b9 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; -public class ConnectorsServiceTest extends ServiceTestBase +public class ConnectorsServiceTest extends ActiveMQTestBase { private Configuration configuration; diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java index cd3b0e24fb6..d3471916131 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java @@ -16,14 +16,14 @@ */ package org.apache.activemq.artemis.tests.unit.core.config.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.junit.Assert; import org.apache.activemq.artemis.api.core.TransportConfiguration; -public class TransportConfigurationTest extends ServiceTestBase +public class TransportConfigurationTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java index ebf8f6c5bb2..98e9b7e57a2 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.core.journal.impl; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -44,7 +44,7 @@ import org.apache.activemq.artemis.tests.unit.UnitTestLogger; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -public class AlignedJournalImplTest extends ServiceTestBase +public class AlignedJournalImplTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -1223,7 +1223,7 @@ public void run() try { latchReady.countDown(); - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); for (int i = 0; i < NUMBER_OF_ELEMENTS; i++) { journalImpl.appendAddRecordTransactional(i, i, (byte)1, new SimpleEncoding(50, (byte)1)); @@ -1247,7 +1247,7 @@ public void run() try { latchReady.countDown(); - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); for (int i = 0; i < NUMBER_OF_ELEMENTS; i++) { Integer toDelete = queueDelete.poll(10, TimeUnit.SECONDS); @@ -1269,7 +1269,7 @@ public void run() t1.start(); t2.start(); - ServiceTestBase.waitForLatch(latchReady); + ActiveMQTestBase.waitForLatch(latchReady); latchStart.countDown(); t1.join(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java index 498d22c973c..e0bc864d920 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.journal.impl; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.nio.ByteBuffer; @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.core.journal.impl.AIOSequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; -public class CleanBufferTest extends ServiceTestBase +public class CleanBufferTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java index 7063f156044..3ad777b195e 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FileFactoryTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.journal.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import java.nio.ByteBuffer; @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.journal.SequentialFile; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; -public abstract class FileFactoryTestBase extends ServiceTestBase +public abstract class FileFactoryTestBase extends ActiveMQTestBase { protected abstract SequentialFileFactory createFactory(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java index 758f9d7d4d4..603bcb518a7 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java @@ -22,7 +22,7 @@ import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; import org.apache.activemq.artemis.core.journal.RecordInfo; import org.apache.activemq.artemis.core.journal.impl.JournalImpl; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; -public class JournalAsyncTest extends ServiceTestBase +public class JournalAsyncTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java index edec8d16366..ae7583b4202 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java @@ -33,13 +33,13 @@ import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.TestableJournal; import org.apache.activemq.artemis.core.journal.impl.JournalImpl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ReusableLatch; import org.junit.After; import org.junit.Assert; import org.junit.Before; -public abstract class JournalImplTestBase extends ServiceTestBase +public abstract class JournalImplTestBase extends ActiveMQTestBase { protected List records = new LinkedList(); @@ -568,7 +568,7 @@ protected void checkRecordsEquivalent(final List expected, final Lis Assert.assertEquals("type not same", rexpected.isUpdate, ractual.isUpdate); - ServiceTestBase.assertEqualsByteArrays(rexpected.data, ractual.data); + ActiveMQTestBase.assertEqualsByteArrays(rexpected.data, ractual.data); } } @@ -602,7 +602,7 @@ protected byte[] generateRecord(final int length) for (int i = 0; i < length; i++) { // record[i] = RandomUtil.randomByte(); - record[i] = ServiceTestBase.getSamplebyte(i); + record[i] = ActiveMQTestBase.getSamplebyte(i); } return record; } diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java index 01e188696a7..5788db9909c 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/ReclaimerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.journal.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.journal.impl.JournalImpl; import org.apache.activemq.artemis.core.journal.impl.Reclaimer; -public class ReclaimerTest extends ServiceTestBase +public class ReclaimerTest extends ActiveMQTestBase { private JournalFile[] files; diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java index 146a8f9040f..38f292ec475 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.journal.impl; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.journal.SequentialFile; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; -public abstract class SequentialFileFactoryTestBase extends ServiceTestBase +public abstract class SequentialFileFactoryTestBase extends ActiveMQTestBase { @Override @Before @@ -58,7 +58,7 @@ public void tearDown() throws Exception factory = null; - ServiceTestBase.forceGC(); + ActiveMQTestBase.forceGC(); super.tearDown(); } @@ -337,14 +337,14 @@ public void testPosition() throws Exception Assert.assertEquals(rb3.limit(), bytesRead); rb3.rewind(); rb3.get(rbytes3); - ServiceTestBase.assertEqualsByteArrays(bytes3, rbytes3); + ActiveMQTestBase.assertEqualsByteArrays(bytes3, rbytes3); sf.position(rb1.limit()); bytesRead = sf.read(rb2); Assert.assertEquals(rb2.limit(), bytesRead); rb2.get(rbytes2); - ServiceTestBase.assertEqualsByteArrays(bytes2, rbytes2); + ActiveMQTestBase.assertEqualsByteArrays(bytes2, rbytes2); sf.position(0); @@ -352,7 +352,7 @@ public void testPosition() throws Exception Assert.assertEquals(rb1.limit(), bytesRead); rb1.get(rbytes1); - ServiceTestBase.assertEqualsByteArrays(bytes1, rbytes1); + ActiveMQTestBase.assertEqualsByteArrays(bytes1, rbytes1); } finally diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java index 2a2caea84ce..6932914b8f1 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java @@ -18,7 +18,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.nio.ByteBuffer; @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.core.journal.impl.TimedBuffer; import org.apache.activemq.artemis.core.journal.impl.TimedBufferObserver; -public class TimedBufferTest extends ServiceTestBase +public class TimedBufferTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -104,7 +104,7 @@ public int getRemainingBytes() byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(x++); + bytes[j] = ActiveMQTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -127,7 +127,7 @@ public int getRemainingBytes() for (int i = 0; i < 100; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), flushedBuffer.get()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), flushedBuffer.get()); } } finally @@ -178,7 +178,7 @@ public int getRemainingBytes() byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(x++); + bytes[j] = ActiveMQTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -193,7 +193,7 @@ public int getRemainingBytes() bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(x++); + bytes[j] = ActiveMQTestBase.getSamplebyte(x++); } buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -215,7 +215,7 @@ public int getRemainingBytes() for (int i = 0; i < 20; i++) { - Assert.assertEquals(ServiceTestBase.getSamplebyte(i), flushedBuffer.get()); + Assert.assertEquals(ActiveMQTestBase.getSamplebyte(i), flushedBuffer.get()); } } finally @@ -291,7 +291,7 @@ public synchronized void setUseSleep(boolean param) byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(x++); + bytes[j] = ActiveMQTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); @@ -378,7 +378,7 @@ public synchronized void setUseSleep(boolean param) byte[] bytes = new byte[10]; for (int j = 0; j < 10; j++) { - bytes[j] = ServiceTestBase.getSamplebyte(x++); + bytes[j] = ActiveMQTestBase.getSamplebyte(x++); } ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(bytes); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java index d51b5988bc0..d18786ea805 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java @@ -23,7 +23,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; @@ -31,7 +31,7 @@ import org.junit.Assert; import org.junit.Test; -public class MessageImplTest extends ServiceTestBase +public class MessageImplTest extends ActiveMQTestBase { @Test public void getSetAttributes() diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java index 1b41cef7e88..0301c0d9740 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.artemis.tests.unit.core.paging.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; -public class PagePositionTest extends ServiceTestBase +public class PagePositionTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java index 3e567804628..48c133c801d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java @@ -23,7 +23,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.SequentialFile; import org.apache.activemq.artemis.core.journal.SequentialFileFactory; import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory; @@ -36,7 +36,7 @@ import org.junit.Assert; import org.junit.Test; -public class PageTest extends ServiceTestBase +public class PageTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -114,11 +114,11 @@ protected void testAdd(final SequentialFileFactory factory, final int numberOfEl { Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddress()); - ServiceTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) - .getMessage() - .getBodyBuffer() - .toByteBuffer() - .array()); + ActiveMQTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) + .getMessage() + .getBodyBuffer() + .toByteBuffer() + .array()); } impl.delete(null); @@ -186,11 +186,11 @@ protected void testDamagedPage(final SequentialFileFactory factory, final int nu { Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddress()); - ServiceTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) - .getMessage() - .getBodyBuffer() - .toByteBuffer() - .array()); + ActiveMQTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i) + .getMessage() + .getBodyBuffer() + .toByteBuffer() + .array()); } impl.delete(null); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java index 0ae40d96c98..6bf931d7602 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java @@ -38,12 +38,12 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository; 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; -public class PagingManagerImplTest extends ServiceTestBase +public class PagingManagerImplTest extends ActiveMQTestBase { private final ReadLock lock = new ReentrantReadWriteLock().readLock(); @@ -86,11 +86,11 @@ public void testPagingManager() throws Exception Assert.assertEquals(1, msgs.size()); - ServiceTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0) - .getMessage() - .getBodyBuffer() - .toByteBuffer() - .array()); + ActiveMQTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0) + .getMessage() + .getBodyBuffer() + .toByteBuffer() + .array()); Assert.assertTrue(store.isPaging()); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java index 1d468ba3465..e744d434686 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingStoreImplTest.java @@ -55,14 +55,14 @@ import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; import org.apache.activemq.artemis.tests.unit.util.FakePagingManager; 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.apache.activemq.artemis.utils.ExecutorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class PagingStoreImplTest extends ServiceTestBase +public class PagingStoreImplTest extends ActiveMQTestBase { private static final SimpleString destinationTestName = new SimpleString("test"); @@ -130,7 +130,7 @@ public void testDoubleStart() throws Exception @Test public void testPageWithNIO() throws Exception { - ServiceTestBase.recreateDirectory(getTestDir()); + ActiveMQTestBase.recreateDirectory(getTestDir()); testConcurrentPaging(new NIOSequentialFileFactory(getTestDir()), 1); } @@ -327,7 +327,7 @@ public void testDepageMultiplePages() throws Exception for (int i = 0; i < 5; i++) { Assert.assertEquals(sequence++, msg.get(i).getMessage().getMessageID()); - ServiceTestBase.assertEqualsBuffers(18, buffers.get(pageNr * 5 + i), msg.get(i).getMessage().getBodyBuffer()); + ActiveMQTestBase.assertEqualsBuffers(18, buffers.get(pageNr * 5 + i), msg.get(i).getMessage().getBodyBuffer()); } } @@ -378,7 +378,7 @@ public void testDepageMultiplePages() throws Exception Assert.assertEquals(1L, msgs.get(0).getMessage().getMessageID()); - ServiceTestBase.assertEqualsBuffers(18, buffers.get(0), msgs.get(0).getMessage().getBodyBuffer()); + ActiveMQTestBase.assertEqualsBuffers(18, buffers.get(0), msgs.get(0).getMessage().getBodyBuffer()); Assert.assertEquals(1, store.getNumberOfPages()); @@ -496,7 +496,7 @@ public void run() try { // Wait every producer to produce at least one message - ServiceTestBase.waitForLatch(latchStart); + ActiveMQTestBase.waitForLatch(latchStart); while (aliveProducers.get() > 0) { @@ -559,7 +559,7 @@ public void run() buffers2.put(id, msg.getMessage()); Assert.assertNotNull(msgWritten); Assert.assertEquals(msg.getMessage().getAddress(), msgWritten.getAddress()); - ServiceTestBase.assertEqualsBuffers(10, msgWritten.getBodyBuffer(), msg.getMessage().getBodyBuffer()); + ActiveMQTestBase.assertEqualsBuffers(10, msgWritten.getBodyBuffer(), msg.getMessage().getBodyBuffer()); } } @@ -627,10 +627,10 @@ public void run() ServerMessage msgWritten = buffers2.remove(id); Assert.assertNotNull(msgWritten); Assert.assertEquals(msg.getMessage().getAddress(), msgWritten.getAddress()); - ServiceTestBase.assertEqualsByteArrays(msgWritten.getBodyBuffer().writerIndex(), msgWritten.getBodyBuffer() - .toByteBuffer() - .array(), - msg.getMessage().getBodyBuffer().toByteBuffer().array()); + ActiveMQTestBase.assertEqualsByteArrays(msgWritten.getBodyBuffer().writerIndex(), msgWritten.getBodyBuffer() + .toByteBuffer() + .array(), + msg.getMessage().getBodyBuffer().toByteBuffer().array()); } } diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java index b68f3efcf38..c8bcfbf70cf 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java @@ -19,7 +19,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.Journal; import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; import org.apache.activemq.artemis.core.journal.RecordInfo; @@ -32,7 +32,7 @@ import org.junit.Assert; import org.junit.Test; -public class BatchIDGeneratorUnitTest extends ServiceTestBase +public class BatchIDGeneratorUnitTest extends ActiveMQTestBase { @Test diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java index 540085513d1..9d2c8ee30fc 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/OperationContextUnitTest.java @@ -23,13 +23,13 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.journal.IOAsyncTask; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; import org.junit.Assert; import org.junit.Test; -public class OperationContextUnitTest extends ServiceTestBase +public class OperationContextUnitTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java index 2dbc3548126..e6495d79357 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/AddressImplTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.core.postoffice.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.junit.Assert; @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.postoffice.Address; import org.apache.activemq.artemis.core.postoffice.impl.AddressImpl; -public class AddressImplTest extends ServiceTestBase +public class AddressImplTest extends ActiveMQTestBase { @Test public void testNoDots() diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java index 905f5ca87b0..b979e4b1ed2 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.postoffice.impl; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.impl.RefsOperation; import org.junit.Test; @@ -42,7 +42,7 @@ import org.apache.activemq.artemis.core.transaction.Transaction; import org.apache.activemq.artemis.core.transaction.TransactionOperation; -public class BindingsImplTest extends ServiceTestBase +public class BindingsImplTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java index 2c965b3a2a1..8dbcada12a5 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; import org.apache.activemq.artemis.tests.unit.util.FakePagingManager; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.persistence.GroupingInfo; import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; @@ -45,7 +45,7 @@ import org.junit.Before; import org.junit.Test; -public class DuplicateDetectionUnitTest extends ServiceTestBase +public class DuplicateDetectionUnitTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -90,7 +90,7 @@ public void testReloadDuplication() throws Exception SimpleString ADDRESS = new SimpleString("address"); - Configuration configuration = createDefaultConfig(); + Configuration configuration = createDefaultInVMConfig(); PostOffice postOffice = new FakePostOffice(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java index 4b3f51c5295..5e3cf6d67db 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.filter.Filter; import org.apache.activemq.artemis.core.postoffice.Binding; import org.apache.activemq.artemis.core.postoffice.BindingType; @@ -37,7 +37,7 @@ /** * This test is replicating the behaviour from https://issues.jboss.org/browse/HORNETQ-988. */ -public class WildcardAddressManagerUnitTest extends ServiceTestBase +public class WildcardAddressManagerUnitTest extends ActiveMQTestBase { diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java index 9268bf693fc..6f43b5ab769 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.core.remoting; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -27,7 +27,7 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.tests.util.RandomUtil; -public abstract class ActiveMQBufferTestBase extends ServiceTestBase +public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -100,7 +100,7 @@ public void testEmptySimpleString() throws Exception SimpleString result = putAndGetNullableSimpleString(emptySimpleString); Assert.assertNotNull(result); - ServiceTestBase.assertEqualsByteArrays(emptySimpleString.getData(), result.getData()); + ActiveMQTestBase.assertEqualsByteArrays(emptySimpleString.getData(), result.getData()); } @Test @@ -110,7 +110,7 @@ public void testNonEmptySimpleString() throws Exception SimpleString result = putAndGetNullableSimpleString(junk); Assert.assertNotNull(result); - ServiceTestBase.assertEqualsByteArrays(junk.getData(), result.getData()); + ActiveMQTestBase.assertEqualsByteArrays(junk.getData(), result.getData()); } @Test @@ -144,7 +144,7 @@ public void testBytes() throws Exception byte[] b = new byte[bytes.length]; wrapper.readBytes(b); - ServiceTestBase.assertEqualsByteArrays(bytes, b); + ActiveMQTestBase.assertEqualsByteArrays(bytes, b); } @Test @@ -156,7 +156,7 @@ public void testBytesWithLength() throws Exception byte[] b = new byte[bytes.length / 2]; wrapper.readBytes(b, 0, b.length); - ServiceTestBase.assertEqualsByteArrays(b.length, bytes, b); + ActiveMQTestBase.assertEqualsByteArrays(b.length, bytes, b); } @Test @@ -289,7 +289,7 @@ public void testArray() throws Exception byte[] array = wrapper.toByteBuffer().array(); Assert.assertEquals(wrapper.capacity(), array.length); - ServiceTestBase.assertEqualsByteArrays(128, bytes, wrapper.toByteBuffer().array()); + ActiveMQTestBase.assertEqualsByteArrays(128, bytes, wrapper.toByteBuffer().array()); } @Test diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java index e74a414ab71..4fba13b4675 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java @@ -30,11 +30,11 @@ import org.apache.activemq.artemis.spi.core.remoting.BufferHandler; import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; -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 NettyAcceptorFactoryTest extends ServiceTestBase +public class NettyAcceptorFactoryTest extends ActiveMQTestBase { @Test public void testCreateAcceptor() throws Exception diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java index a6626962c82..6f13635da93 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; 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.core.server.ActiveMQComponent; @@ -37,7 +37,7 @@ import org.junit.Before; import org.junit.Test; -public class NettyAcceptorTest extends ServiceTestBase +public class NettyAcceptorTest extends ActiveMQTestBase { private ScheduledExecutorService pool2; @@ -47,7 +47,7 @@ public void setUp() throws Exception { super.setUp(); - ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); + ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); } @Override @@ -56,7 +56,7 @@ public void tearDown() throws Exception { try { - ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); + ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); } finally { @@ -111,13 +111,13 @@ public void connectionReadyForWrites(Object connectionID, boolean ready) Assert.assertTrue(acceptor.isStarted()); acceptor.stop(); Assert.assertFalse(acceptor.isStarted()); - ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); + ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); acceptor.start(); Assert.assertTrue(acceptor.isStarted()); acceptor.stop(); Assert.assertFalse(acceptor.isStarted()); - ServiceTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); + ActiveMQTestBase.checkFreePort(TransportConstants.DEFAULT_PORT); pool2.shutdown(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java index f63064af846..65c63e4688b 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection; import org.apache.activemq.artemis.core.server.ActiveMQComponent; import org.apache.activemq.artemis.spi.core.remoting.Connection; @@ -34,7 +34,7 @@ import org.junit.Assert; import org.junit.Test; -public class NettyConnectionTest extends ServiceTestBase +public class NettyConnectionTest extends ActiveMQTestBase { private static final Map emptyMap = Collections.emptyMap(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java index ea341ef713b..f24d759f376 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java @@ -18,7 +18,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.util.HashMap; @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection; import org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener; -public class NettyConnectorTest extends ServiceTestBase +public class NettyConnectorTest extends ActiveMQTestBase { @Test diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java index 99789cf43b3..7fcb9efd358 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.Collection; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; import org.junit.Assert; import org.junit.Before; @@ -30,7 +30,7 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) -public class SSLSupportTest extends ServiceTestBase +public class SSLSupportTest extends ActiveMQTestBase { @Parameterized.Parameters(name = "storeType={0}") public static Collection getParameters() diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java index 51fa4b56c57..7b3c772eaec 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.security.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.After; @@ -32,7 +32,7 @@ /** * tests ActiveMQSecurityManagerImpl */ -public class ActiveMQSecurityManagerImplTest extends ServiceTestBase +public class ActiveMQSecurityManagerImplTest extends ActiveMQTestBase { private ActiveMQSecurityManagerImpl securityManager; diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java index 48f66537c7d..ecbe4406788 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/ClusterConnectionBridgeTest.java @@ -17,11 +17,11 @@ package org.apache.activemq.artemis.tests.unit.core.server.cluster.impl; import org.apache.activemq.artemis.api.core.management.ManagementHelper; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge; import org.junit.Test; -public class ClusterConnectionBridgeTest extends ServiceTestBase +public class ClusterConnectionBridgeTest extends ActiveMQTestBase { @Test public void testCreateSelectorFromAddressForNormalMatches() diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java index 40231922598..f8cc7a2acac 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/cluster/impl/RemoteQueueBindImplTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.core.server.cluster.impl; import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.apache.activemq.artemis.api.core.SimpleString; @@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.server.cluster.impl.RemoteQueueBindingImpl; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class RemoteQueueBindImplTest extends ServiceTestBase +public class RemoteQueueBindImplTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java index 736e6e958f1..d89fb51e403 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java @@ -17,10 +17,10 @@ package org.apache.activemq.artemis.tests.unit.core.server.group.impl; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; -public class SystemPropertyOverrideTest extends ServiceTestBase +public class SystemPropertyOverrideTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java index 3e71f4e2d88..2047c296e8f 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/FileLockTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.activemq.artemis.tests.unit.core.server.impl; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Before; import org.junit.Test; @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.server.impl.AIOFileLockNodeManager; import org.apache.activemq.artemis.core.server.impl.FileLockNodeManager; -public class FileLockTest extends ServiceTestBase +public class FileLockTest extends ActiveMQTestBase { @Override diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java index 202079d1061..eb9a5509480 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java @@ -34,7 +34,7 @@ import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeFilter; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.filter.Filter; import org.apache.activemq.artemis.core.filter.impl.FilterImpl; import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; @@ -54,7 +54,7 @@ import org.junit.Before; import org.junit.Test; -public class QueueImplTest extends ServiceTestBase +public class QueueImplTest extends ActiveMQTestBase { // The tests ---------------------------------------------------------------- @@ -1327,18 +1327,18 @@ public void testTotalIteratorOrder() throws Exception final String MY_ADDRESS = "myAddress"; final String MY_QUEUE = "myQueue"; - ActiveMQServer server = ActiveMQServers.newActiveMQServer(createDefaultConfig(), true); + ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig(), true)); - AddressSettings defaultSetting = new AddressSettings(); - defaultSetting.setPageSizeBytes(10 * 1024); - defaultSetting.setMaxSizeBytes(20 * 1024); + AddressSettings defaultSetting = new AddressSettings() + .setPageSizeBytes(10 * 1024) + .setMaxSizeBytes(20 * 1024); server.getAddressSettingsRepository().addMatch("#", defaultSetting); server.start(); - ServerLocator locator = createInVMNonHALocator(); - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setBlockOnAcknowledge(true); + ServerLocator locator = createInVMNonHALocator() + .setBlockOnNonDurableSend(true) + .setBlockOnDurableSend(true) + .setBlockOnAcknowledge(true); ClientSessionFactory factory = createSessionFactory(locator); ClientSession session = addClientSession(factory.createSession(false, true, true)); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java index 7ae56d3db83..2c532dd0261 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import javax.jms.JMSRuntimeException; @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class ActiveMQDestinationTest extends ServiceTestBase +public class ActiveMQDestinationTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java index ad25b347548..a0bca8b345d 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java @@ -18,13 +18,13 @@ import javax.jms.MessageFormatException; 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.apache.activemq.artemis.jms.client.ActiveMQMapMessage; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ActiveMQMapMessageTest extends ServiceTestBase +public class ActiveMQMapMessageTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -693,7 +693,7 @@ public void testGetBytesFromBytes() throws Exception ActiveMQMapMessage message = new ActiveMQMapMessage(); message.setBytes(itemName, value); - ServiceTestBase.assertEqualsByteArrays(value, message.getBytes(itemName)); + ActiveMQTestBase.assertEqualsByteArrays(value, message.getBytes(itemName)); } @Test diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java index a29148da400..e047450e6cc 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms.client; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.util.ArrayList; @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQStreamMessage; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class ActiveMQStreamMessageTest extends ServiceTestBase +public class ActiveMQStreamMessageTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -180,7 +180,7 @@ public void testReadBytesFromBytes() throws Exception byte[] v = new byte[value.length]; message.readBytes(v); - ServiceTestBase.assertEqualsByteArrays(value, v); + ActiveMQTestBase.assertEqualsByteArrays(value, v); } @Test @@ -195,7 +195,7 @@ public void testReadBytesFromBytes_2() throws Exception byte[] v = new byte[256]; message.readBytes(v); - ServiceTestBase.assertEqualsByteArrays(256, value, v); + ActiveMQTestBase.assertEqualsByteArrays(256, value, v); } @Test @@ -922,7 +922,7 @@ public void testReadObjectFromBytes() throws Exception message.reset(); byte[] v = (byte[])message.readObject(); - ServiceTestBase.assertEqualsByteArrays(value, v); + ActiveMQTestBase.assertEqualsByteArrays(value, v); } @Test @@ -1041,7 +1041,7 @@ private void doWriteObjectWithType(final Object value, final TypeReader reader) Object v = reader.readType(message); if (value instanceof byte[]) { - ServiceTestBase.assertEqualsByteArrays((byte[])value, (byte[])v); + ActiveMQTestBase.assertEqualsByteArrays((byte[]) value, (byte[]) v); } else { diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java index 82a98a6c447..f8b8b80f4d5 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java @@ -28,12 +28,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.jms.client.JMSExceptionHelper; import org.junit.Assert; import org.junit.Test; -public class JMSExceptionHelperTest extends ServiceTestBase +public class JMSExceptionHelperTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java index 5f23ec9fd4e..7d9f8257d06 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java @@ -16,14 +16,14 @@ */ package org.apache.activemq.artemis.tests.unit.jms.client; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.junit.Assert; import org.apache.activemq.artemis.jms.client.SelectorTranslator; -public class SelectorTranslatorTest extends ServiceTestBase +public class SelectorTranslatorTest extends ActiveMQTestBase { @Test public void testParseNull() diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java index 857cc0fa22b..962139f250e 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms.misc; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.io.File; @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionMetaData; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -public class ManifestTest extends ServiceTestBase +public class ManifestTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java index fe4f89cac79..db4d5e02796 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/ConnectionFactoryObjectFactoryTest.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.artemis.tests.unit.jms.referenceable; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; -public class ConnectionFactoryObjectFactoryTest extends ServiceTestBase +public class ConnectionFactoryObjectFactoryTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java index 82d19ca6b47..a69d09cec65 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.jms.referenceable; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import javax.naming.Reference; @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory; import org.apache.activemq.artemis.tests.util.RandomUtil; -public class DestinationObjectFactoryTest extends ServiceTestBase +public class DestinationObjectFactoryTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java index ca3a81f1f3d..cc4310a25f1 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -39,7 +39,7 @@ * this test should fail, if it does paste the new commented out configs into the ra.xml file and in here. don't forget to * add a description for each new property added and try and put it in the config some where appropriate. */ -public class ActiveMQResourceAdapterConfigTest extends ServiceTestBase +public class ActiveMQResourceAdapterConfigTest extends ActiveMQTestBase { private static String config = "" + "\n" + diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java index 335edf54bb2..e4a710f5377 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ConnectionFactoryPropertiesTest.java @@ -21,14 +21,14 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter; import org.junit.Test; import static java.beans.Introspector.getBeanInfo; -public class ConnectionFactoryPropertiesTest extends ServiceTestBase +public class ConnectionFactoryPropertiesTest extends ActiveMQTestBase { private static final SortedSet UNSUPPORTED_CF_PROPERTIES; diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java index 4be356bc151..0c8ddb8c3e0 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java @@ -29,7 +29,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ServerLocator; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory; import org.apache.activemq.artemis.core.server.ActiveMQServer; @@ -43,7 +43,7 @@ import org.junit.Assert; import org.junit.Test; -public class ResourceAdapterTest extends ServiceTestBase +public class ResourceAdapterTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java index 1adcdf9da2c..02fcb6bbee0 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ActiveMQBufferInputStreamTest.java @@ -18,11 +18,11 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream; import org.junit.Test; -public class ActiveMQBufferInputStreamTest extends ServiceTestBase +public class ActiveMQBufferInputStreamTest extends ActiveMQTestBase { @Test diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java index 363320d5e32..28532b9cd02 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java @@ -22,13 +22,13 @@ import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.LinkedListImpl; import org.apache.activemq.artemis.utils.LinkedListIterator; import org.junit.Before; import org.junit.Test; -public class LinkedListTest extends ServiceTestBase +public class LinkedListTest extends ActiveMQTestBase { private LinkedListImpl list; diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java index 21aef5c1257..ff2351bbb12 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -40,7 +40,7 @@ import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader; -public class ObjectInputStreamWithClassLoaderTest extends ServiceTestBase +public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java index 95130c6abca..fc215714734 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ReusableLatchTest.java @@ -19,12 +19,12 @@ import java.util.concurrent.CountDownLatch; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ReusableLatch; import org.junit.Assert; import org.junit.Test; -public class ReusableLatchTest extends ServiceTestBase +public class ReusableLatchTest extends ActiveMQTestBase { @Test public void testLatchWithParameterizedDown() throws Exception diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java index 7abea8fa33b..197a7891e9f 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java @@ -16,11 +16,11 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.SoftValueHashMap; import org.junit.Test; -public class SoftValueMapTest extends ServiceTestBase +public class SoftValueMapTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java index 4b0ba375363..197e33e08ef 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UTF8Test.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.unit.util; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQBuffers; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.After; import org.junit.Test; @@ -35,7 +35,7 @@ import org.apache.activemq.artemis.utils.Random; import org.apache.activemq.artemis.utils.UTF8Util; -public class UTF8Test extends ServiceTestBase +public class UTF8Test extends ActiveMQTestBase { @Test diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java index 08604de6e50..0925ded5299 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java @@ -16,12 +16,12 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.UUIDGenerator; import org.junit.Assert; import org.junit.Test; -public class UUIDGeneratorTest extends ServiceTestBase +public class UUIDGeneratorTest extends ActiveMQTestBase { // Constants ----------------------------------------------------- @@ -58,15 +58,15 @@ public void testZeroPaddedBytes() throws Exception byte[] fiveBytes = new byte[]{1, 2, 3, 4, 5}; byte[] zeroPaddedFiveBytes = UUIDGenerator.getZeroPaddedSixBytes(fiveBytes); - ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 5, 0}, zeroPaddedFiveBytes); + ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 5, 0}, zeroPaddedFiveBytes); byte[] fourBytes = new byte[]{1, 2, 3, 4}; byte[] zeroPaddedFourBytes = UUIDGenerator.getZeroPaddedSixBytes(fourBytes); - ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 0, 0}, zeroPaddedFourBytes); + ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 4, 0, 0}, zeroPaddedFourBytes); byte[] threeBytes = new byte[]{1, 2, 3}; byte[] zeroPaddedThreeBytes = UUIDGenerator.getZeroPaddedSixBytes(threeBytes); - ServiceTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, zeroPaddedThreeBytes); + ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, zeroPaddedThreeBytes); } // Package protected --------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java index b202c48e028..b3263ca9569 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDTest.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.artemis.tests.unit.util; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Test; import java.util.HashSet; @@ -27,7 +27,7 @@ import org.apache.activemq.artemis.utils.UUID; import org.apache.activemq.artemis.utils.UUIDGenerator; -public class UUIDTest extends ServiceTestBase +public class UUIDTest extends ActiveMQTestBase { static final int MANY_TIMES = 100000; diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java index cc0a509a49d..cff25197490 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java @@ -19,13 +19,13 @@ import java.util.Properties; import java.util.StringTokenizer; -import org.apache.activemq.artemis.tests.util.ServiceTestBase; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.core.version.Version; import org.apache.activemq.artemis.utils.VersionLoader; import org.junit.Assert; import org.junit.Test; -public class VersionLoaderTest extends ServiceTestBase +public class VersionLoaderTest extends ActiveMQTestBase { // Constants -----------------------------------------------------