From 7aa8da6390f1d905a725a15e42a28db1236f9457 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Wed, 8 Jul 2009 14:22:11 +0000 Subject: moved test profiles and related resources into test-profiles subdirectory git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@792157 13f79535-47bb-0310-9956-ffa450edef68 --- java/010ExcludeList | 81 --------------------- java/010ExcludeList-noPrefetch | 61 ---------------- java/010ExcludeList-ssl | 1 - java/010ExcludeList-store | 64 ---------------- java/08ExcludeList | 17 ----- java/08ExcludeList-nonvm | 41 ----------- java/08ExcludeList-nopersistence | 1 - java/ExcludeList | 7 -- java/XAExcludeList | 3 - java/clean-dir | 25 ------- java/common.xml | 1 + java/cpp.async.testprofile | 3 - java/cpp.cluster.testprofile | 8 -- java/cpp.noprefetch.testprofile | 4 - java/cpp.ssl.testprofile | 12 --- java/cpp.testprofile | 3 - java/default-longrunning.testprofile | 1 - java/default.testprofile | 28 ------- java/java-derby.testprofile | 7 -- java/java.testprofile | 6 -- java/log4j-test.xml | 54 -------------- java/module.xml | 6 +- java/test-profiles/010ExcludeList | 81 +++++++++++++++++++++ java/test-profiles/010ExcludeList-noPrefetch | 61 ++++++++++++++++ java/test-profiles/010ExcludeList-ssl | 1 + java/test-profiles/010ExcludeList-store | 64 ++++++++++++++++ java/test-profiles/08ExcludeList | 17 +++++ java/test-profiles/08ExcludeList-nonvm | 42 +++++++++++ java/test-profiles/08ExcludeList-nopersistence | 1 + java/test-profiles/ExcludeList | 7 ++ java/test-profiles/XAExcludeList | 3 + java/test-profiles/clean-dir | 25 +++++++ java/test-profiles/cpp.async.testprofile | 3 + java/test-profiles/cpp.cluster.testprofile | 8 ++ java/test-profiles/cpp.noprefetch.testprofile | 4 + java/test-profiles/cpp.ssl.testprofile | 11 +++ java/test-profiles/cpp.testprofile | 3 + java/test-profiles/default-longrunning.testprofile | 1 + java/test-profiles/default.testprofile | 28 +++++++ java/test-profiles/java-derby.testprofile | 7 ++ java/test-profiles/java.testprofile | 6 ++ java/test-profiles/log4j-test.xml | 54 ++++++++++++++ java/test-profiles/test-provider.properties | 44 +++++++++++ .../test-profiles/test_resources/ssl/certstore.jks | Bin 0 -> 498 bytes java/test-profiles/test_resources/ssl/keystore.jks | Bin 0 -> 2186 bytes java/test-profiles/test_resources/ssl/pfile | 1 + .../test_resources/ssl/server_db/cert8.db | Bin 0 -> 65536 bytes .../test_resources/ssl/server_db/key3.db | Bin 0 -> 16384 bytes .../test_resources/ssl/server_db/secmod.db | Bin 0 -> 16384 bytes .../test_resources/ssl/server_db/server.crt | 12 +++ .../test_resources/ssl/server_db/server.req | 20 +++++ java/test-provider.properties | 44 ----------- java/test_resources/ssl/certstore.jks | Bin 498 -> 0 bytes java/test_resources/ssl/keystore.jks | Bin 2186 -> 0 bytes java/test_resources/ssl/pfile | 1 - java/test_resources/ssl/server_db/cert8.db | Bin 65536 -> 0 bytes java/test_resources/ssl/server_db/key3.db | Bin 16384 -> 0 bytes java/test_resources/ssl/server_db/secmod.db | Bin 16384 -> 0 bytes java/test_resources/ssl/server_db/server.crt | 12 --- java/test_resources/ssl/server_db/server.req | 20 ----- 60 files changed, 508 insertions(+), 507 deletions(-) delete mode 100644 java/010ExcludeList delete mode 100644 java/010ExcludeList-noPrefetch delete mode 100644 java/010ExcludeList-ssl delete mode 100644 java/010ExcludeList-store delete mode 100644 java/08ExcludeList delete mode 100644 java/08ExcludeList-nonvm delete mode 100644 java/08ExcludeList-nopersistence delete mode 100644 java/ExcludeList delete mode 100644 java/XAExcludeList delete mode 100755 java/clean-dir delete mode 100644 java/cpp.async.testprofile delete mode 100644 java/cpp.cluster.testprofile delete mode 100644 java/cpp.noprefetch.testprofile delete mode 100644 java/cpp.ssl.testprofile delete mode 100644 java/cpp.testprofile delete mode 100644 java/default-longrunning.testprofile delete mode 100644 java/default.testprofile delete mode 100644 java/java-derby.testprofile delete mode 100644 java/java.testprofile delete mode 100644 java/log4j-test.xml create mode 100644 java/test-profiles/010ExcludeList create mode 100644 java/test-profiles/010ExcludeList-noPrefetch create mode 100644 java/test-profiles/010ExcludeList-ssl create mode 100644 java/test-profiles/010ExcludeList-store create mode 100644 java/test-profiles/08ExcludeList create mode 100644 java/test-profiles/08ExcludeList-nonvm create mode 100644 java/test-profiles/08ExcludeList-nopersistence create mode 100644 java/test-profiles/ExcludeList create mode 100644 java/test-profiles/XAExcludeList create mode 100755 java/test-profiles/clean-dir create mode 100644 java/test-profiles/cpp.async.testprofile create mode 100644 java/test-profiles/cpp.cluster.testprofile create mode 100644 java/test-profiles/cpp.noprefetch.testprofile create mode 100644 java/test-profiles/cpp.ssl.testprofile create mode 100644 java/test-profiles/cpp.testprofile create mode 100644 java/test-profiles/default-longrunning.testprofile create mode 100644 java/test-profiles/default.testprofile create mode 100644 java/test-profiles/java-derby.testprofile create mode 100644 java/test-profiles/java.testprofile create mode 100644 java/test-profiles/log4j-test.xml create mode 100644 java/test-profiles/test-provider.properties create mode 100644 java/test-profiles/test_resources/ssl/certstore.jks create mode 100644 java/test-profiles/test_resources/ssl/keystore.jks create mode 100644 java/test-profiles/test_resources/ssl/pfile create mode 100644 java/test-profiles/test_resources/ssl/server_db/cert8.db create mode 100644 java/test-profiles/test_resources/ssl/server_db/key3.db create mode 100644 java/test-profiles/test_resources/ssl/server_db/secmod.db create mode 100644 java/test-profiles/test_resources/ssl/server_db/server.crt create mode 100644 java/test-profiles/test_resources/ssl/server_db/server.req delete mode 100644 java/test-provider.properties delete mode 100644 java/test_resources/ssl/certstore.jks delete mode 100644 java/test_resources/ssl/keystore.jks delete mode 100644 java/test_resources/ssl/pfile delete mode 100644 java/test_resources/ssl/server_db/cert8.db delete mode 100644 java/test_resources/ssl/server_db/key3.db delete mode 100644 java/test_resources/ssl/server_db/secmod.db delete mode 100644 java/test_resources/ssl/server_db/server.crt delete mode 100644 java/test_resources/ssl/server_db/server.req (limited to 'java') diff --git a/java/010ExcludeList b/java/010ExcludeList deleted file mode 100644 index ca12a4f8a5..0000000000 --- a/java/010ExcludeList +++ /dev/null @@ -1,81 +0,0 @@ -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* -org.apache.qpid.client.ResetMessageListenerTest#* -// those tests should be run with prefetch off -org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only -org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth -org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber -// those tests need durable subscribe states to be persisted -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent -// those tests require broker recovery -org.apache.qpid.test.unit.ct.DurableSubscriberTest#* -org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash -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 -//These tests are for the java broker -org.apache.qpid.server.security.acl.SimpleACLTest#* -org.apache.qpid.server.plugins.PluginTest#* -// 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 -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub -org.apache.qpid.test.client.FlowControlTest#* -org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure -// the 0.10 c++ broker does not implement forget -org.apache.qpid.test.unit.xa.FaultTest#testForget -// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation -org.apache.qpid.server.queue.PriorityTest -//this test checks explicitly for 0-8 flow control semantics -org.apache.qpid.test.client.FlowControlTest -// 0-10 c++ broker doesn't implement virtual hosts, or those wackhy exchanges -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure -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 -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess -// InVM Broker tests -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* -// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* -// c++ broker doesn't support priorities, TTL or message bouncing -org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* -org.apache.qpid.server.queue.PriorityTest#* -org.apache.qpid.server.queue.TimeToLiveTest#* -// 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#* - -// 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 : 0-10 Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* - -// QPID-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* - -// QPID-1730: the C++ server has a totally different logging mechanism. We should split this file differently -org.apache.qpid.server.AlertingTest#* - -// The C++ server has a totally different persistence mechanism -org.apache.qpid.server.store.PersistentStoreTest#* - diff --git a/java/010ExcludeList-noPrefetch b/java/010ExcludeList-noPrefetch deleted file mode 100644 index dca931b55b..0000000000 --- a/java/010ExcludeList-noPrefetch +++ /dev/null @@ -1,61 +0,0 @@ -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* -org.apache.qpid.client.ResetMessageListenerTest#* -org.apache.qpid.test.unit.transacted.TransactedTest#testRollback -// those tests need durable subscribe states to be persisted -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent -org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector -// This test cannot be run with no-prefetch -org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash -//These tests are for the java broker -org.apache.qpid.server.security.acl.SimpleACLTest#* -org.apache.qpid.server.plugins.PluginTest#* -// This test is not finished -org.apache.qpid.test.testcases.TTLTest#* -// 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#* -// Those tests are testing 0.8 specific semantics -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub -org.apache.qpid.test.client.FlowControlTest#* -org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure -// the 0.10 c++ broker does not implement forget -org.apache.qpid.test.unit.xa.FaultTest#testForget -// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation -org.apache.qpid.server.queue.PriorityTest -//this test checks explicitly for 0-8 flow control semantics -org.apache.qpid.test.client.FlowControlTest -// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. -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 -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess - -// InVM Broker tests -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* -// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* diff --git a/java/010ExcludeList-ssl b/java/010ExcludeList-ssl deleted file mode 100644 index bf21ab9cc7..0000000000 --- a/java/010ExcludeList-ssl +++ /dev/null @@ -1 +0,0 @@ -org.apache.qpid.test.client.failover.FailoverTest#* diff --git a/java/010ExcludeList-store b/java/010ExcludeList-store deleted file mode 100644 index d4bc8b7b71..0000000000 --- a/java/010ExcludeList-store +++ /dev/null @@ -1,64 +0,0 @@ -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* -org.apache.qpid.client.ResetMessageListenerTest#* -// those tests should be run with prefetch off -org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only -org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth -org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash -org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber -org.apache.qpid.test.unit.ack.AcknowledgeTest#* -// those tests need durable subscribe states to be persisted -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent -org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector -//These tests are for the java broker -org.apache.qpid.server.security.acl.SimpleACLTest#* -org.apache.qpid.server.plugins.PluginTest#* -// This test is not finished -org.apache.qpid.test.testcases.TTLTest#* -// 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#* -// Those tests are testing 0.8 specific semantics -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub -org.apache.qpid.test.client.FlowControlTest#* -org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure -// the 0.10 c++ broker does not implement forget -org.apache.qpid.test.unit.xa.FaultTest#testForget -// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation -org.apache.qpid.server.queue.PriorityTest -//this test checks explicitly for 0-8 flow control semantics -org.apache.qpid.test.client.FlowControlTest -// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. -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 -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess - -// InVM Broker tests -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* -// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* diff --git a/java/08ExcludeList b/java/08ExcludeList deleted file mode 100644 index 0866694854..0000000000 --- a/java/08ExcludeList +++ /dev/null @@ -1,17 +0,0 @@ -org.apache.qpid.test.unit.ct.DurableSubscriberTests#* -// Those tests are not finished -org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.testcases.FailoverTest#* -// This is a long running test so should exclude from normal runs -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover -// Those tests are written against the 0.10 path -org.apache.qpid.test.unit.message.UTF8Test#* -org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait - -//QPID-1818 : Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* - -// QPID-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* - -org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/08ExcludeList-nonvm b/java/08ExcludeList-nonvm deleted file mode 100644 index aaec56d7b8..0000000000 --- a/java/08ExcludeList-nonvm +++ /dev/null @@ -1,41 +0,0 @@ -org.apache.qpid.test.unit.ct.DurableSubscriberTests#* -// Those tests are not finished -org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.testcases.FailoverTest#* -// 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#* -org.apache.qpid.server.security.acl.SimpleACLTest#* - -// Those tests are written against the 0.10 path -org.apache.qpid.test.unit.message.UTF8Test#* -org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait - -// 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#* -// QPID-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* - diff --git a/java/08ExcludeList-nopersistence b/java/08ExcludeList-nopersistence deleted file mode 100644 index f81e9c213c..0000000000 --- a/java/08ExcludeList-nopersistence +++ /dev/null @@ -1 +0,0 @@ -org.apache.qpid.server.store.PersistentStoreTest#* diff --git a/java/ExcludeList b/java/ExcludeList deleted file mode 100644 index a3a61b51db..0000000000 --- a/java/ExcludeList +++ /dev/null @@ -1,7 +0,0 @@ -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 - diff --git a/java/XAExcludeList b/java/XAExcludeList deleted file mode 100644 index 1bb26c5f27..0000000000 --- a/java/XAExcludeList +++ /dev/null @@ -1,3 +0,0 @@ -org.apache.qpid.test.unit.xa.QueueTest#* -org.apache.qpid.test.unit.xa.TopicTest#* -org.apache.qpid.test.unit.xa.FaultTest#* diff --git a/java/clean-dir b/java/clean-dir deleted file mode 100755 index 4d6141b4ab..0000000000 --- a/java/clean-dir +++ /dev/null @@ -1,25 +0,0 @@ - -#!/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 -# 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. -# -# - - -rm -rf $@; mkdir $@ diff --git a/java/common.xml b/java/common.xml index 874f48a69d..fdac37f846 100644 --- a/java/common.xml +++ b/java/common.xml @@ -27,6 +27,7 @@ + diff --git a/java/cpp.async.testprofile b/java/cpp.async.testprofile deleted file mode 100644 index 746ef2c0ef..0000000000 --- a/java/cpp.async.testprofile +++ /dev/null @@ -1,3 +0,0 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no -test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList-store diff --git a/java/cpp.cluster.testprofile b/java/cpp.cluster.testprofile deleted file mode 100644 index 765eb714f3..0000000000 --- a/java/cpp.cluster.testprofile +++ /dev/null @@ -1,8 +0,0 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd --load-module ${project.root}/../cpp/src/.libs/cluster.so --cluster-name cpp-java-test-cluster -p @PORT --data-dir ${build.data}/@PORT -t --auth no -test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/010ExcludeList - -profile.clustered=true -profile.failoverMsgCount=10 -profile.failoverIterations=10 -profile.failoverRandomSeed=20080921 diff --git a/java/cpp.noprefetch.testprofile b/java/cpp.noprefetch.testprofile deleted file mode 100644 index e502f3c950..0000000000 --- a/java/cpp.noprefetch.testprofile +++ /dev/null @@ -1,4 +0,0 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no -test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList-noPrefetch -max_prefetch=0 diff --git a/java/cpp.ssl.testprofile b/java/cpp.ssl.testprofile deleted file mode 100644 index 6812ebfae4..0000000000 --- a/java/cpp.ssl.testprofile +++ /dev/null @@ -1,12 +0,0 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --load-module ${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${project.root}/test_resources/ssl/pfile --ssl-cert-db ${project.root}/test_resources/ssl/server_db/ --ssl-require-client-authentication --data-dir ${build.data}/@PORT -t --auth no -test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList ${project.root}/010ExcludeList-ssl -test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#* -profile.use_ssl=true -broker.ready= Listening for SSL connections - -javax.net.ssl.keyStore=${project.root}/test_resources/ssl/keystore.jks -javax.net.ssl.keyStorePassword=password -javax.net.ssl.trustStore=${project.root}/test_resources/ssl/certstore.jks -javax.net.ssl.trustStorePassword=password - diff --git a/java/cpp.testprofile b/java/cpp.testprofile deleted file mode 100644 index af2d0f58e4..0000000000 --- a/java/cpp.testprofile +++ /dev/null @@ -1,3 +0,0 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --auth no -test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList diff --git a/java/default-longrunning.testprofile b/java/default-longrunning.testprofile deleted file mode 100644 index 155e78ad0a..0000000000 --- a/java/default-longrunning.testprofile +++ /dev/null @@ -1 +0,0 @@ -test.includesfile=${project.root}/08LongRunningList diff --git a/java/default.testprofile b/java/default.testprofile deleted file mode 100644 index acbc31dcbe..0000000000 --- a/java/default.testprofile +++ /dev/null @@ -1,28 +0,0 @@ -java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory -java.naming.provider.url=${project.root}/test-provider.properties - -broker.version=0-8 -broker=vm -broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB -broker.ready=Listening on TCP port -broker.config=${project.root}/build/etc/config-systests.xml - -max_prefetch=1000 - -log=debug -amqj.logging.level=${log} -amqj.protocol.logging.level=${log} -root.logging.level=warn -log4j.configuration=file:///${project.root}/log4j-test.xml -log4j.debug=false - -test.excludes=true -test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList ${project.root}/08ExcludeList-nopersistence -test.fork=no -test.mem=512M -test=*Test -haltonfailure=no -haltonerror=no -exclude.modules=none - -profile.clustered=false diff --git a/java/java-derby.testprofile b/java/java-derby.testprofile deleted file mode 100644 index bb0dbf3663..0000000000 --- a/java/java-derby.testprofile +++ /dev/null @@ -1,7 +0,0 @@ -broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${project.root}/log4j-test.xml -broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB -broker.ready=Qpid Broker Ready -broker.config=${project.root}/build/etc/config-systests-derby.xml - -test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList-nonvm diff --git a/java/java.testprofile b/java/java.testprofile deleted file mode 100644 index 9bf824d4cd..0000000000 --- a/java/java.testprofile +++ /dev/null @@ -1,6 +0,0 @@ -broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${project.root}/log4j-test.xml -broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB -broker.ready=Qpid Broker Ready - -test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList-nonvm ${project.root}/08ExcludeList-nopersistence diff --git a/java/log4j-test.xml b/java/log4j-test.xml deleted file mode 100644 index 0aaa7d8686..0000000000 --- a/java/log4j-test.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/module.xml b/java/module.xml index edfa217781..f87b841f8e 100644 --- a/java/module.xml +++ b/java/module.xml @@ -224,13 +224,13 @@ - + - - + + diff --git a/java/test-profiles/010ExcludeList b/java/test-profiles/010ExcludeList new file mode 100644 index 0000000000..ca12a4f8a5 --- /dev/null +++ b/java/test-profiles/010ExcludeList @@ -0,0 +1,81 @@ +org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* +org.apache.qpid.client.ResetMessageListenerTest#* +// those tests should be run with prefetch off +org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only +org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth +org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber +// those tests need durable subscribe states to be persisted +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent +// those tests require broker recovery +org.apache.qpid.test.unit.ct.DurableSubscriberTest#* +org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash +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 +//These tests are for the java broker +org.apache.qpid.server.security.acl.SimpleACLTest#* +org.apache.qpid.server.plugins.PluginTest#* +// 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 +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub +org.apache.qpid.test.client.FlowControlTest#* +org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget +// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation +org.apache.qpid.server.queue.PriorityTest +//this test checks explicitly for 0-8 flow control semantics +org.apache.qpid.test.client.FlowControlTest +// 0-10 c++ broker doesn't implement virtual hosts, or those wackhy exchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure +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 +// QPID-1225 : Temporary remove this test until the problem has been addressed +org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess +// InVM Broker tests +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* +// c++ broker doesn't support priorities, TTL or message bouncing +org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* +org.apache.qpid.server.queue.PriorityTest#* +org.apache.qpid.server.queue.TimeToLiveTest#* +// 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#* + +// 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 : 0-10 Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +// QPID-1823: this takes ages to run +org.apache.qpid.client.SessionCreateTest#* + +// QPID-1730: the C++ server has a totally different logging mechanism. We should split this file differently +org.apache.qpid.server.AlertingTest#* + +// The C++ server has a totally different persistence mechanism +org.apache.qpid.server.store.PersistentStoreTest#* + diff --git a/java/test-profiles/010ExcludeList-noPrefetch b/java/test-profiles/010ExcludeList-noPrefetch new file mode 100644 index 0000000000..dca931b55b --- /dev/null +++ b/java/test-profiles/010ExcludeList-noPrefetch @@ -0,0 +1,61 @@ +org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* +org.apache.qpid.client.ResetMessageListenerTest#* +org.apache.qpid.test.unit.transacted.TransactedTest#testRollback +// those tests need durable subscribe states to be persisted +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent +org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector +// This test cannot be run with no-prefetch +org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash +//These tests are for the java broker +org.apache.qpid.server.security.acl.SimpleACLTest#* +org.apache.qpid.server.plugins.PluginTest#* +// This test is not finished +org.apache.qpid.test.testcases.TTLTest#* +// 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#* +// Those tests are testing 0.8 specific semantics +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub +org.apache.qpid.test.client.FlowControlTest#* +org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget +// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation +org.apache.qpid.server.queue.PriorityTest +//this test checks explicitly for 0-8 flow control semantics +org.apache.qpid.test.client.FlowControlTest +// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. +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 +// QPID-1225 : Temporary remove this test until the problem has been addressed +org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess + +// InVM Broker tests +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* diff --git a/java/test-profiles/010ExcludeList-ssl b/java/test-profiles/010ExcludeList-ssl new file mode 100644 index 0000000000..bf21ab9cc7 --- /dev/null +++ b/java/test-profiles/010ExcludeList-ssl @@ -0,0 +1 @@ +org.apache.qpid.test.client.failover.FailoverTest#* diff --git a/java/test-profiles/010ExcludeList-store b/java/test-profiles/010ExcludeList-store new file mode 100644 index 0000000000..d4bc8b7b71 --- /dev/null +++ b/java/test-profiles/010ExcludeList-store @@ -0,0 +1,64 @@ +org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* +org.apache.qpid.client.ResetMessageListenerTest#* +// those tests should be run with prefetch off +org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only +org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth +org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash +org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber +org.apache.qpid.test.unit.ack.AcknowledgeTest#* +// those tests need durable subscribe states to be persisted +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent +org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector +//These tests are for the java broker +org.apache.qpid.server.security.acl.SimpleACLTest#* +org.apache.qpid.server.plugins.PluginTest#* +// This test is not finished +org.apache.qpid.test.testcases.TTLTest#* +// 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#* +// Those tests are testing 0.8 specific semantics +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub +org.apache.qpid.test.client.FlowControlTest#* +org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget +// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation +org.apache.qpid.server.queue.PriorityTest +//this test checks explicitly for 0-8 flow control semantics +org.apache.qpid.test.client.FlowControlTest +// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. +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 +// QPID-1225 : Temporary remove this test until the problem has been addressed +org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess + +// InVM Broker tests +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* diff --git a/java/test-profiles/08ExcludeList b/java/test-profiles/08ExcludeList new file mode 100644 index 0000000000..0866694854 --- /dev/null +++ b/java/test-profiles/08ExcludeList @@ -0,0 +1,17 @@ +org.apache.qpid.test.unit.ct.DurableSubscriberTests#* +// Those tests are not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.testcases.FailoverTest#* +// This is a long running test so should exclude from normal runs +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover +// Those tests are written against the 0.10 path +org.apache.qpid.test.unit.message.UTF8Test#* +org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait + +//QPID-1818 : Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +// QPID-1823: this takes ages to run +org.apache.qpid.client.SessionCreateTest#* + +org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/test-profiles/08ExcludeList-nonvm b/java/test-profiles/08ExcludeList-nonvm new file mode 100644 index 0000000000..e697201bfd --- /dev/null +++ b/java/test-profiles/08ExcludeList-nonvm @@ -0,0 +1,42 @@ +org.apache.qpid.test.unit.ct.DurableSubscriberTests#* +// Those tests are not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.testcases.FailoverTest#* +// 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#* +org.apache.qpid.server.security.acl.SimpleACLTest#* + +// Those tests are written against the 0.10 path +org.apache.qpid.test.unit.message.UTF8Test#* +org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait + +// 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#* +// QPID-1823: this takes ages to run +org.apache.qpid.client.SessionCreateTest#* + +org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/test-profiles/08ExcludeList-nopersistence b/java/test-profiles/08ExcludeList-nopersistence new file mode 100644 index 0000000000..f81e9c213c --- /dev/null +++ b/java/test-profiles/08ExcludeList-nopersistence @@ -0,0 +1 @@ +org.apache.qpid.server.store.PersistentStoreTest#* diff --git a/java/test-profiles/ExcludeList b/java/test-profiles/ExcludeList new file mode 100644 index 0000000000..a3a61b51db --- /dev/null +++ b/java/test-profiles/ExcludeList @@ -0,0 +1,7 @@ +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 + diff --git a/java/test-profiles/XAExcludeList b/java/test-profiles/XAExcludeList new file mode 100644 index 0000000000..1bb26c5f27 --- /dev/null +++ b/java/test-profiles/XAExcludeList @@ -0,0 +1,3 @@ +org.apache.qpid.test.unit.xa.QueueTest#* +org.apache.qpid.test.unit.xa.TopicTest#* +org.apache.qpid.test.unit.xa.FaultTest#* diff --git a/java/test-profiles/clean-dir b/java/test-profiles/clean-dir new file mode 100755 index 0000000000..4d6141b4ab --- /dev/null +++ b/java/test-profiles/clean-dir @@ -0,0 +1,25 @@ + +#!/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 +# 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. +# +# + + +rm -rf $@; mkdir $@ diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile new file mode 100644 index 0000000000..1c467a0b79 --- /dev/null +++ b/java/test-profiles/cpp.async.testprofile @@ -0,0 +1,3 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store diff --git a/java/test-profiles/cpp.cluster.testprofile b/java/test-profiles/cpp.cluster.testprofile new file mode 100644 index 0000000000..8e8e48e777 --- /dev/null +++ b/java/test-profiles/cpp.cluster.testprofile @@ -0,0 +1,8 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd --load-module ${project.root}/../cpp/src/.libs/cluster.so --cluster-name cpp-java-test-cluster -p @PORT --data-dir ${build.data}/@PORT -t --auth no +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/010ExcludeList + +profile.clustered=true +profile.failoverMsgCount=10 +profile.failoverIterations=10 +profile.failoverRandomSeed=20080921 diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/java/test-profiles/cpp.noprefetch.testprofile new file mode 100644 index 0000000000..d4cac445da --- /dev/null +++ b/java/test-profiles/cpp.noprefetch.testprofile @@ -0,0 +1,4 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch +max_prefetch=0 diff --git a/java/test-profiles/cpp.ssl.testprofile b/java/test-profiles/cpp.ssl.testprofile new file mode 100644 index 0000000000..9d54f03569 --- /dev/null +++ b/java/test-profiles/cpp.ssl.testprofile @@ -0,0 +1,11 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd -p @PORT --load-module ${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication --data-dir ${build.data}/@PORT -t --auth no +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/010ExcludeList-ssl +test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#* +profile.use_ssl=true +broker.ready= Listening for SSL connections + +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/certstore.jks +javax.net.ssl.trustStorePassword=password diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile new file mode 100644 index 0000000000..a09c097cb7 --- /dev/null +++ b/java/test-profiles/cpp.testprofile @@ -0,0 +1,3 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --auth no +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList diff --git a/java/test-profiles/default-longrunning.testprofile b/java/test-profiles/default-longrunning.testprofile new file mode 100644 index 0000000000..bf24e4f9da --- /dev/null +++ b/java/test-profiles/default-longrunning.testprofile @@ -0,0 +1 @@ +test.includesfile=${test.profiles}/08LongRunningList diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile new file mode 100644 index 0000000000..58e9f90198 --- /dev/null +++ b/java/test-profiles/default.testprofile @@ -0,0 +1,28 @@ +java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory +java.naming.provider.url=${test.profiles}/test-provider.properties + +broker.version=0-8 +broker=vm +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB +broker.ready=Listening on TCP port +broker.config=${project.root}/build/etc/config-systests.xml + +max_prefetch=1000 + +log=debug +amqj.logging.level=${log} +amqj.protocol.logging.level=${log} +root.logging.level=warn +log4j.configuration=file:///${test.profiles}/log4j-test.xml +log4j.debug=false + +test.excludes=true +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList ${test.profiles}/08ExcludeList-nopersistence +test.fork=no +test.mem=512M +test=*Test +haltonfailure=no +haltonerror=no +exclude.modules=none + +profile.clustered=false diff --git a/java/test-profiles/java-derby.testprofile b/java/test-profiles/java-derby.testprofile new file mode 100644 index 0000000000..1786e96712 --- /dev/null +++ b/java/test-profiles/java-derby.testprofile @@ -0,0 +1,7 @@ +broker.language=java +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/derbyDB +broker.ready=Qpid Broker Ready +broker.config=${project.root}/build/etc/config-systests-derby.xml + +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile new file mode 100644 index 0000000000..d1e4c12bc1 --- /dev/null +++ b/java/test-profiles/java.testprofile @@ -0,0 +1,6 @@ +broker.language=java +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/derbyDB +broker.ready=Qpid Broker Ready + +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence diff --git a/java/test-profiles/log4j-test.xml b/java/test-profiles/log4j-test.xml new file mode 100644 index 0000000000..0aaa7d8686 --- /dev/null +++ b/java/test-profiles/log4j-test.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/test-profiles/test-provider.properties b/java/test-profiles/test-provider.properties new file mode 100644 index 0000000000..2479b5a5f0 --- /dev/null +++ b/java/test-profiles/test-provider.properties @@ -0,0 +1,44 @@ +# +# +# 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. +# +# + +test.port=5672 +test.port.ssl=5671 +test.port.alt=5673 + +connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' +connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' +connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' + +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.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1' +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 +queue.queue = example.queue +queue.xaQueue = xaQueue + +topic.topic = topic +topic.xaTopic = xaTopic +topic.durableSubscriberTopic = durableSubscriberTopic diff --git a/java/test-profiles/test_resources/ssl/certstore.jks b/java/test-profiles/test_resources/ssl/certstore.jks new file mode 100644 index 0000000000..57460491fe Binary files /dev/null and b/java/test-profiles/test_resources/ssl/certstore.jks differ diff --git a/java/test-profiles/test_resources/ssl/keystore.jks b/java/test-profiles/test_resources/ssl/keystore.jks new file mode 100644 index 0000000000..8e033ec932 Binary files /dev/null and b/java/test-profiles/test_resources/ssl/keystore.jks differ diff --git a/java/test-profiles/test_resources/ssl/pfile b/java/test-profiles/test_resources/ssl/pfile new file mode 100644 index 0000000000..f3097ab130 --- /dev/null +++ b/java/test-profiles/test_resources/ssl/pfile @@ -0,0 +1 @@ +password diff --git a/java/test-profiles/test_resources/ssl/server_db/cert8.db b/java/test-profiles/test_resources/ssl/server_db/cert8.db new file mode 100644 index 0000000000..3063a1fef3 Binary files /dev/null and b/java/test-profiles/test_resources/ssl/server_db/cert8.db differ diff --git a/java/test-profiles/test_resources/ssl/server_db/key3.db b/java/test-profiles/test_resources/ssl/server_db/key3.db new file mode 100644 index 0000000000..be86b4af4b Binary files /dev/null and b/java/test-profiles/test_resources/ssl/server_db/key3.db differ diff --git a/java/test-profiles/test_resources/ssl/server_db/secmod.db b/java/test-profiles/test_resources/ssl/server_db/secmod.db new file mode 100644 index 0000000000..9c71db0abe Binary files /dev/null and b/java/test-profiles/test_resources/ssl/server_db/secmod.db differ diff --git a/java/test-profiles/test_resources/ssl/server_db/server.crt b/java/test-profiles/test_resources/ssl/server_db/server.crt new file mode 100644 index 0000000000..eb9323ff34 --- /dev/null +++ b/java/test-profiles/test_resources/ssl/server_db/server.crt @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBuDCCASGgAwIBAgIFAIzxXHYwDQYJKoZIhvcNAQEEBQAwETEPMA0GA1UEAxMG +Um9vdENBMB4XDTA5MDQxNDIxNTUyOVoXDTEyMDQxNDIxNTUyOVowIDEeMBwGA1UE +AxMVbG9jYWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB +iQKBgQDNyXKaIcdDsBrcfsTRhIIsCGPCPKRuzN4w24PjfL72G7v0eyvKuposWDLf +Os9T5ijaimYkbCyR+evnxFII/lOBFXGtzorTUnfVPvdIr8CEqjdTjJlCjT/rxjd0 +08kiMC9V4ohefnglA3UMBxm1st3IP6JzlUXlZqZdrfq1LLnLqQIDAQABow0wCzAJ +BgNVHRMEAjAAMA0GCSqGSIb3DQEBBAUAA4GBAKkbAt9ockhmcfLGpyILfTUTqVqU +Ys2VrOSDaJIxuQEouWNx9bIngKyBV23AvDbQ2Nb9QI8cuzu7laydO//obPrLpvH1 +MbOyd3j+JNNml9mDZw2rR8QpOvC9YDzBVcZgmw8QnHbTHYYdjUIGbXtWvG93gWTj +QYVlvktPF1aM3RrM +-----END CERTIFICATE----- diff --git a/java/test-profiles/test_resources/ssl/server_db/server.req b/java/test-profiles/test_resources/ssl/server_db/server.req new file mode 100644 index 0000000000..a5a3fb2e35 --- /dev/null +++ b/java/test-profiles/test_resources/ssl/server_db/server.req @@ -0,0 +1,20 @@ + +Certificate request generated by Netscape certutil +Phone: (not specified) + +Common Name: localhost.localdomain +Email: (not specified) +Organization: (not specified) +State: (not specified) +Country: (not specified) + +-----BEGIN NEW CERTIFICATE REQUEST----- +MIIBXzCByQIBADAgMR4wHAYDVQQDExVsb2NhbGhvc3QubG9jYWxkb21haW4wgZ8w +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM3Jcpohx0OwGtx+xNGEgiwIY8I8pG7M +3jDbg+N8vvYbu/R7K8q6mixYMt86z1PmKNqKZiRsLJH56+fEUgj+U4EVca3OitNS +d9U+90ivwISqN1OMmUKNP+vGN3TTySIwL1XiiF5+eCUDdQwHGbWy3cg/onOVReVm +pl2t+rUsucupAgMBAAGgADANBgkqhkiG9w0BAQQFAAOBgQCD9+h4+q7Snw4F5E4i +oCu9SvUgTpMs6ClZUoaCJzjVmkygZwyq38iZV0W6I94MXZ9PFbvyiZkKy0t2oMNk +J33NOmaHoKOylYBkVlhHjknyYbvcL0Uwoj0/fyRbSZdllhAHUJgrjMBwPKks8+UJ +0crBkyRYg2gSCLQaPwJPm4ddpw== +-----END NEW CERTIFICATE REQUEST----- diff --git a/java/test-provider.properties b/java/test-provider.properties deleted file mode 100644 index 2479b5a5f0..0000000000 --- a/java/test-provider.properties +++ /dev/null @@ -1,44 +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. -# -# - -test.port=5672 -test.port.ssl=5671 -test.port.alt=5673 - -connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' -connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -connectionfactory.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' - -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.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1' -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 -queue.queue = example.queue -queue.xaQueue = xaQueue - -topic.topic = topic -topic.xaTopic = xaTopic -topic.durableSubscriberTopic = durableSubscriberTopic diff --git a/java/test_resources/ssl/certstore.jks b/java/test_resources/ssl/certstore.jks deleted file mode 100644 index 57460491fe..0000000000 Binary files a/java/test_resources/ssl/certstore.jks and /dev/null differ diff --git a/java/test_resources/ssl/keystore.jks b/java/test_resources/ssl/keystore.jks deleted file mode 100644 index 8e033ec932..0000000000 Binary files a/java/test_resources/ssl/keystore.jks and /dev/null differ diff --git a/java/test_resources/ssl/pfile b/java/test_resources/ssl/pfile deleted file mode 100644 index f3097ab130..0000000000 --- a/java/test_resources/ssl/pfile +++ /dev/null @@ -1 +0,0 @@ -password diff --git a/java/test_resources/ssl/server_db/cert8.db b/java/test_resources/ssl/server_db/cert8.db deleted file mode 100644 index 3063a1fef3..0000000000 Binary files a/java/test_resources/ssl/server_db/cert8.db and /dev/null differ diff --git a/java/test_resources/ssl/server_db/key3.db b/java/test_resources/ssl/server_db/key3.db deleted file mode 100644 index be86b4af4b..0000000000 Binary files a/java/test_resources/ssl/server_db/key3.db and /dev/null differ diff --git a/java/test_resources/ssl/server_db/secmod.db b/java/test_resources/ssl/server_db/secmod.db deleted file mode 100644 index 9c71db0abe..0000000000 Binary files a/java/test_resources/ssl/server_db/secmod.db and /dev/null differ diff --git a/java/test_resources/ssl/server_db/server.crt b/java/test_resources/ssl/server_db/server.crt deleted file mode 100644 index eb9323ff34..0000000000 --- a/java/test_resources/ssl/server_db/server.crt +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBuDCCASGgAwIBAgIFAIzxXHYwDQYJKoZIhvcNAQEEBQAwETEPMA0GA1UEAxMG -Um9vdENBMB4XDTA5MDQxNDIxNTUyOVoXDTEyMDQxNDIxNTUyOVowIDEeMBwGA1UE -AxMVbG9jYWxob3N0LmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB -iQKBgQDNyXKaIcdDsBrcfsTRhIIsCGPCPKRuzN4w24PjfL72G7v0eyvKuposWDLf -Os9T5ijaimYkbCyR+evnxFII/lOBFXGtzorTUnfVPvdIr8CEqjdTjJlCjT/rxjd0 -08kiMC9V4ohefnglA3UMBxm1st3IP6JzlUXlZqZdrfq1LLnLqQIDAQABow0wCzAJ -BgNVHRMEAjAAMA0GCSqGSIb3DQEBBAUAA4GBAKkbAt9ockhmcfLGpyILfTUTqVqU -Ys2VrOSDaJIxuQEouWNx9bIngKyBV23AvDbQ2Nb9QI8cuzu7laydO//obPrLpvH1 -MbOyd3j+JNNml9mDZw2rR8QpOvC9YDzBVcZgmw8QnHbTHYYdjUIGbXtWvG93gWTj -QYVlvktPF1aM3RrM ------END CERTIFICATE----- diff --git a/java/test_resources/ssl/server_db/server.req b/java/test_resources/ssl/server_db/server.req deleted file mode 100644 index a5a3fb2e35..0000000000 --- a/java/test_resources/ssl/server_db/server.req +++ /dev/null @@ -1,20 +0,0 @@ - -Certificate request generated by Netscape certutil -Phone: (not specified) - -Common Name: localhost.localdomain -Email: (not specified) -Organization: (not specified) -State: (not specified) -Country: (not specified) - ------BEGIN NEW CERTIFICATE REQUEST----- -MIIBXzCByQIBADAgMR4wHAYDVQQDExVsb2NhbGhvc3QubG9jYWxkb21haW4wgZ8w -DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM3Jcpohx0OwGtx+xNGEgiwIY8I8pG7M -3jDbg+N8vvYbu/R7K8q6mixYMt86z1PmKNqKZiRsLJH56+fEUgj+U4EVca3OitNS -d9U+90ivwISqN1OMmUKNP+vGN3TTySIwL1XiiF5+eCUDdQwHGbWy3cg/onOVReVm -pl2t+rUsucupAgMBAAGgADANBgkqhkiG9w0BAQQFAAOBgQCD9+h4+q7Snw4F5E4i -oCu9SvUgTpMs6ClZUoaCJzjVmkygZwyq38iZV0W6I94MXZ9PFbvyiZkKy0t2oMNk -J33NOmaHoKOylYBkVlhHjknyYbvcL0Uwoj0/fyRbSZdllhAHUJgrjMBwPKks8+UJ -0crBkyRYg2gSCLQaPwJPm4ddpw== ------END NEW CERTIFICATE REQUEST----- -- cgit v1.2.1