You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/01 20:26:37 UTC
[30/30] qpid-broker-j git commit: QPID-8151: [Broker-J] [Unit tests]
Factor out QpidTestCase
QPID-8151: [Broker-J] [Unit tests] Factor out QpidTestCase
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/d0dcd3fc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d0dcd3fc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d0dcd3fc
Branch: refs/heads/master
Commit: d0dcd3fcc3e622ad12bdc56c026a9f0e1386c0d0
Parents: fa47143
Author: Keith Wall <kw...@apache.org>
Authored: Fri Mar 30 16:46:53 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Sun Apr 1 21:25:58 2018 +0100
----------------------------------------------------------------------
.../berkeleydb/AMQShortStringEncodingTest.java | 12 +-
.../berkeleydb/BDBHAVirtualHostNodeTest.java | 168 +++++--
.../BDBMessageStoreConfigurationTest.java | 14 +
.../BDBMessageStoreQuotaEventsTest.java | 14 +
.../store/berkeleydb/BDBMessageStoreTest.java | 18 +
.../berkeleydb/BDBPreferenceStoreTest.java | 50 +-
.../berkeleydb/CoalescingCommitterTest.java | 31 +-
.../store/berkeleydb/EnvHomeRegistryTest.java | 18 +-
.../StandardEnvironmentFacadeFactoryTest.java | 22 +-
.../StandardEnvironmentFacadeTest.java | 34 +-
.../ReplicatedEnvironmentFacadeTest.java | 274 +++++++----
.../tuple/ConfiguredObjectBindingTest.java | 20 +-
.../upgrade/AbstractUpgradeTestCase.java | 42 +-
.../upgrade/DatabaseTemplateTest.java | 12 +-
.../upgrade/MapJsonSerializerTest.java | 15 +-
.../berkeleydb/upgrade/UpgradeFrom4to5Test.java | 16 +-
.../berkeleydb/upgrade/UpgradeFrom5To6Test.java | 12 +-
.../berkeleydb/upgrade/UpgradeFrom7To8Test.java | 4 +
.../berkeleydb/upgrade/UpgradeFrom8To9Test.java | 4 +
.../upgrade/UpgraderFailOnNewerVersionTest.java | 26 +-
.../store/berkeleydb/upgrade/UpgraderTest.java | 38 +-
.../berkeleydb/BDBVirtualHostImplTest.java | 42 +-
.../BDBHARemoteReplicationNodeTest.java | 34 +-
...HAVirtualHostNodeOperationalLoggingTest.java | 52 +-
.../BDBHAVirtualHostNodeTestHelper.java | 4 +-
.../berkeleydb/BDBVirtualHostNodeTest.java | 40 +-
.../apache/qpid/server/QpidExceptionTest.java | 27 +-
.../apache/qpid/server/SelectorParserTest.java | 23 +-
.../apache/qpid/server/SystemLauncherTest.java | 34 +-
.../QpidByteBufferOutputStreamTest.java | 21 +-
.../server/bytebuffer/QpidByteBufferTest.java | 232 +++++----
.../startup/VirtualHostCreationTest.java | 22 +-
.../store/ManagementModeStoreHandlerTest.java | 36 +-
.../StoreConfigurationChangeListenerTest.java | 16 +-
.../configuration/updater/TaskExecutorTest.java | 52 +-
.../ConnectionVersionValidatorTest.java | 23 +-
.../consumer/AbstractConsumerTargetTest.java | 46 +-
.../server/exchange/DirectExchangeTest.java | 65 ++-
.../server/exchange/FanoutExchangeTest.java | 101 +++-
.../server/exchange/HeadersBindingTest.java | 28 +-
.../server/exchange/HeadersExchangeTest.java | 28 +-
.../qpid/server/exchange/TopicExchangeTest.java | 129 ++---
.../filter/ArrivalTimeFilterFactoryTest.java | 14 +-
.../server/filter/JMSSelectorFilterTest.java | 14 +-
.../logging/UnitTestMessageLoggerTest.java | 46 +-
.../logging/actors/AMQPConnectionActorTest.java | 27 +-
.../logging/actors/BaseActorTestCase.java | 16 +-
.../actors/BaseConnectionActorTestCase.java | 9 +-
.../logging/actors/HttpManagementActorTest.java | 27 +-
.../logging/messages/AbstractTestMessages.java | 16 +-
.../logging/messages/BrokerMessagesTest.java | 10 +
.../logging/messages/ChannelMessagesTest.java | 6 +
.../messages/ConnectionMessagesTest.java | 7 +
.../logging/messages/ConsumerMessagesTest.java | 6 +
.../logging/messages/ExchangeMessagesTest.java | 6 +
.../messages/ManagementConsoleMessagesTest.java | 7 +
.../messages/MessageStoreMessagesTest.java | 8 +-
.../logging/messages/QueueMessagesTest.java | 18 +
.../messages/VirtualHostMessagesTest.java | 4 +
.../subjects/AbstractTestLogSubject.java | 51 +-
.../logging/subjects/BindingLogSubjectTest.java | 18 +-
.../logging/subjects/ChannelLogSubjectTest.java | 7 +-
.../subjects/ConnectionLogSubjectTest.java | 10 +-
.../subjects/ExchangeLogSubjectTest.java | 12 +-
.../subjects/MessageStoreLogSubjectTest.java | 19 +-
.../logging/subjects/QueueLogSubjectTest.java | 18 +-
.../message/AbstractServerMessageTest.java | 11 +-
.../model/AttributeValueConverterTest.java | 70 ++-
.../qpid/server/model/BrokerTestHelper.java | 38 +-
.../ConfiguredObjectJacksonModuleTest.java | 16 +-
.../qpid/server/model/UUIDGeneratorTest.java | 22 +-
.../qpid/server/model/VirtualHostTest.java | 138 ++++--
.../server/model/adapter/BrokerImplTest.java | 57 ++-
.../adapter/FileBasedGroupProviderImplTest.java | 33 +-
.../server/model/adapter/PortFactoryTest.java | 85 ++--
.../server/model/port/AmqpPortImplTest.java | 40 +-
.../server/model/port/HttpPortImplTest.java | 25 +-
.../model/preferences/GenericPrincipalTest.java | 20 +-
.../preferences/PreferenceFactoryTest.java | 13 +-
.../model/preferences/UserPreferencesTest.java | 18 +-
.../hierarchy/AbstractConfiguredObjectTest.java | 135 ++++--
.../AncestorAttributeResolverTest.java | 26 +-
.../ConfiguredObjectTypeRegistryTest.java | 34 +-
.../hierarchy/InjectedAttributeTest.java | 53 +-
.../lifecycle/AbstractConfiguredObjectTest.java | 63 ++-
.../singleton/AbstractConfiguredObjectTest.java | 184 ++++---
.../testmodels/singleton/PreferencesTest.java | 84 +++-
.../plugin/AMQPProtocolVersionWrapperTest.java | 42 +-
.../ProtocolEngineCreatorComparatorTest.java | 41 +-
...edAccessControlContextThreadFactoryTest.java | 16 +-
.../protocol/v0_8/AMQShortStringTest.java | 40 +-
.../qpid/server/protocol/v0_8/AMQTypeTest.java | 10 +-
.../server/protocol/v0_8/EncodingUtilsTest.java | 22 +-
.../server/protocol/v0_8/FieldTableTest.java | 478 ++++++++++---------
.../server/queue/AbstractQueueTestBase.java | 297 +++++++-----
.../FlowToDiskOverflowPolicyHandlerTest.java | 17 +-
.../server/queue/LastValueQueueListTest.java | 81 ++--
.../qpid/server/queue/LastValueQueueTest.java | 15 +-
.../server/queue/NotificationCheckTest.java | 18 +-
.../server/queue/PriorityQueueListTest.java | 77 +--
.../qpid/server/queue/PriorityQueueTest.java | 7 +-
...cerFlowControlOverflowPolicyHandlerTest.java | 17 +-
.../server/queue/QueueEntryImplTestBase.java | 81 ++--
.../server/queue/QueueEntryListTestBase.java | 55 ++-
.../server/queue/QueueMessageRecoveryTest.java | 22 +-
.../server/queue/RejectPolicyHandlerTest.java | 16 +-
.../queue/RingOverflowPolicyHandlerTest.java | 14 +-
.../server/queue/SimpleQueueEntryImplTest.java | 24 +-
.../server/queue/SortedQueueEntryListTest.java | 55 ++-
.../qpid/server/queue/SortedQueueEntryTest.java | 30 +-
.../qpid/server/queue/SortedQueueTest.java | 5 +-
.../queue/StandardQueueEntryListTest.java | 69 +--
.../qpid/server/queue/StandardQueueTest.java | 20 +-
.../qpid/server/security/FileKeyStoreTest.java | 67 ++-
.../server/security/FileTrustStoreTest.java | 94 +++-
.../server/security/NonJavaKeyStoreTest.java | 31 +-
.../server/security/NonJavaTrustStoreTest.java | 25 +-
.../security/SiteSpecificTrustStoreTest.java | 25 +-
.../server/security/SubjectCreatorTest.java | 26 +-
.../security/TrustStoreMessageSourceTest.java | 17 +-
.../auth/AuthenticatedPrincipalTest.java | 31 +-
.../security/auth/AuthenticationResultTest.java | 20 +-
.../security/auth/UsernamePrincipalTest.java | 17 +-
...stractPasswordFilePrincipalDatabaseTest.java | 15 +-
...e64MD5PasswordFilePrincipalDatabaseTest.java | 46 +-
.../security/auth/database/HashedUserTest.java | 16 +-
.../PlainPasswordFilePrincipalDatabaseTest.java | 53 +-
.../security/auth/database/PlainUserTest.java | 16 +-
.../AnonymousAuthenticationManagerTest.java | 28 +-
.../manager/AuthenticationResultCacherTest.java | 26 +-
.../ExternalAuthenticationManagerTest.java | 59 ++-
.../ManagedAuthenticationManagerTestBase.java | 32 +-
.../manager/PlainAuthenticationManagerTest.java | 13 -
...sswordDatabaseAuthenticationManagerTest.java | 20 +-
...ordFileAuthenticationManagerFactoryTest.java | 42 +-
...ncipalDatabaseAuthenticationManagerTest.java | 52 +-
.../ScramSHA1AuthenticationManagerTest.java | 18 +-
.../SimpleAuthenticationManagerTest.java | 35 +-
...pleLDAPAuthenticationManagerFactoryTest.java | 18 +-
.../ldap/LDAPSSLSocketFactoryGeneratorTest.java | 18 +-
.../OAuth2AuthenticationProviderImplTest.java | 42 +-
.../sasl/anonymous/AnonymousNegotiatorTest.java | 14 +-
.../sasl/crammd5/CramMd5NegotiatorTest.java | 78 ++-
.../sasl/external/ExternalNegotiatorTest.java | 62 ++-
.../auth/sasl/oauth2/OAuth2NegotiatorTest.java | 39 +-
.../auth/sasl/plain/PlainNegotiatorTest.java | 42 +-
.../auth/sasl/scram/ScramNegotiatorTest.java | 55 ++-
.../AESKeyFileEncrypterFactoryTest.java | 27 +-
.../encryption/AESKeyFileEncrypterTest.java | 23 +-
.../security/group/FileGroupDatabaseTest.java | 125 +++--
.../security/group/GroupPrincipalTest.java | 19 +-
.../qpid/server/ssl/TrustManagerTest.java | 15 +-
.../stats/FormattingStatisticsResolverTest.java | 55 ++-
...figurationStoreUpgraderAndRecovererTest.java | 19 +-
...stractDurableConfigurationStoreTestCase.java | 52 +-
.../qpid/server/store/BrokerRecovererTest.java | 61 ++-
.../BrokerStoreUpgraderAndRecovererTest.java | 110 +++--
.../qpid/server/store/EventManagerTest.java | 14 +-
.../JsonFileConfigStoreConfigurationTest.java | 14 +
.../server/store/JsonFileConfigStoreTest.java | 43 +-
.../store/MessageStoreQuotaEventsTestBase.java | 33 +-
.../qpid/server/store/MessageStoreTestCase.java | 31 +-
...irtualHostStoreUpgraderAndRecovererTest.java | 91 ++--
.../JsonFilePreferenceStoreTest.java | 34 +-
.../preferences/PreferencesRecovererTest.java | 23 +-
.../streams/CompositeInputStreamTest.java | 13 +-
.../apache/qpid/server/transport/SNITest.java | 23 +-
.../transport/TCPandSSLTransportTest.java | 11 +-
.../transport/TransactionTimeoutTickerTest.java | 18 +-
.../network/security/ssl/SSLUtilTest.java | 47 +-
.../txn/AsyncAutoCommitTransactionTest.java | 23 +-
.../server/txn/AutoCommitTransactionTest.java | 106 ++--
.../txn/FlowToDiskTransactionObserverTest.java | 13 +-
.../qpid/server/txn/LocalTransactionTest.java | 244 +++++++---
.../server/util/ByteBufferInputStreamTest.java | 43 +-
.../server/util/CachingUUIDFactoryTest.java | 10 +-
.../qpid/server/util/CommandLineParserTest.java | 107 +++--
.../apache/qpid/server/util/FileHelperTest.java | 33 +-
.../apache/qpid/server/util/FileUtilsTest.java | 106 ++--
.../apache/qpid/server/util/GZIPUtilsTest.java | 26 +-
.../org/apache/qpid/server/util/SerialTest.java | 26 +-
.../apache/qpid/server/util/StringUtilTest.java | 24 +-
.../apache/qpid/server/util/StringsTest.java | 16 +-
.../virtualhost/AbstractVirtualHostTest.java | 40 +-
.../AsynchronousMessageStoreRecovererTest.java | 17 +-
.../SynchronousMessageStoreRecovererTest.java | 18 +-
.../VirtualHostPropertiesNodeTest.java | 14 +-
.../VirtualHostQueueCreationTest.java | 55 ++-
.../virtualhostalias/VirtualHostAliasTest.java | 41 +-
.../AbstractStandardVirtualHostNodeTest.java | 49 +-
.../RedirectingVirtualHostNodeTest.java | 40 +-
.../security/access/config/AclActionTest.java | 21 +-
.../access/config/AclFileParserTest.java | 122 +++--
.../access/config/AclRulePredicatesTest.java | 23 +-
.../security/access/config/ActionTest.java | 21 +-
.../access/config/ClientActionTest.java | 18 +-
.../config/LegacyAccessControlAdapterTest.java | 65 ++-
.../config/RuleBasedAccessControlTest.java | 43 +-
.../security/access/config/RuleSetTest.java | 264 ++++++----
.../server/security/access/config/RuleTest.java | 20 +-
.../firewall/HostnameFirewallRuleTest.java | 21 +-
.../firewall/NetworkFirewallRuleTest.java | 23 +-
...AclFileAccessControlProviderFactoryTest.java | 25 +-
.../AclFileAccessControlProviderImplTest.java | 18 +-
.../MessageConverter_0_10_to_InternalTest.java | 49 +-
.../MessageConverter_Internal_to_0_10Test.java | 31 +-
.../PropertyConverter_0_10_to_InternalTest.java | 89 +++-
...PropertyConverter_Internal_to_v0_10Test.java | 101 ++--
.../v0_10/ServerSessionDelegateTest.java | 14 +-
.../protocol/v0_10/ServerSessionTest.java | 29 +-
.../protocol/v0_10/WindowCreditManagerTest.java | 44 +-
.../protocol/v0_10/transport/BBEncoderTest.java | 39 +-
.../protocol/v0_10/transport/GenTest.java | 14 +-
.../protocol/v0_10/transport/RangeSetTest.java | 137 ++++--
.../server/protocol/v0_8/AMQChannelTest.java | 22 +-
.../server/protocol/v0_8/AMQDecoderTest.java | 51 +-
.../protocol/v0_8/AMQPConnection_0_8Test.java | 44 +-
.../MessageConverter_0_8_to_InternalTest.java | 49 +-
.../MessageConverter_Internal_to_0_8Test.java | 31 +-
.../v0_8/MessageMetaDataFactoryTest.java | 28 +-
.../protocol/v0_8/Pre0_10CreditManagerTest.java | 17 +-
.../PropertyConverter_Internal_to_v0_8Test.java | 100 ++--
.../PropertyConverter_v0_8_to_InternalTest.java | 57 ++-
.../protocol/v0_8/ReferenceCountingTest.java | 29 +-
.../v0_8/UnacknowledgedMessageMapTest.java | 21 +-
.../BasicContentHeaderPropertiesTest.java | 38 +-
.../transport/MessagePublishInfoImplTest.java | 22 +-
.../v1_0/store/bdb/BDBLinkStoreTest.java | 23 +-
.../protocol/v1_0/ConsumerTarget_1_0Test.java | 13 +-
.../server/protocol/v1_0/LinkRegistryTest.java | 51 +-
.../MessageConverter_Internal_to_1_0Test.java | 33 +-
.../MessageConverter_v1_0_to_InternalTest.java | 108 +++--
.../PropertyConverter_Internal_to_v1_0Test.java | 41 +-
.../PropertyConverter_v1_0_to_InternalTest.java | 84 +++-
.../protocol/v1_0/ProtocolEngine_1_0_0Test.java | 25 +-
.../server/protocol/v1_0/Session_1_0Test.java | 149 ++++--
.../protocol/v1_0/codec/ValueHandlerTest.java | 31 +-
.../protocol/v1_0/framing/FrameHandlerTest.java | 20 +-
.../protocol/v1_0/store/LinkStoreTestCase.java | 23 +-
.../MessageConverter_0_10_to_1_0Test.java | 48 +-
.../MessageConverter_1_0_to_v0_10Test.java | 252 ++++++----
.../PropertyConverter_0_10_to_1_0Test.java | 78 ++-
.../PropertyConverter_1_0_to_0_10Test.java | 98 +++-
.../PropertyConverter_0_10_to_0_8Test.java | 81 +++-
.../PropertyConverter_0_8_to_0_10Test.java | 91 +++-
.../MessageConverter_0_8_to_1_0Test.java | 48 +-
.../MessageConverter_1_0_to_v0_8Test.java | 277 +++++++----
.../PropertyConverter_0_8_to_1_0Test.java | 66 ++-
.../PropertyConverter_1_0_to_0_8Test.java | 125 +++--
.../DerbyMessageStoreConfigurationTest.java | 13 +
.../derby/DerbyMessageStoreQuotaEventsTest.java | 14 +
.../store/derby/DerbyMessageStoreTest.java | 16 +
.../store/derby/DerbyPreferenceStoreTest.java | 69 ++-
.../derby/DerbyVirtualHostNodeTest.java | 48 +-
broker-plugins/jdbc-provider-bone/pom.xml | 6 +
.../BoneCPConnectionProviderFactoryTest.java | 11 +-
.../bonecp/BoneCPConnectionProviderTest.java | 11 +-
.../jdbc/GenericJDBCConfigurationStoreTest.java | 5 +
.../qpid/server/store/jdbc/JDBCDetailsTest.java | 16 +-
.../server/store/jdbc/JDBCMessageStoreTest.java | 15 +-
.../server/store/jdbc/JDBCSystemConfigTest.java | 8 +-
.../virtualhost/jdbc/JDBCVirtualHostTest.java | 20 +-
.../jdbc/JDBCVirtualHostNodeTest.java | 18 +-
.../logging/logback/AppenderUtilsTest.java | 70 ++-
.../BrokerFileLoggerStatusListenerTest.java | 16 +-
.../logging/logback/BrokerFileLoggerTest.java | 19 +-
.../logging/logback/BrokerLoggerTest.java | 41 +-
.../logging/logback/BrokerMemoryLoggerTest.java | 27 +-
.../BrokerNameAndLevelLogInclusionRuleTest.java | 26 +-
.../logging/logback/CompositeFilterTest.java | 13 +-
.../logback/ConnectionAndUserPredicateTest.java | 27 +-
.../Logback1027WorkaroundTurboFilterTest.java | 40 +-
.../logback/LoggerNameAndLevelFilterTest.java | 60 ++-
.../logback/PrincipalLogEventFilterTest.java | 17 +-
.../logback/QpidLoggerTurboFilterTest.java | 30 +-
.../logback/RollingPolicyDecoratorTest.java | 25 +-
.../logging/logback/RolloverWatcherTest.java | 99 +++-
.../logging/logback/StartupAppenderTest.java | 20 +-
.../VirtualHostLogEventExcludingFilterTest.java | 57 ++-
.../logging/logback/VirtualHostLoggerTest.java | 34 +-
...ostNameAndLevelLogInclusionRuleImplTest.java | 26 +-
.../plugin/GunzipOutputStreamTest.java | 11 +-
.../management/plugin/HttpManagementTest.java | 39 +-
.../plugin/HttpManagementUtilTest.java | 13 +-
.../OAuth2InteractiveAuthenticatorTest.java | 74 ++-
.../auth/OAuth2PreemptiveAuthenticatorTest.java | 29 +-
.../management/plugin/csv/CSVFormatTest.java | 36 +-
.../TlsOrPlainConnectionFactoryTest.java | 21 +-
.../plugin/report/ReportRunnerTest.java | 22 +-
.../query/ConfiguredObjectQueryTest.java | 94 +++-
.../ConfiguredObjectToMapConverterTest.java | 156 +++---
.../servlet/rest/RequestInfoParserTest.java | 30 +-
.../rest/RestUserPreferenceHandlerTest.java | 236 ++++++---
.../plugin/session/LoginLogoutReporterTest.java | 18 +-
.../java/org/apache/qpid/server/MainTest.java | 29 +-
.../qpid/disttest/ArgumentParserTest.java | 33 +-
.../qpid/disttest/ConfigFileHelperTest.java | 28 +-
.../org/apache/qpid/disttest/VisitorTest.java | 25 +-
.../client/ClientCommandVisitorTest.java | 33 +-
.../apache/qpid/disttest/client/ClientTest.java | 35 +-
.../client/ConsumerParticipantTest.java | 27 +-
.../disttest/client/MessageProviderTest.java | 32 +-
.../client/ParticipantExecutorTest.java | 27 +-
.../client/ParticipantRegistryTest.java | 25 +-
.../client/ParticipantResultFactoryTest.java | 60 ++-
.../client/ProducerParticipantTest.java | 27 +-
.../client/property/ListPropertyValueTest.java | 27 +-
.../property/PropertyValueFactoryTest.java | 41 +-
.../property/RandomPropertyValueTest.java | 50 +-
.../client/property/RangePropertyValueTest.java | 59 ++-
.../property/SimplePropertyValueTest.java | 22 +-
.../disttest/controller/ClientRegistryTest.java | 46 +-
.../disttest/controller/ControllerTest.java | 32 +-
.../disttest/controller/HillClimberTest.java | 69 ++-
.../controller/OrdinaryTestRunnerTest.java | 43 +-
.../controller/ParticipatingClientsTest.java | 33 +-
.../controller/config/ClientConfigTest.java | 32 +-
.../controller/config/ConfigReaderTest.java | 77 +--
.../disttest/controller/config/ConfigTest.java | 28 +-
.../controller/config/ConnectionConfigTest.java | 29 +-
.../controller/config/ConsumerConfigTest.java | 26 +-
.../controller/config/IterationValueTest.java | 28 +-
.../config/JavaScriptConfigEvaluatorTest.java | 43 +-
.../config/MessageProviderConfigTest.java | 24 +-
.../controller/config/ProducerConfigTest.java | 48 +-
.../controller/config/SessionConfigTest.java | 31 +-
.../controller/config/TestConfigTest.java | 35 +-
.../controller/config/TestInstanceTest.java | 36 +-
.../qpid/disttest/db/ResultsDbWriterTest.java | 49 +-
.../disttest/jms/JmsMessageAdaptorTest.java | 24 +-
.../qpid/disttest/message/JsonHandlerTest.java | 60 ++-
.../disttest/message/ParticipantResultTest.java | 71 ++-
.../disttest/results/ResultsCsvWriterTest.java | 34 +-
.../disttest/results/ResultsXmlWriterTest.java | 35 +-
.../results/aggregation/AggregatorTest.java | 30 +-
.../ParticipantResultAggregatorTest.java | 64 ++-
.../aggregation/SeriesStatisticsTest.java | 26 +-
.../aggregation/TestResultAggregatorTest.java | 78 ++-
.../results/formatting/CSVFormatterTest.java | 23 +-
...CSVOrderParticipantResultComparatorTest.java | 33 +-
.../chartbuilder/BaseChartBuilderTest.java | 35 +-
.../chartbuilder/ChartBuilderFactoryTest.java | 46 +-
.../chartbuilder/ChartProductionTest.java | 41 +-
.../charting/chartbuilder/ColorFactoryTest.java | 23 +-
.../TimeSeriesBuilderCallbackTest.java | 28 +-
.../ChartingDefinitionCreatorTest.java | 40 +-
.../definition/SeriesDefinitionCreatorTest.java | 38 +-
.../seriesbuilder/JdbcSeriesBuilderTest.java | 26 +-
.../seriesbuilder/JdbcUrlGeneratorTest.java | 26 +-
.../charting/seriesbuilder/SeriesRowTest.java | 26 +-
.../charting/writer/ChartWriterTest.java | 32 +-
qpid-test-utils/pom.xml | 5 +
.../org/apache/qpid/test/utils/JvmVendor.java | 29 ++
.../qpid/test/utils/QpidUnitTestRunner.java | 84 ++++
.../apache/qpid/test/utils/TestFileUtils.java | 58 +++
.../apache/qpid/test/utils/UnitTestBase.java | 132 +++++
.../test/utils/VirtualHostNodeStoreType.java | 41 ++
test-profiles/JavaJsonExcludes | 2 -
test-profiles/JavaTransientExcludes | 6 -
359 files changed, 11222 insertions(+), 4617 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
index 83d307f..569d0dd 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
@@ -18,19 +18,25 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
import com.sleepycat.bind.tuple.TupleInput;
import com.sleepycat.bind.tuple.TupleOutput;
+import org.junit.Test;
import org.apache.qpid.server.protocol.v0_8.AMQShortString;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Tests for {@code AMQShortStringEncoding} including corner cases when string
* is null or over 127 characters in length
*/
-public class AMQShortStringEncodingTest extends QpidTestCase
+public class AMQShortStringEncodingTest extends UnitTestBase
{
+ @Test
public void testWriteReadNullValues()
{
// write into tuple output
@@ -44,6 +50,7 @@ public class AMQShortStringEncodingTest extends QpidTestCase
assertNull("Expected null but got " + result, result);
}
+ @Test
public void testWriteReadShortStringWithLengthOver127()
{
AMQShortString value = createString('a', 128);
@@ -59,6 +66,7 @@ public class AMQShortStringEncodingTest extends QpidTestCase
assertEquals("Expected " + value + " but got " + result, value, result);
}
+ @Test
public void testWriteReadShortStringWithLengthLess127()
{
AMQShortString value = new AMQShortString("test");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
index 85bc45e..1609c7c 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
@@ -20,6 +20,15 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.when;
import java.io.File;
@@ -41,6 +50,9 @@ import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.rep.NoConsistencyRequiredPolicy;
import com.sleepycat.je.rep.ReplicatedEnvironment;
import com.sleepycat.je.rep.ReplicationConfig;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,6 +67,7 @@ import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.berkeleydb.replication.DatabasePinger;
import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade;
import org.apache.qpid.server.util.ExternalServiceException;
+import org.apache.qpid.server.util.FileUtils;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHost;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHostImpl;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHARemoteReplicationNode;
@@ -63,40 +76,41 @@ import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNodeTestHelper;
import org.apache.qpid.server.virtualhostnode.berkeleydb.NodeRole;
import org.apache.qpid.test.utils.PortHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-public class BDBHAVirtualHostNodeTest extends QpidTestCase
+public class BDBHAVirtualHostNodeTest extends UnitTestBase
{
private final static Logger LOGGER = LoggerFactory.getLogger(BDBHAVirtualHostNodeTest.class);
private BDBHAVirtualHostNodeTestHelper _helper;
private PortHelper _portHelper = new PortHelper();
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
-
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
_helper = new BDBHAVirtualHostNodeTestHelper(getTestName());
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
try
{
- _helper.tearDown();
+ if (_helper != null)
+ {
+ _helper.tearDown();
+ }
}
finally
{
- super.tearDown();
+ _portHelper.waitUntilAllocatedPortsAreFree();
}
-
- _portHelper.waitUntilAllocatedPortsAreFree();
}
+ @Test
public void testCreateAndActivateVirtualHostNode() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -117,7 +131,8 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
catch (RuntimeException e)
{
- assertTrue("Unexpected Exception being thrown.", e.getCause() instanceof IllegalArgumentException);
+ final boolean condition = e.getCause() instanceof IllegalArgumentException;
+ assertTrue("Unexpected Exception being thrown.", condition);
}
context.put(EnvironmentConfig.ENV_IS_TRANSACTIONAL, "true");
BDBHAVirtualHostNode<?> node = _helper.createHaVHN(attributes);
@@ -133,6 +148,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
BDBConfigurationStore bdbConfigurationStore = (BDBConfigurationStore) store;
ReplicatedEnvironmentFacade environmentFacade = (ReplicatedEnvironmentFacade) bdbConfigurationStore.getEnvironmentFacade();
+
assertEquals(nodeName, environmentFacade.getNodeName());
assertEquals(groupName, environmentFacade.getGroupName());
assertEquals(helperAddress, environmentFacade.getHostPort());
@@ -144,7 +160,9 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
VirtualHost<?> virtualHost = node.getVirtualHost();
assertNotNull("Virtual host child was not added", virtualHost);
assertEquals("Unexpected virtual host name", groupName, virtualHost.getName());
- assertEquals("Unexpected virtual host store", bdbConfigurationStore.getMessageStore(), virtualHost.getMessageStore());
+ assertEquals("Unexpected virtual host store",
+ bdbConfigurationStore.getMessageStore(),
+ virtualHost.getMessageStore());
assertEquals("Unexpected virtual host state", State.ACTIVE, virtualHost.getState());
node.stop();
@@ -159,6 +177,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
assertFalse("Store still exists " + messageStorePath, new File(messageStorePath).exists());
}
+ @Test
public void testMutableAttributes() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -169,9 +188,11 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
Map<String, Object> attributes = _helper.createNodeAttributes(nodeName, groupName, helperAddress, helperAddress, nodeName, node1PortNumber);
BDBHAVirtualHostNode<?> node = _helper.createAndStartHaVHN(attributes);
- assertEquals("Unexpected node priority value before mutation", 1, node.getPriority());
+ assertEquals("Unexpected node priority value before mutation", (long) 1, (long) node.getPriority());
assertFalse("Unexpected designated primary value before mutation", node.isDesignatedPrimary());
- assertEquals("Unexpected electable group override value before mutation", 0, node.getQuorumOverride());
+ assertEquals("Unexpected electable group override value before mutation",
+ (long) 0,
+ (long) node.getQuorumOverride());
Map<String, Object> update = new HashMap<>();
update.put(BDBHAVirtualHostNode.PRIORITY, 2);
@@ -179,14 +200,18 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
update.put(BDBHAVirtualHostNode.QUORUM_OVERRIDE, 1);
node.setAttributes(update);
- assertEquals("Unexpected node priority value after mutation", 2, node.getPriority());
+ assertEquals("Unexpected node priority value after mutation", (long) 2, (long) node.getPriority());
assertTrue("Unexpected designated primary value after mutation", node.isDesignatedPrimary());
- assertEquals("Unexpected electable group override value after mutation", 1, node.getQuorumOverride());
+ assertEquals("Unexpected electable group override value after mutation",
+ (long) 1,
+ (long) node.getQuorumOverride());
assertNotNull("Join time should be set", node.getJoinTime());
- assertNotNull("Last known replication transaction id should be set", node.getLastKnownReplicationTransactionId());
+ assertNotNull("Last known replication transaction id should be set",
+ node.getLastKnownReplicationTransactionId());
}
+ @Test
public void testMutableAttributesAfterMajorityLost() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -206,9 +231,11 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
Map<String, Object> node3Attributes = _helper.createNodeAttributes("node3", groupName, "localhost:" + node3PortNumber, helperAddress, nodeName);
BDBHAVirtualHostNode<?> node3 = _helper.createAndStartHaVHN(node3Attributes);
- assertEquals("Unexpected node priority value before mutation", 1, node1.getPriority());
+ assertEquals("Unexpected node priority value before mutation", (long) 1, (long) node1.getPriority());
assertFalse("Unexpected designated primary value before mutation", node1.isDesignatedPrimary());
- assertEquals("Unexpected electable group override value before mutation", 0, node1.getQuorumOverride());
+ assertEquals("Unexpected electable group override value before mutation",
+ (long) 0,
+ (long) node1.getQuorumOverride());
node2.close();
node3.close();
@@ -223,12 +250,14 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
_helper.awaitForVirtualhost(node1);
- assertEquals("Unexpected node priority value after mutation", 200, node1.getPriority());
+ assertEquals("Unexpected node priority value after mutation", (long) 200, (long) node1.getPriority());
assertTrue("Unexpected designated primary value after mutation", node1.isDesignatedPrimary());
- assertEquals("Unexpected electable group override value after mutation", 1, node1.getQuorumOverride());
-
+ assertEquals("Unexpected electable group override value after mutation",
+ (long) 1,
+ (long) node1.getQuorumOverride());
}
+ @Test
public void testTransferMasterToSelf() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -255,6 +284,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
_helper.assertNodeRole(replica, NodeRole.MASTER);
}
+ @Test
public void testTransferMasterToRemoteReplica() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -301,6 +331,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
_helper.assertNodeRole(replica, NodeRole.MASTER);
}
+ @Test
public void testMutatingRoleWhenNotReplica_IsDisallowed() throws Exception
{
int nodePortNumber = _portHelper.getNextAvailable();
@@ -324,6 +355,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
+ @Test
public void testRemoveReplicaNode() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -356,14 +388,18 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
BDBHAVirtualHostNode<?> replica = _helper.awaitAndFindNodeInRole(NodeRole.REPLICA);
_helper.awaitRemoteNodes(replica, 2);
- assertNotNull("Remote node " + replica.getName() + " is not found", _helper.findRemoteNode(master, replica.getName()));
+ assertNotNull("Remote node " + replica.getName() + " is not found",
+ _helper.findRemoteNode(master, replica.getName()));
replica.delete();
_helper.awaitRemoteNodes(master, 1);
- assertNull("Remote node " + replica.getName() + " is not found", _helper.findRemoteNode(master, replica.getName()));
+ assertNull("Remote node " + replica.getName() + " is not found",
+ _helper.findRemoteNode(master, replica.getName()));
+
}
+ @Test
public void testSetSynchronizationPolicyAttributesOnVirtualHost() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -384,8 +420,12 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
_helper.awaitForAttributeChange(virtualHost, BDBHAVirtualHostImpl.COALESCING_SYNC, true);
- assertEquals("Unexpected local transaction synchronization policy", "SYNC", virtualHost.getLocalTransactionSynchronizationPolicy());
- assertEquals("Unexpected remote transaction synchronization policy", "NO_SYNC", virtualHost.getRemoteTransactionSynchronizationPolicy());
+ assertEquals("Unexpected local transaction synchronization policy",
+ "SYNC",
+ virtualHost.getLocalTransactionSynchronizationPolicy());
+ assertEquals("Unexpected remote transaction synchronization policy",
+ "NO_SYNC",
+ virtualHost.getRemoteTransactionSynchronizationPolicy());
assertTrue("CoalescingSync is not ON", virtualHost.isCoalescingSync());
Map<String, Object> virtualHostAttributes = new HashMap<String,Object>();
@@ -396,8 +436,12 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
virtualHost.stop();
virtualHost.start();
- assertEquals("Unexpected local transaction synchronization policy", "WRITE_NO_SYNC", virtualHost.getLocalTransactionSynchronizationPolicy());
- assertEquals("Unexpected remote transaction synchronization policy", "SYNC", virtualHost.getRemoteTransactionSynchronizationPolicy());
+ assertEquals("Unexpected local transaction synchronization policy",
+ "WRITE_NO_SYNC",
+ virtualHost.getLocalTransactionSynchronizationPolicy());
+ assertEquals("Unexpected remote transaction synchronization policy",
+ "SYNC",
+ virtualHost.getRemoteTransactionSynchronizationPolicy());
assertFalse("CoalescingSync is not OFF", virtualHost.isCoalescingSync());
try
{
@@ -421,6 +465,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
+ @Test
public void testNotPermittedNodeIsNotAllowedToConnect() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -438,6 +483,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
BDBHAVirtualHostNode<?> node2 = _helper.createAndStartHaVHN(node2Attributes);
Map<String, Object> node3Attributes = _helper.createNodeAttributes("node3", groupName, "localhost:" + node3PortNumber, helperAddress, nodeName);
+
try
{
_helper.createHaVHN(node3Attributes);
@@ -445,10 +491,13 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
catch(IllegalConfigurationException e)
{
- assertEquals("Unexpected exception message", String.format("Node using address '%s' is not permitted to join the group 'group'", "localhost:" + node3PortNumber, groupName), e.getMessage());
+ assertEquals("Unexpected exception message",
+ String.format("Node using address '%s' is not permitted to join the group 'group'", "localhost:" + node3PortNumber, groupName),
+ e.getMessage());
}
}
+ @Test
public void testCurrentNodeCannotBeRemovedFromPermittedNodeList() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -486,10 +535,13 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
catch(IllegalArgumentException e)
{
- assertEquals("Unexpected exception message", String.format("The current group node '%s' cannot be removed from '%s' as its already a group member", node3Address, BDBHAVirtualHostNode.PERMITTED_NODES), e.getMessage());
+ assertEquals("Unexpected exception message",
+ String.format("The current group node '%s' cannot be removed from '%s' as its already a group member", node3Address, BDBHAVirtualHostNode.PERMITTED_NODES),
+ e.getMessage());
}
}
+ @Test
public void testPermittedNodesAttributeModificationConditions() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -534,7 +586,9 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
catch(IllegalArgumentException e)
{
- assertEquals("Unexpected exception message", String.format("Attribute '%s' can only be set on '%s' node or node in '%s' or '%s' state", BDBHAVirtualHostNode.PERMITTED_NODES, NodeRole.MASTER, State.STOPPED, State.ERRORED), e.getMessage());
+ assertEquals("Unexpected exception message",
+ String.format("Attribute '%s' can only be set on '%s' node or node in '%s' or '%s' state", BDBHAVirtualHostNode.PERMITTED_NODES, NodeRole.MASTER, State.STOPPED, State.ERRORED),
+ e.getMessage());
}
// Try to update the permitted nodes attributes using the new list on MASTER - should succeed
@@ -547,6 +601,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
nonMasterNode.setAttributes(Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.PERMITTED_NODES, amendedPermittedNodes));
}
+ @Test
public void testNodeCannotStartWithIntruder() throws Exception
{
int nodePortNumber = _portHelper.getNextAvailable();
@@ -576,7 +631,8 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
Durability durability = Durability.parse((String) node1Attributes.get(BDBHAVirtualHostNode.DURABILITY));
joinIntruder(intruderPortNumber, "intruder", groupName, helperAddress, durability, environmentPathFile);
- assertTrue("Intruder protection was not triggered during expected timeout", stopLatch.await(10, TimeUnit.SECONDS));
+ assertTrue("Intruder protection was not triggered during expected timeout",
+ stopLatch.await(10, TimeUnit.SECONDS));
final CountDownLatch stateChangeLatch = new CountDownLatch(1);
final CountDownLatch roleChangeLatch = new CountDownLatch(1);
@@ -613,7 +669,8 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
catch (IllegalStateException ise)
{
assertEquals("Unexpected exception when restarting node post intruder detection",
- "Intruder node detected: " + "localhost:" + intruderPortNumber, ise.getMessage());
+ "Intruder node detected: " + "localhost:" + intruderPortNumber,
+ ise.getMessage());
}
// verify that intruder detection is triggered after restart and environment is closed
@@ -621,6 +678,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
assertTrue("Node role was not set to DETACHED", roleChangeLatch.await(10, TimeUnit.SECONDS));
}
+ @Test
public void testIntruderProtectionInManagementMode() throws Exception
{
int nodePortNumber = _portHelper.getNextAvailable();
@@ -659,7 +717,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
LOGGER.debug("Permitted and intruder nodes are created");
assertTrue("Intruder protection was not triggered during expected timeout",
- stopLatch.await(10, TimeUnit.SECONDS));
+ stopLatch.await(10, TimeUnit.SECONDS));
LOGGER.debug("Master node transited into ERRORED state due to intruder protection");
when(_helper.getBroker().isManagementMode()).thenReturn(true);
@@ -699,6 +757,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
assertTrue("Node role was not set to DETACHED", roleChangeLatch.await(10, TimeUnit.SECONDS));
}
+ @Test
public void testPermittedNodesChangedOnReplicaNodeOnlyOnceAfterBeingChangedOnMaster() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -737,9 +796,14 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
permittedNodes.add("localhost:5000");
node1.setAttributes(Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.PERMITTED_NODES, permittedNodes));
- assertTrue("Permitted nodes were not changed on Replica", _permittedNodesLatch.await(10, TimeUnit.SECONDS));
- assertEquals("Not the same permitted nodes", new HashSet<>(node1.getPermittedNodes()), new HashSet<>(node2.getPermittedNodes()));
- assertEquals("Unexpected counter of changes permitted nodes", 1, permittedNodesChangeCounter.get());
+ assertTrue("Permitted nodes were not changed on Replica",
+ _permittedNodesLatch.await(10, TimeUnit.SECONDS));
+ assertEquals("Not the same permitted nodes",
+ new HashSet<>(node1.getPermittedNodes()),
+ new HashSet<>(node2.getPermittedNodes()));
+ assertEquals("Unexpected counter of changes permitted nodes",
+ (long) 1,
+ (long) permittedNodesChangeCounter.get());
// change the order of permitted nodes
Collections.swap(permittedNodes, 0, 2);
@@ -750,7 +814,9 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
// perform transaction second time because permitted nodes are changed after last transaction id
performTransactionAndAwaitForRemoteNodeToGetAware(node1, remote);
- assertEquals("Unexpected counter of changes permitted nodes", 1, permittedNodesChangeCounter.get());
+ assertEquals("Unexpected counter of changes permitted nodes",
+ (long) 1,
+ (long) permittedNodesChangeCounter.get());
}
private void performTransactionAndAwaitForRemoteNodeToGetAware(BDBHAVirtualHostNode<?> node1, BDBHARemoteReplicationNode<?> remote) throws InterruptedException
@@ -762,9 +828,12 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
{
Thread.sleep(100l);
}
- assertEquals("Last transaction was not replicated", new Long(remote.getLastKnownReplicationTransactionId()), node1.getLastKnownReplicationTransactionId() );
+ assertEquals("Last transaction was not replicated",
+ new Long(remote.getLastKnownReplicationTransactionId()),
+ node1.getLastKnownReplicationTransactionId());
}
+ @Test
public void testIntruderConnected() throws Exception
{
int node1PortNumber = _portHelper.getNextAvailable();
@@ -796,7 +865,8 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
Durability durability = Durability.parse((String) node1Attributes.get(BDBHAVirtualHostNode.DURABILITY));
joinIntruder(node2PortNumber, node2Name, groupName, helperAddress, durability, environmentPathFile);
- assertTrue("Intruder protection was not triggered during expected timeout", stopLatch.await(20, TimeUnit.SECONDS));
+ assertTrue("Intruder protection was not triggered during expected timeout",
+ stopLatch.await(20, TimeUnit.SECONDS));
}
private void joinIntruder(final int nodePortNumber,
@@ -839,6 +909,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
}
}
+ @Test
public void testValidateOnCreateForNonExistingHelperNode() throws Exception
{
int node1PortNumber = findFreePort();
@@ -855,10 +926,12 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
catch(ExternalServiceException e)
{
assertEquals("Unexpected exception on connection to non-existing helper address",
- String.format("Cannot connect to existing node '%s' at '%s'", "node2", "localhost:" + node2PortNumber), e.getMessage());
+ String.format("Cannot connect to existing node '%s' at '%s'", "node2", "localhost:" + node2PortNumber),
+ e.getMessage());
}
}
+ @Test
public void testValidateOnCreateForAlreadyBoundAddress() throws Exception
{
try(ServerSocket serverSocket = new ServerSocket())
@@ -877,11 +950,13 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
catch(IllegalConfigurationException e)
{
assertEquals("Unexpected exception on attempt to create node with already bound address",
- String.format("Cannot bind to address '%s'. Address is already in use.", "localhost:" + node1PortNumber), e.getMessage());
+ String.format("Cannot bind to address '%s'. Address is already in use.", "localhost:" + node1PortNumber),
+ e.getMessage());
}
}
}
+ @Test
public void testValidateOnCreateForInvalidStorePath() throws Exception
{
int node1PortNumber = 0;
@@ -903,7 +978,8 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase
catch (IllegalConfigurationException e)
{
assertEquals("Unexpected exception on attempt to create environment in invalid location",
- String.format("Store path '%s' is not a folder", storePath.getAbsoluteFile()), e.getMessage());
+ String.format("Store path '%s' is not a folder", storePath.getAbsoluteFile()),
+ e.getMessage());
}
}
finally
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
index a58b1e7..15ddaef 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
@@ -20,18 +20,32 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.Before;
+
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.AbstractDurableConfigurationStoreTestCase;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
public class BDBMessageStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase
{
+ @Before
+ @Override
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+ super.setUp();
+ }
+
@Override
protected VirtualHostNode createVirtualHostNode(String storeLocation, ConfiguredObjectFactory factory)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
index ee0edb5..806002f 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -27,10 +30,13 @@ import static org.mockito.Mockito.when;
import java.util.Collections;
import java.util.Map;
+import org.junit.Before;
+
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreQuotaEventsTestBase;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
public class BDBMessageStoreQuotaEventsTest extends MessageStoreQuotaEventsTestBase
{
@@ -58,6 +64,14 @@ public class BDBMessageStoreQuotaEventsTest extends MessageStoreQuotaEventsTestB
return NUMBER_OF_MESSAGES_TO_OVERFILL_STORE;
}
+ @Before
+ @Override
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+ super.setUp();
+ }
+
@Override
protected VirtualHost createVirtualHost(String storeLocation)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index 91f698a..c12a38f 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -20,11 +20,19 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.File;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.v0_8.AMQShortString;
@@ -39,6 +47,7 @@ import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.FileUtils;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
/**
* Subclass of MessageStoreTestCase which runs the standard tests from the superclass against
@@ -51,6 +60,13 @@ public class BDBMessageStoreTest extends MessageStoreTestCase
private String _storeLocation;
@Override
+ public void setUp() throws Exception
+ {
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+ super.setUp();
+ }
+
+ @Override
public void tearDown() throws Exception
{
try
@@ -90,6 +106,7 @@ public class BDBMessageStoreTest extends MessageStoreTestCase
* interrogating the store with its own implementation methods and verifying
* expected exceptions are thrown to indicate the message is not present.
*/
+ @Test
public void testMessageCreationAndRemoval() throws Exception
{
BDBMessageStore bdbStore = (BDBMessageStore) getStore();
@@ -143,6 +160,7 @@ public class BDBMessageStoreTest extends MessageStoreTestCase
return storedMessage_0_8.allContentAdded();
}
+ @Test
public void testOnDelete() throws Exception
{
String storeLocation = getStore().getStoreLocation();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
index bd16a86..dd183ab 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
@@ -20,6 +20,14 @@
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,7 +40,6 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
-
import com.sleepycat.bind.tuple.ByteBinding;
import com.sleepycat.bind.tuple.StringBinding;
import com.sleepycat.je.Database;
@@ -40,6 +47,9 @@ import com.sleepycat.je.DatabaseConfig;
import com.sleepycat.je.DatabaseEntry;
import com.sleepycat.je.Environment;
import com.sleepycat.je.EnvironmentConfig;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -50,20 +60,21 @@ import org.apache.qpid.server.store.berkeleydb.tuple.UUIDTupleBinding;
import org.apache.qpid.server.store.preferences.PreferenceRecord;
import org.apache.qpid.server.store.preferences.PreferenceRecordImpl;
import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-public class BDBPreferenceStoreTest extends QpidTestCase
+public class BDBPreferenceStoreTest extends UnitTestBase
{
private File _storeFile;
private PreferenceStoreUpdater _updater;
private BDBPreferenceStore _preferenceStore;
private List<PreferenceRecord> _testInitialRecords;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
_storeFile = new File(TMP_FOLDER, getTestName() + System.currentTimeMillis() + ".preferences.bdb");
boolean result = _storeFile.mkdirs();
@@ -83,20 +94,26 @@ public class BDBPreferenceStoreTest extends QpidTestCase
populateTestData(_testInitialRecords, BrokerModel.MODEL_VERSION);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
- _preferenceStore.close();
- FileUtils.delete(_storeFile, true);
+ if (_preferenceStore != null)
+ {
+ _preferenceStore.close();
+ }
}
finally
{
- super.tearDown();
+ if (_storeFile != null)
+ {
+ FileUtils.delete(_storeFile, true);
+ }
}
}
+ @Test
public void testVersionAfterUpgrade() throws Exception
{
FileUtils.delete(_storeFile, true);
@@ -112,26 +129,30 @@ public class BDBPreferenceStoreTest extends QpidTestCase
assertEquals("Unexpected version", BrokerModel.MODEL_VERSION, storedVersion.toString());
}
+ @Test
public void testOpenAndLoad() throws Exception
{
Collection<PreferenceRecord> recovered = _preferenceStore.openAndLoad(_updater);
assertEquals("Unexpected store state",
- AbstractBDBPreferenceStore.StoreState.OPENED,
- _preferenceStore.getStoreState());
+ AbstractBDBPreferenceStore.StoreState.OPENED,
+ _preferenceStore.getStoreState());
+
assertNotNull("Store was not properly opened", _preferenceStore.getEnvironmentFacade());
PreferenceTestHelper.assertRecords(_testInitialRecords, recovered);
}
+ @Test
public void testClose() throws Exception
{
_preferenceStore.openAndLoad(_updater);
_preferenceStore.close();
assertEquals("Unexpected store state",
- AbstractBDBPreferenceStore.StoreState.CLOSED,
- _preferenceStore.getStoreState());
+ AbstractBDBPreferenceStore.StoreState.CLOSED,
+ _preferenceStore.getStoreState());
assertNull("Store was not properly closed", _preferenceStore.getEnvironmentFacade());
}
+ @Test
public void testUpdateOrCreate() throws Exception
{
_preferenceStore.openAndLoad(_updater);
@@ -150,6 +171,7 @@ public class BDBPreferenceStoreTest extends QpidTestCase
PreferenceTestHelper.assertRecords(expected, recovered);
}
+ @Test
public void testReplace() throws Exception
{
_preferenceStore.openAndLoad(_updater);
@@ -168,6 +190,7 @@ public class BDBPreferenceStoreTest extends QpidTestCase
PreferenceTestHelper.assertRecords(recordsToAddUpdate, recovered);
}
+ @Test
public void testUpdateFailIfNotOpened() throws Exception
{
try
@@ -181,6 +204,7 @@ public class BDBPreferenceStoreTest extends QpidTestCase
}
}
+ @Test
public void testReplaceFailIfNotOpened() throws Exception
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommitterTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommitterTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommitterTest.java
index 2448a37..4ac18c2 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommitterTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommitterTest.java
@@ -20,6 +20,11 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -30,37 +35,38 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-
-public class CoalescingCommitterTest extends QpidTestCase
+public class CoalescingCommitterTest extends UnitTestBase
{
private EnvironmentFacade _environmentFacade;
private CoalescingCommiter _coalescingCommitter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+
_environmentFacade = mock(EnvironmentFacade.class);
_coalescingCommitter = new CoalescingCommiter("Test", _environmentFacade);
_coalescingCommitter.start();
}
- @Override
- public void tearDown() throws Exception
+ @After
+ public void tearDown()
{
- try
+ if (_coalescingCommitter != null)
{
_coalescingCommitter.stop();
}
- finally
- {
- super.tearDown();
- }
}
+ @Test
public void testCommitterEnvironmentFacadeInteractionsOnSyncCommit() throws Exception
{
RuntimeException testFailure = new RuntimeException("Test");
@@ -85,6 +91,7 @@ public class CoalescingCommitterTest extends QpidTestCase
verify(_environmentFacade, times(1)).flushLogFailed(testFailure);
}
+ @Test
public void testCommitterEnvironmentFacadeInteractionsOnAsyncCommit() throws Exception
{
RuntimeException testFailure = new RuntimeException("Test");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
index cc7df9e..06c509f 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/EnvHomeRegistryTest.java
@@ -19,18 +19,24 @@
package org.apache.qpid.server.store.berkeleydb;
+import static org.junit.Assert.fail;
+
import java.io.File;
+import org.junit.Test;
+
import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class EnvHomeRegistryTest extends QpidTestCase
+public class EnvHomeRegistryTest extends UnitTestBase
{
private final EnvHomeRegistry _ehr = new EnvHomeRegistry();
+ @Test
public void testDuplicateEnvHomeRejected() throws Exception
{
- File home = new File(QpidTestCase.TMP_FOLDER, getName());
+ File home = new File(QpidTestCase.TMP_FOLDER, getTestName());
_ehr.registerHome(home);
try
@@ -44,18 +50,20 @@ public class EnvHomeRegistryTest extends QpidTestCase
}
}
+ @Test
public void testUniqueEnvHomesAllowed() throws Exception
{
- File home1 = new File(QpidTestCase.TMP_FOLDER, getName() + "1");
- File home2 = new File(QpidTestCase.TMP_FOLDER, getName() + "2");
+ File home1 = new File(QpidTestCase.TMP_FOLDER, getTestName() + "1");
+ File home2 = new File(QpidTestCase.TMP_FOLDER, getTestName() + "2");
_ehr.registerHome(home1);
_ehr.registerHome(home2);
}
+ @Test
public void testReuseOfEnvHomesAllowed() throws Exception
{
- File home = new File(QpidTestCase.TMP_FOLDER, getName() + "1");
+ File home = new File(QpidTestCase.TMP_FOLDER, getTestName() + "1");
_ehr.registerHome(home);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
index 3521f0b..8282df1 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.store.berkeleydb;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,24 +33,27 @@ import java.io.File;
import java.util.Collections;
import com.sleepycat.je.EnvironmentConfig;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.store.FileBasedSettings;
import org.apache.qpid.server.util.FileUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-public class StandardEnvironmentFacadeFactoryTest extends QpidTestCase
+public class StandardEnvironmentFacadeFactoryTest extends UnitTestBase
{
private File _path;
private ConfiguredObject<?> _parent;
- @Override
- public void setUp()throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
_path = TestFileUtils.createTestDirectory(".je.test", true);
@@ -65,20 +72,19 @@ public class StandardEnvironmentFacadeFactoryTest extends QpidTestCase
}));
}
- @Override
public void tearDown()throws Exception
{
try
{
EnvHomeRegistry.getInstance().deregisterHome(_path);
- FileUtils.delete(_path, true);
}
finally
{
- super.tearDown();
+ FileUtils.delete(_path, true);
}
}
+ @Test
public void testCreateEnvironmentFacade()
{
when(_parent.getName()).thenReturn(getTestName());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
index 0bf6f73..4eff65b 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
@@ -21,7 +21,15 @@
package org.apache.qpid.server.store.berkeleydb;
import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.JUL_LOGGER_LEVEL_OVERRIDE;
-import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.LOG_HANDLER_CLEANER_PROTECTED_FILES_LIMIT_PROPERTY_NAME;
+import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade
+ .LOG_HANDLER_CLEANER_PROTECTED_FILES_LIMIT_PROPERTY_NAME;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -36,28 +44,32 @@ import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseConfig;
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.Transaction;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.util.FileUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
-public class StandardEnvironmentFacadeTest extends QpidTestCase
+public class StandardEnvironmentFacadeTest extends UnitTestBase
{
protected File _storePath;
protected EnvironmentFacade _environmentFacade;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
+ assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
+
_storePath = new File(TMP_FOLDER + File.separator + "bdb" + File.separator + getTestName());
}
- @Override
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
try
{
- super.tearDown();
if (_environmentFacade != null)
{
_environmentFacade.close();
@@ -72,6 +84,7 @@ public class StandardEnvironmentFacadeTest extends QpidTestCase
}
}
+ @Test
public void testSecondEnvironmentFacadeUsingSamePathRejected() throws Exception
{
EnvironmentFacade ef = createEnvironmentFacade();
@@ -92,12 +105,14 @@ public class StandardEnvironmentFacadeTest extends QpidTestCase
assertNotNull("Environment should not be null", ef2);
}
+ @Test
public void testClose() throws Exception
{
EnvironmentFacade ef = createEnvironmentFacade();
ef.close();
}
+ @Test
public void testOverrideJeParameter() throws Exception
{
// verify that transactions can be created by default
@@ -121,6 +136,7 @@ public class StandardEnvironmentFacadeTest extends QpidTestCase
}
+ @Test
public void testOpenDatabaseReusesCachedHandle() throws Exception
{
DatabaseConfig createIfAbsentDbConfig = DatabaseConfig.DEFAULT.setAllowCreate(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org