diff options
Diffstat (limited to 'java/test-profiles')
36 files changed, 213 insertions, 486 deletions
diff --git a/java/test-profiles/JavaPre010Excludes b/java/test-profiles/08StandaloneExcludes index 8344cd98c2..b482a14c6d 100644 --- a/java/test-profiles/JavaPre010Excludes +++ b/java/test-profiles/08StandaloneExcludes @@ -18,39 +18,22 @@ // //====================================================================== -//Exclude the following from brokers using the 0-8/0-9/0-9-1 protocols +//Exclude the following from brokers defaulting to the 0-8 protocol //====================================================================== -// This test requires a broker capable of 0-8/0-9/0-9-1 and 0-10 concurrently +// This test requires a broker capable of 0-8/9 and 0-10 org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend // QPID-2478 test fails when run against broker using 0-8/9 org.apache.qpid.test.client.message.JMSDestinationTest#testGetDestinationWithCustomExchange -// The new addressing based syntax is not supported for AMQP 0-8/0-9 versions +// The new addressing based sytanx is not supported for AMQP 0-8/0-9 versions org.apache.qpid.test.client.destination.AddressBasedDestinationTest#* org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy -org.apache.qpid.test.unit.message.JMSPropertiesTest#testApplicationProperties // Those tests are written against the 0.10 path org.apache.qpid.test.unit.message.UTF8Test#* org.apache.qpid.client.MessageListenerTest#testSynchronousReceiveNoWait -// Tests 0.10 client feature org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnsupportedSASLMechanism - -// uses AMQP 0-10 related properties -org.apache.qpid.test.unit.message.JMSPropertiesTest#testQpidExtensionProperties - -// LVQ tests use new address syntax and can not be run on 0.9.1 profiles -org.apache.qpid.test.client.queue.LVQTest#* - -// Verification of unique client id is 0-10 specific -org.apache.qpid.test.unit.client.connection.ConnectionTest#testClientIDVerificationForSameUser -org.apache.qpid.test.unit.client.connection.ConnectionTest#testClientIDVerificationForDifferentUsers - -// Under AMQP 0-8..0-9-1 temporary queues are deleted on consumer close, rather than connection close -// and for this reason this test would fail. -org.apache.qpid.test.unit.client.temporaryqueue.TemporaryQueueTest#testTemporaryQueueReused - diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes index 39b4d542db..e89b09cca2 100755 --- a/java/test-profiles/CPPExcludes +++ b/java/test-profiles/CPPExcludes @@ -17,17 +17,11 @@ // under the License. // -// QPID-3391: the C++ broker does not currently validate the exchange creation arguments -org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithNonsenseArgs - -//This test requires SSL, but SSL is only enabled for the C++ broker in the cpp.ssl test profile -//which runs *all* the tests with SSL, so this one can be excluded safely enough -org.apache.qpid.test.unit.client.AMQSSLConnectionTest#* - org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* org.apache.qpid.client.ResetMessageListenerTest#* // This test is not finished +org.apache.qpid.test.testcases.TTLTest#* org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover // Those tests are testing 0.8 specific semantics @@ -64,6 +58,9 @@ org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges // 0-10 c++ broker in cpp.testprofile is started with no auth so won't pass this test org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection +// c++ broker doesn't do selectors, so this will fail +org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue + // InVM Broker tests org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* @@ -139,10 +136,14 @@ org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#* // These are recent test additions that are failing with the c++ broker // Temporarily disabling until properly investigated. +org.apache.qpid.test.unit.publish.DirtyTransactedPublishTest#* org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#* org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#* +// Temporarily adding the following until the issues are sorted out. +org.apache.qpid.test.unit.client.AMQConnectionTest#testHeartBeat + //Excluded due to QPID-1447 : CPP broker does not have SlowConsumer Disconnection org.apache.qpid.systest.GlobalQueuesTest#* org.apache.qpid.systest.GlobalTopicsTest#* @@ -164,26 +165,6 @@ org.apache.qpid.server.security.firewall.FirewallConfigTest#* org.apache.qpid.server.security.firewall.FirewallConfigurationTest#* org.apache.qpid.server.plugins.PluginTest#* -// Transacion timeouts not implemented in CPP broker -org.apache.qpid.test.unit.transacted.TransactionTimeoutDisabledTest#* -org.apache.qpid.test.unit.transacted.TransactionTimeoutConfigurationTest#* -org.apache.qpid.test.unit.transacted.TransactionTimeoutTest#* - // Java broker only org.apache.qpid.server.logging.management.LoggingManagementMBeanTest#* org.apache.qpid.server.management.AMQUserManagementMBeanTest#* - -// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. -org.apache.qpid.server.failover.FailoverMethodTest#* - -//QPID-3468: exclude QueueBrowser related failover tests -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated diff --git a/java/test-profiles/CPPTransientExcludes b/java/test-profiles/CPPTransientExcludes index a214cf5b5c..47f24db19c 100644 --- a/java/test-profiles/CPPTransientExcludes +++ b/java/test-profiles/CPPTransientExcludes @@ -27,6 +27,3 @@ org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash org.apache.qpid.test.unit.xa.TopicTest#testRecover org.apache.qpid.test.unit.xa.QueueTest#testRecover org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover - -// test requires a persistent store -org.apache.qpid.test.unit.ack.ClientAcknowledgeTest#testClientAckWithLargeFlusherPeriod diff --git a/java/test-profiles/Excludes b/java/test-profiles/Excludes index b1edd07f87..ff6993fa0b 100644 --- a/java/test-profiles/Excludes +++ b/java/test-profiles/Excludes @@ -17,6 +17,13 @@ // under the License. // +org.apache.qpid.client.MultipleJCAProviderRegistrationTest#test +// QPID-1715, QPID-1715 : Client Error Handling on close is still broken +org.apache.qpid.server.queue.QueueCreateTest#testCreatePriorityString +org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskValidNoSize +org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalid +org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalidSize + // // QPID-2031 : Broker is not cleanly shutdown by QpidTestCase // @@ -26,7 +33,7 @@ org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownStopped org.apache.qpid.server.logging.VirtualHostLoggingTest#testVirtualhostClosure org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#testMessageStoreClose -// QPID-3424 : Test fails to start external broker due to Derby Exception. +// QPID-XXX : Test fails to start external broker due to Derby Exception. org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#* // QPID-1816 : Client Ack has not been addressed @@ -44,4 +51,3 @@ org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#* // QPID-2418 : The queue backing the dur sub is not currently deleted at subscription change, so the test will fail. org.apache.qpid.test.unit.ct.DurableSubscriberTest#testResubscribeWithChangedSelectorAndRestart -org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHostLocalDomain diff --git a/java/test-profiles/Java010Excludes b/java/test-profiles/Java010Excludes index e7718b982d..3486d5c70c 100755 --- a/java/test-profiles/Java010Excludes +++ b/java/test-profiles/Java010Excludes @@ -37,6 +37,9 @@ org.apache.qpid.test.client.FlowControlTest#* // 0-10 protocol doesn't support message bouncing org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* +// QPID-1727 , QPID-1726 :c++ broker does not support flow to disk on transient queues. Also it requries a persistent store impl. for Apache +org.apache.qpid.test.client.QueueBrowsingFlowToDiskTest#* + // 0-10 and 0-9 connections dont generate the exact same logging due to protocol differences org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartsFlowStopped org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartConsumerFlowStarted @@ -44,49 +47,35 @@ org.apache.qpid.server.logging.SubscriptionLoggingTest#testSubscriptionSuspend // 0-10 Broker does not have a JMX connection MBean org.apache.qpid.management.jmx.ManagementActorLoggingTest#testConnectionCloseViaManagement -org.apache.qpid.management.jmx.MessageConnectionStatisticsTest#* + +// 0-10 has different ideas about clientid and ownership of queues +org.apache.qpid.server.queue.ModelTest#* // 0-10 is not supported by the MethodRegistry org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#* +// QPID-2084 : this test needs more work for 0-10 +org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#* + //QPID-942 : Implemented Channel.Flow based Producer Side flow control to the Java Broker (not in CPP Broker) org.apache.qpid.server.queue.ProducerFlowControlTest#* //QPID-1950 : Commit to test this failure. This is a MINA only failure so it cannot be tested when using 010. org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#* -//QPID-1864: rollback with subscriptions does not work in 0-10 yet -org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage - -// This test uses 0-8 channel frames -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* +//QPID-2471 : Issues with 0-10 recovery +org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverInAutoAckListener -//QPID-3422: test fails because ring queue is not implemented on java broker -org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode +// Temporarily disabling until properly investigated. +org.apache.qpid.test.unit.publish.DirtyTransactedPublishTest#* -// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. -org.apache.qpid.server.failover.FailoverMethodTest#* - -// QPID-3392: the Java broker does not yet implement exchange creation arguments -org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithArgs -org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testSessionCreateTopicWithExchangeArgs - -// QPID-1935: the following tests are failing on 0.10 profiles -org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser - -// QPID-3432: These tests test the behaviour of 0-8..-0-9-1 specific system property (amqj.default_syncwrite_timeout) -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +//rollback with subscriptions does not work in 0-10 yet +org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage +org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener -//QPID-3468: exclude QueueBrowser related failover tests -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated +//Temporarily adding the following until the issues are sorted out. +//Should probably raise JIRAs for them. +org.apache.qpid.transport.network.mina.MINANetworkDriverTest#* +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchange +org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode diff --git a/java/test-profiles/JavaBDBExcludes b/java/test-profiles/JavaBDBExcludes deleted file mode 100644 index 3fac01cb6d..0000000000 --- a/java/test-profiles/JavaBDBExcludes +++ /dev/null @@ -1,22 +0,0 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -//This test is subclassed within the bdbstore module to enable it to run and -//also add some bdb-specific tests. It is excluded to prevent running twice. -org.apache.qpid.server.store.MessageStoreTest#* diff --git a/java/test-profiles/JavaDerbyExcludes b/java/test-profiles/JavaDerbyExcludes deleted file mode 100644 index 3caa360d48..0000000000 --- a/java/test-profiles/JavaDerbyExcludes +++ /dev/null @@ -1,21 +0,0 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* -org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* diff --git a/java/test-profiles/JavaExcludes b/java/test-profiles/JavaExcludes index 8de36cbd9a..c38a250abc 100644 --- a/java/test-profiles/JavaExcludes +++ b/java/test-profiles/JavaExcludes @@ -17,29 +17,38 @@ // under the License. // -// QPID-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* +// Those tests are not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.testcases.FailoverTest#* -//QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Java broker -org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy -org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy - -/////////////////////////////////////////////////////// -//Moved from JavaStandaloneExcludes when it was removed -/////////////////////////////////////////////////////// - -// QPID-3426: The following test is broken. // This is a long running test so should exclude from normal runs org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover -// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM -org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* - -//QPID-1818, QPID-1821 : Client code path does not correctly restore a transacted session after failover. +//QPID-1818 : Client code path does not correctly restore a transacted session after failover. org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* -//XA functionality is not fully implemented yet -org.apache.qpid.jms.xa.XAResourceTest#* +// QPID-1823: this takes ages to run +org.apache.qpid.client.SessionCreateTest#* + +// related to QPID-2471. Temporarily disabling these tests until I figure out why they are failing with the Java broker. +org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgs +org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgsAckOnEarlier +org.apache.qpid.test.unit.ack.RecoverTest#testAcknowledgePerConsumer +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverResendsMsgs +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverResendsMsgsAckOnEarlier +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testAcknowledgePerConsumer + +// related to QPID-2471. These are new test cases and fail with the Java broker. +org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithAsyncConsumer +org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithSyncConsumer +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testOderingWithAsyncConsumer +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testOderingWithSyncConsumer + +org.apache.qpid.test.client.queue.LVQTest#* -//The Java broker doesnt support client auth -org.apache.qpid.client.ssl.SSLTest#testMultipleCertsInSingleStore +// Session resume is not supported in the Java client +org.apache.qpid.transport.ConnectionTest#testResumeNonemptyReplayBuffer + +//QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Java broker +org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy +org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy diff --git a/java/test-profiles/JavaInVMExcludes b/java/test-profiles/JavaInVMExcludes new file mode 100644 index 0000000000..7e7da4302e --- /dev/null +++ b/java/test-profiles/JavaInVMExcludes @@ -0,0 +1,43 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +//====================================================================== +//Exclude the following tests when running the InVM default test profile +//====================================================================== + +// The FirewallPlugin only operates for TCP connections, the tests NO-OP when run InVM +org.apache.qpid.server.security.firewall.FirewallConfigTest#* + +// This test requires a broker capable of 0-8/9 and 0-10 +org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend + +// QPID-2478 test fails when run against broker using 0-8/9 +org.apache.qpid.test.client.message.JMSDestinationTest#testGetDestinationWithCustomExchange + +// related to QPID-2471. Temporarily disabling these tests until I figure out why they are failing with the Java broker. +org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgs +org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgsAckOnEarlier +org.apache.qpid.test.unit.ack.RecoverTest#testAcknowledgePerConsumer + +// related to QPID-2471. These are new test cases and fail with the Java broker. +org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithAsyncConsumer +org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithSyncConsumer + +//The VM broker does not export the logging management JMX MBean +org.apache.qpid.server.security.acl.ExternalAdminACLTest#* diff --git a/java/test-profiles/JavaStandaloneExcludes b/java/test-profiles/JavaStandaloneExcludes new file mode 100644 index 0000000000..d208a20d15 --- /dev/null +++ b/java/test-profiles/JavaStandaloneExcludes @@ -0,0 +1,55 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +// This is a long running test so should exclude from normal runs +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover + +// Those tests require failover support +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser +org.apache.qpid.test.testcases.FailoverTest#* +org.apache.qpid.test.client.failover.FailoverTest#* + +// InVM Broker tests awaiting resolution of QPID-1103 +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* + +// This test currently does not pick up the runtime location of the nonVm queueBacking store. +org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* + +// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM +org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* + +//QPID-1818 : Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +// This test requires the standard configuration file for validation. +// Excluding here does not reduce test coverage. +org.apache.qpid.server.configuration.ServerConfigurationFileTest#* + diff --git a/java/test-profiles/JavaTransientExcludes b/java/test-profiles/JavaTransientExcludes index 67190a6fcc..2ea46795d9 100644 --- a/java/test-profiles/JavaTransientExcludes +++ b/java/test-profiles/JavaTransientExcludes @@ -19,7 +19,6 @@ //These tests require a persistent store org.apache.qpid.server.store.PersistentStoreTest#* -org.apache.qpid.test.unit.ack.ClientAcknowledgeTest#testClientAckWithLargeFlusherPeriod org.apache.qpid.test.unit.ct.DurableSubscriberTest#* @@ -31,6 +30,3 @@ org.apache.qpid.server.store.MessageStoreTest#testQueuePersistence org.apache.qpid.server.store.MessageStoreTest#testDurableQueueRemoval org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval - -org.apache.qpid.server.store.berkeleydb.BDBMessageStoreTest#* -org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#* diff --git a/java/test-profiles/java-mms-spawn.0-10.testprofile b/java/test-profiles/clean-dir index 5e5d2e8a6b..4d6141b4ab 100644..100755 --- a/java/test-profiles/java-mms-spawn.0-10.testprofile +++ b/java/test-profiles/clean-dir @@ -1,4 +1,7 @@ + +#!/bin/bash # +# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -6,24 +9,17 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# # -broker.version=v0_10 -broker.language=java -broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-10 -profile.excludes=JavaTransientExcludes Java010Excludes + + +rm -rf $@; mkdir $@ diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile index 5357e87687..c3d47f0ce6 100644 --- a/java/test-profiles/cpp.async.testprofile +++ b/java/test-profiles/cpp.async.testprofile @@ -19,5 +19,3 @@ include=cpp profile.excludes=CPPPrefetchExcludes broker.modules=--load-module ${broker.module.store} -broker.persistent=true - diff --git a/java/test-profiles/cpp.ssl.excludes b/java/test-profiles/cpp.ssl.excludes index 14c8ac2fe3..4d499c57b9 100644 --- a/java/test-profiles/cpp.ssl.excludes +++ b/java/test-profiles/cpp.ssl.excludes @@ -18,10 +18,3 @@ // #org.apache.qpid.test.client.failover.FailoverTest#* - -//This test does not supply a client keystore, therefore it cant login to the C++ broker -//in this test profile as it demands client certificate authentication -org.apache.qpid.client.ssl.SSLTest#testCreateSSLConnectionUsingConnectionURLParamsTrustStoreOnly - -//QPID-3431: excluding because this takes 30+ mins to run on the C++ SSL profile for some reason -org.apache.qpid.client.SessionCreateTest#testSessionCreationLimit diff --git a/java/test-profiles/cpp.ssl.testprofile b/java/test-profiles/cpp.ssl.testprofile index b3bb5e22f7..bf71384835 100644 --- a/java/test-profiles/cpp.ssl.testprofile +++ b/java/test-profiles/cpp.ssl.testprofile @@ -23,7 +23,7 @@ broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name localhost.loca profile.use_ssl=true broker.ready= Listening for SSL connections -javax.net.ssl.keyStore=${test.profiles}/test_resources/ssl/java_client_keystore.jks +javax.net.ssl.keyStore=${test.profiles}/test_resources/ssl/keystore.jks javax.net.ssl.keyStorePassword=password -javax.net.ssl.trustStore=${test.profiles}/test_resources/ssl/java_client_truststore.jks +javax.net.ssl.trustStore=${test.profiles}/test_resources/ssl/certstore.jks javax.net.ssl.trustStorePassword=password diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile index 7cc7fdc821..694e22f48c 100644 --- a/java/test-profiles/cpp.testprofile +++ b/java/test-profiles/cpp.testprofile @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -broker.version=v0_10 +broker.version=0-10 broker.language=cpp broker.dir=${project.root}/../cpp/src @@ -32,8 +32,7 @@ broker.stopped=Exception constructed broker.modules= broker.args= -broker.type=spawned -broker.command=${broker.executable} -p @PORT --data-dir ${project.root}/build/work/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} +broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} profile.excludes=CPPPrefetchExcludes CPPTransientExcludes test.excludes=Excludes CPPExcludes ${profile}.excludes ${profile.excludes} cpp.excludes diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/default.testprofile index bd2faa7915..df8148f787 100644 --- a/java/test-profiles/testprofile.defaults +++ b/java/test-profiles/default.testprofile @@ -19,11 +19,14 @@ java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory java.naming.provider.url=${test.profiles}/test-provider.properties -broker.ready=Listening on TCP -broker.config=build/etc/config-systests.xml +broker.version=0-8 +broker=vm +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work +broker.ready=Listening on TCP port +broker.start=${test.profiles}/start-broker +broker.kill=${test.profiles}/kill-broker +broker.config=${project.root}/build/etc/config-systests.xml messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore -broker.protocol.excludes= -broker.persistent=false max_prefetch=1000 qpid.dest_syntax=BURL @@ -46,8 +49,9 @@ test.port.alt=25672 test.port.alt.ssl=25671 test.exclude=true -profile.excludes= +profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes test.excludes=Excludes XAExcludes JavaExcludes ${profile}.excludes ${profile.excludes} +test.fork=no test.mem=512M test=*Test haltonfailure=no @@ -55,5 +59,3 @@ haltonerror=no exclude.modules=none profile.clustered=false - - diff --git a/java/test-profiles/java-bdb-spawn.0-10.testprofile b/java/test-profiles/java-bdb-spawn.0-10.testprofile deleted file mode 100644 index cba348b67f..0000000000 --- a/java/test-profiles/java-bdb-spawn.0-10.testprofile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -broker.language=java -broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore -profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes -broker.clean.between.tests=true -broker.persistent=true -broker.version=v0_10 - diff --git a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile deleted file mode 100644 index b04fea21b6..0000000000 --- a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -broker.language=java -broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore -profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes -broker.clean.between.tests=true -broker.persistent=true -broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT -broker.version=v0_9_1 -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 - diff --git a/java/test-profiles/java-bdb.0-10.testprofile b/java/test-profiles/java-bdb.0-10.testprofile deleted file mode 100644 index 3ef93a68cb..0000000000 --- a/java/test-profiles/java-bdb.0-10.testprofile +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -broker.language=java -broker.type=internal -#broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore -profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes -broker.clean.between.tests=true -broker.persistent=true -broker.version=v0_10 - diff --git a/java/test-profiles/java-bdb.0-9-1.testprofile b/java/test-profiles/java-bdb.0-9-1.testprofile deleted file mode 100644 index 101d38f4b9..0000000000 --- a/java/test-profiles/java-bdb.0-9-1.testprofile +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -broker.language=java -broker.type=internal -#broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore -profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes -broker.clean.between.tests=true -broker.persistent=true -broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT -broker.version=v0_9_1 -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 - diff --git a/java/test-profiles/java-dby-spawn.0-10.testprofile b/java/test-profiles/java-dby-spawn.0-10.testprofile deleted file mode 100644 index 5bd6f330d5..0000000000 --- a/java/test-profiles/java-dby-spawn.0-10.testprofile +++ /dev/null @@ -1,29 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -broker.language=java -broker.version=v0_10 -broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=build/etc/config-systests-derby.xml -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes -broker.clean.between.tests=true -broker.persistent=true diff --git a/java/test-profiles/java-dby.0-9-1.testprofile b/java/test-profiles/java-dby.0-9-1.testprofile deleted file mode 100644 index 83f43d8dbf..0000000000 --- a/java/test-profiles/java-dby.0-9-1.testprofile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -broker.version=v0_9_1 -broker.language=java -broker.type=internal -#broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=build/etc/config-systests-derby.xml -broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT -messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes -broker.clean.between.tests=true -broker.persistent=true -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 - diff --git a/java/test-profiles/java-dby.0-10.testprofile b/java/test-profiles/java-derby.0.10.testprofile index 9c23d18f45..ca9115d30d 100644 --- a/java/test-profiles/java-dby.0-10.testprofile +++ b/java/test-profiles/java-derby.0.10.testprofile @@ -17,14 +17,13 @@ # under the License. # broker.language=java -broker.version=v0_10 -broker.type=internal -#broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.version=0-10 +broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -broker.config=build/etc/config-systests-derby.xml +broker.config=${project.root}/build/etc/config-systests-derby.xml messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes +profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes broker.clean.between.tests=true broker.persistent=true diff --git a/java/test-profiles/java-dby-spawn.0-9-1.testprofile b/java/test-profiles/java-derby.testprofile index e7212d30f8..d22e35f07e 100644 --- a/java/test-profiles/java-dby-spawn.0-9-1.testprofile +++ b/java/test-profiles/java-derby.testprofile @@ -16,16 +16,14 @@ # specific language governing permissions and limitations # under the License. # -broker.version=v0_9_1 broker.language=java -broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -broker.config=build/etc/config-systests-derby.xml -broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT +broker.config=${project.root}/build/etc/config-systests-derby.xml messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore -profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes +profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes broker.clean.between.tests=true broker.persistent=true # diff --git a/java/test-profiles/java-mms.0-9-1.testprofile b/java/test-profiles/java-mms.0-9-1.testprofile deleted file mode 100644 index 37efa097bb..0000000000 --- a/java/test-profiles/java-mms.0-9-1.testprofile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -broker.language=java -broker.version=v0_9_1 -broker.type=internal -#broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml -broker.ready=BRK-1004 -broker.stopped=Exception -broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 -profile.excludes=JavaTransientExcludes JavaPre010Excludes diff --git a/java/test-profiles/java-mms.0-10.testprofile b/java/test-profiles/java.0.10.testprofile index 209d384422..fa87b22e92 100644 --- a/java/test-profiles/java-mms.0-10.testprofile +++ b/java/test-profiles/java.0.10.testprofile @@ -17,11 +17,10 @@ # under the License. # broker.language=java -broker.version=v0_10 -broker.type=internal -#broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.version=0-10 +broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -profile.excludes=JavaTransientExcludes Java010Excludes +profile.excludes=JavaTransientExcludes JavaStandaloneExcludes Java010Excludes diff --git a/java/test-profiles/java-mms-spawn.0-9-1.testprofile b/java/test-profiles/java.testprofile index 05b1f89452..c8c776d3e1 100644 --- a/java/test-profiles/java-mms-spawn.0-9-1.testprofile +++ b/java/test-profiles/java.testprofile @@ -16,15 +16,13 @@ # specific language governing permissions and limitations # under the License. # -broker.version=v0_9_1 broker.language=java -broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT # # Do not enable. Allow client to attempt 0-10 and negotiate downwards # #qpid.amqp.version=0-91 -profile.excludes=JavaTransientExcludes JavaPre010Excludes +profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes diff --git a/java/test-profiles/log4j-test.xml b/java/test-profiles/log4j-test.xml index 062acaaac9..9adfd68202 100644 --- a/java/test-profiles/log4j-test.xml +++ b/java/test-profiles/log4j-test.xml @@ -59,6 +59,10 @@ <level value="ERROR"/> </logger> + <logger name="org.apache.qpid.server.virtualhost.VirtualHostImpl$1HouseKeepingTask"> + <level value="WARN"/> + </logger> + <root> <level value="${root.logging.level}"/> <appender-ref ref="console" /> diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/java/test-profiles/python_tests/Java010PythonExcludes deleted file mode 100644 index 31d2a8affc..0000000000 --- a/java/test-profiles/python_tests/Java010PythonExcludes +++ /dev/null @@ -1,22 +0,0 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -// QPID-3477: Java broker does not handle rejection code specified in test -qpid.tests.messaging.endpoints.SessionTests.testReject - diff --git a/java/test-profiles/test-provider.properties b/java/test-profiles/test-provider.properties index fe27cfcfaf..8cea012c1d 100644 --- a/java/test-profiles/test-provider.properties +++ b/java/test-profiles/test-provider.properties @@ -30,12 +30,16 @@ test.port.alt.ssl=25671 connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.default.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' +connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' connectionfactory.failover = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt};tcp://localhost:${test.port}'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' connectionfactory.failover.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt.ssl}?ssl='true';tcp://localhost:${test.port.ssl}?ssl='true''&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' +connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'&failover='roundrobin?cyclecount='20'' connectionfactory.connection1 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.connection2 = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt}' +connectionfactory.connection1.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' +connectionfactory.connection2.vm = amqp://username:password@clientid/test?brokerlist='vm://:2' queue.MyQueue = example.MyQueue diff --git a/java/test-profiles/test_resources/ssl/java_client_truststore.jks b/java/test-profiles/test_resources/ssl/certstore.jks Binary files differindex 2af95f21f8..2af95f21f8 100644 --- a/java/test-profiles/test_resources/ssl/java_client_truststore.jks +++ b/java/test-profiles/test_resources/ssl/certstore.jks diff --git a/java/test-profiles/test_resources/ssl/java_broker.crt b/java/test-profiles/test_resources/ssl/java_broker.crt deleted file mode 100644 index 7543ee8a7d..0000000000 --- a/java/test-profiles/test_resources/ssl/java_broker.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAcCgAwIBAgIFAJVWeugwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15
-Um9vdENBMB4XDTExMDgxNzEzNTQ1NFoXDTExMTExNzEzNTQ1NFowejEQMA4GA1UE
-BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQ
-MA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEeMBwGA1UEAxMVbG9j
-YWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCj
-VSo/qOCDsPXQ2HKn2M4ey1FzK6NORkWYefFu5fDFJUKKPXXA8Ey9rPDv+XGGIQKI
-6JlmD2nnjp8Em7+/xa6u4XbFqLR8ycmgldGB7r8RbH3B7KYY3s4AxL9A3/TzHza4
-FJAk2X4LTVWHuX8tB/JyLS6695NSLoI5xKW4maARxwIDAQABoyIwIDAJBgNVHRME
-AjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAFsexncH
-xxTjk9YMoPpjjU0t/UgzjBLEruIIQQ/EtcZIOEqNCDwpzfgY/x7GVCy8VjLISgzK
-xJsNv75F/vP8a4eaeTRJmrvVcWUZJu6r/A8WNwJVYUvXhy2+jbfdp/UMlRg+ODw7
-GMU9ILQW4LGJnTtJKrlVrcQqzw6IZRduEE65 ------END CERTIFICATE----- diff --git a/java/test-profiles/test_resources/ssl/java_broker.req b/java/test-profiles/test_resources/ssl/java_broker.req deleted file mode 100644 index 05fc8b0eda..0000000000 --- a/java/test-profiles/test_resources/ssl/java_broker.req +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN NEW CERTIFICATE REQUEST----- -MIIBujCCASMCAQAwejEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UE -BxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEeMBwGA1UEAxMV -bG9jYWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCjVSo/qOCD -sPXQ2HKn2M4ey1FzK6NORkWYefFu5fDFJUKKPXXA8Ey9rPDv+XGGIQKI6JlmD2nnjp8Em7+/xa6u -4XbFqLR8ycmgldGB7r8RbH3B7KYY3s4AxL9A3/TzHza4FJAk2X4LTVWHuX8tB/JyLS6695NSLoI5 -xKW4maARxwIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEAjXXfPRv7xQYY3R8lZ78/0gbXZ35Lq/1h -6sxShXfqXxFXE8oP4uGLTlsnSvfsHQL60ihKP3V+nv/zIxNudAsrM57x70owUWyp/bm0XXD89X0T -zEBP9OQexDTwC2r/8gvYMi++022LMTluEPw29bCsp6usuKh61eLmekprpNlhs5M= ------END NEW CERTIFICATE REQUEST----- diff --git a/java/test-profiles/test_resources/ssl/java_broker_keystore.jks b/java/test-profiles/test_resources/ssl/java_broker_keystore.jks Binary files differdeleted file mode 100644 index 4c4449e20d..0000000000 --- a/java/test-profiles/test_resources/ssl/java_broker_keystore.jks +++ /dev/null diff --git a/java/test-profiles/test_resources/ssl/java_client_keystore.jks b/java/test-profiles/test_resources/ssl/keystore.jks Binary files differindex e3a850a248..e3a850a248 100644 --- a/java/test-profiles/test_resources/ssl/java_client_keystore.jks +++ b/java/test-profiles/test_resources/ssl/keystore.jks |