QPID-2658: Adding 0-10 profile excludes for java

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@966724 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 123 insertions, 52 deletions

diff --git a/java/test-profiles/08StandaloneExcludes b/java/test-profiles/08StandaloneExcludes
index 8fdaa25e3d..7c66c7f2ec 100644
--- a/java/test-profiles/08StandaloneExcludes
+++ b/java/test-profiles/08StandaloneExcludes
@@ -7,3 +7,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 sytanx is not supported for AMQP 0-8/0-9 versions
+org.apache.qpid.test.client.destination.AddressBasedDestinationTest#*
+
+// Those tests are written against the 0.10 path
+org.apache.qpid.test.unit.message.UTF8Test#*
+org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait
diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes
index 564a781b0f..8300f672ce 100755
--- a/java/test-profiles/CPPExcludes
+++ b/java/test-profiles/CPPExcludes
@@ -1,17 +1,6 @@
 org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
 org.apache.qpid.client.ResetMessageListenerTest#*
 
-//These tests will not work until 0-10 exception halding is fixed
-org.apache.qpid.server.security.acl.*
-
-//These tests are for the java broker
-org.apache.qpid.server.security.access.plugins.*
-org.apache.qpid.server.security.access.*
-org.apache.qpid.server.security.firewall.FirewallConfigTest#*
-org.apache.qpid.server.security.firewall.FirewallConfigurationTest#*
-org.apache.qpid.server.plugins.PluginTest#*
-org.apache.qpid.server.BrokerStartupTest#*
-
 // This test is not finished
 org.apache.qpid.test.testcases.TTLTest#*
 org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
@@ -29,21 +18,19 @@ org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFails
 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
+org.apache.qpid.server.queue.PriorityTest#*
+org.apache.qpid.server.queue.AMQPriorityQueueTest#*
 
 // the 0-10 c++ broker does not implement the extended LVQ semantics which the Java Broker does
-org.apache.qpid.server.queue.ConflationQueueTest
+org.apache.qpid.server.queue.ConflationQueueTest#*
 
 //this test checks explicitly for 0-8 flow control semantics
-org.apache.qpid.test.client.FlowControlTest
+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
@@ -61,9 +48,8 @@ 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, message bouncing
+// c++ broker doesn't support message bouncing
 org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#*
-org.apache.qpid.server.queue.PriorityTest#*
 
 // c++ broker expires messages on delivery or when the queue cleaner thread runs.
 org.apache.qpid.server.queue.TimeToLiveTest#testActiveTTL
@@ -88,14 +74,22 @@ org.apache.qpid.server.AlertingTest#*
 org.apache.qpid.server.store.PersistentStoreTest#*
 
 // CPP Broker does not follow the same Logging convention as the Java broker
+org.apache.qpid.server.BrokerStartupTest#*
 org.apache.qpid.server.logging.*
+org.apache.qpid.server.logging.messages.*
+org.apache.qpid.server.logging.subjects.*
+org.apache.qpid.server.logging.actors.*
 
 // CPP Broker does not have a JMX interface to test
 org.apache.qpid.management.jmx.*
+org.apache.qpid.server.queue.AMQQueueMBeanTest#*
+org.apache.qpid.server.exchange.ExchangeMBeanTest#*
+org.apache.qpid.server.AMQBrokerManagerMBeanTest#*
+org.apache.qpid.server.protocol.AMQProtocolSessionMBeanTest#*
+
 // JMX is used in this test for validation
 org.apache.qpid.server.queue.ModelTest#*
 
-
 // 0-10 is not supported by the MethodRegistry
 org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
 
@@ -115,28 +109,40 @@ org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#*
 // Temporarily disabling until properly investigated.
 org.apache.qpid.test.unit.publish.DirtyTrasactedPubilshTest#*
 org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#*
-org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#*
-org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#*
 
 org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#*
 
-org.apache.qpid.server.queue.ConflationQueueTest#*
-
-# Temporarily adding the following until the issues are sorted out.
+// Temporarily adding the following until the issues are sorted out.
 org.apache.qpid.test.unit.client.AMQConnectionTest#testHeartBeat
 
+//QPID-2418 : Not yet implemented on 0-10
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testResubscribeWithChangedSelector
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubSameMessageSelector
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testResubscribeWithChangedSelectorNoClose
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubAddMessageSelectorNoClose
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubNoSelectorResubscribeNoClose
+
 //Excluded due to QPID-1447 : CPP broker does not have SlowConsumer Disconnection
-// NOTE also excludes from the java.0.10 profile due to QPID-2657
 org.apache.qpid.systest.GlobalQueuesTest#*
 org.apache.qpid.systest.GlobalTopicsTest#*
 org.apache.qpid.systest.MergeConfigurationTest#*
 org.apache.qpid.systest.SubscriptionTest#*
 org.apache.qpid.systest.TopicTest#*
 
-// This plugin is not available in the CPP broker
-org.apache.qpid.info.systest.InfoPluginTest#*
-
+// Excluded because Java plugins not used in CPP broker
 org.apache.qpid.server.virtualhost.plugin.*
 org.apache.qpid.server.virtualhost.plugin.policies.*
+org.apache.qpid.info.systest.InfoPluginTest#*
+org.apache.qpid.info.test.*
+org.apache.qpid.server.security.access.*
+org.apache.qpid.server.security.access.plugins.*
+org.apache.qpid.server.security.acl.*
+org.apache.qpid.server.configuration.*
+org.apache.qpid.server.configuration.plugins.*
+org.apache.qpid.server.security.firewall.FirewallConfigTest#*
+org.apache.qpid.server.security.firewall.FirewallConfigurationTest#*
+org.apache.qpid.server.plugins.PluginTest#*
 
-
+// Java broker only
+org.apache.qpid.server.logging.management.LoggingManagementMBeanTest#*
+org.apache.qpid.server.management.AMQUserManagementMBeanTest#*
diff --git a/java/test-profiles/Java010Excludes b/java/test-profiles/Java010Excludes
new file mode 100755
index 0000000000..46be11bfea
--- /dev/null
+++ b/java/test-profiles/Java010Excludes
@@ -0,0 +1,68 @@
+// 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
+
+//this test checks explicitly for 0-8 flow control semantics
+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 Broker does not follow the same Logging convention as the Java broker
+org.apache.qpid.server.logging.*
+org.apache.qpid.server.logging.messages.*
+org.apache.qpid.server.logging.subjects.*
+org.apache.qpid.server.logging.actors.*
+
+// 0-10 Broker does not have a JMX connection MBean
+org.apache.qpid.management.jmx.ManagementActorLoggingTest#testConnectionCloseViaManagement
+
+// 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#*
+
+// Temporarily disabling until properly investigated.
+org.apache.qpid.test.unit.publish.DirtyTrasactedPubilshTest#*
+
+//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
+
+//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.unit.basic.LargeMessageTest#*
+org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchange
+org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode
+org.apache.qpid.systest.GlobalQueuesTest#testTopicDurableConsumerMessageAge
+
+//QPID-2418 : Not yet implemented on 0-10
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testResubscribeWithChangedSelector
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubSameMessageSelector
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testResubscribeWithChangedSelectorNoClose
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubAddMessageSelectorNoClose
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubNoSelectorResubscribeNoClose
diff --git a/java/test-profiles/JavaExcludes b/java/test-profiles/JavaExcludes
index 9d70b9581f..fc77ed78cf 100644
--- a/java/test-profiles/JavaExcludes
+++ b/java/test-profiles/JavaExcludes
@@ -1,11 +1,9 @@
 // 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#*
@@ -26,5 +24,3 @@ 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.destination.AddressBasedDestinationTest#*
diff --git a/java/test-profiles/JavaStandaloneExcludes b/java/test-profiles/JavaStandaloneExcludes
index a9e2a058f8..e2d91a8586 100644
--- a/java/test-profiles/JavaStandaloneExcludes
+++ b/java/test-profiles/JavaStandaloneExcludes
@@ -1,8 +1,7 @@
-// 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
@@ -23,19 +22,14 @@ org.apache.qpid.test.client.failover.FailoverTest#*
 org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
 org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
 
-// 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#*
 
 // This test requires the standard configuration file for validation.
 // Excluding here does not reduce test coverage.
diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile
index 43b9c68d43..4ab1f484d9 100644
--- a/java/test-profiles/default.testprofile
+++ b/java/test-profiles/default.testprofile
@@ -3,7 +3,7 @@ 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.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=Listening on TCP port
 broker.config=${project.root}/build/etc/config-systests.xml
 broker.start=${test.profiles}/start-broker
@@ -30,7 +30,7 @@ test.port.alt=25672
 test.port.alt.ssl=25671
 
 test.exclude=true
-profile.excludes=JavaTransientExcludes JavaInVMExcludes
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes
 test.excludes=Excludes XAExcludes JavaExcludes ${profile}.excludes ${profile.excludes}
 test.fork=no
 test.mem=512M
diff --git a/java/test-profiles/java-derby.0.10.testprofile b/java/test-profiles/java-derby.0.10.testprofile
index c680c1eddd..511e51ec1d 100644
--- a/java/test-profiles/java-derby.0.10.testprofile
+++ b/java/test-profiles/java-derby.0.10.testprofile
@@ -1,10 +1,10 @@
 broker.language=java
 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/derbyDB
+broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=${project.root}/build/etc/config-systests-derby.xml
-profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes CPPExcludes CPPTransientExcludes
+profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
diff --git a/java/test-profiles/java-derby.testprofile b/java/test-profiles/java-derby.testprofile
index c93a0a8260..742af29ffa 100644
--- a/java/test-profiles/java-derby.testprofile
+++ b/java/test-profiles/java-derby.testprofile
@@ -1,6 +1,6 @@
 broker.language=java
 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.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.config=${project.root}/build/etc/config-systests-derby.xml
diff --git a/java/test-profiles/java.0.10.testprofile b/java/test-profiles/java.0.10.testprofile
index 64c184c0f6..f03edec321 100644
--- a/java/test-profiles/java.0.10.testprofile
+++ b/java/test-profiles/java.0.10.testprofile
@@ -1,8 +1,8 @@
 broker.language=java
 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/derbyDB
+broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=BRK-1004
 broker.stopped=Exception
 
-profile.excludes=JavaTransientExcludes JavaStandaloneExcludes CPPExcludes CPPTransientExcludes
+profile.excludes=JavaTransientExcludes JavaStandaloneExcludes Java010Excludes
diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile
index ce73d5b5de..c7d6725d68 100644
--- a/java/test-profiles/java.testprofile
+++ b/java/test-profiles/java.testprofile
@@ -1,6 +1,6 @@
 broker.language=java
 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/derbyDB
+broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=BRK-1004
 broker.stopped=Exception
 #