QPID-3052: Create test profiles that set amqp client version explicitly, and add vm profile

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20110301@1076490 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 206 insertions, 17 deletions

diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index d3954a1544..b0279240a9 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -292,7 +292,7 @@
   </target>
 
 
-  <property name="profile" value="default"/>
+  <property name="profile" value="vm.0.10"/>
   <property name="testprofile.file" value="${test.profiles}/${profile}.testprofile"/>
   
   <available file="${testprofile.file}" property="testprofile.file.present"/>
@@ -354,6 +354,7 @@
       <sysproperty key="messagestore.class.name" value="${messagestore.class.name}" />
       <sysproperty key="test.output" value="${module.results}"/>
       <sysproperty key="qpid.amqp.version" value="${qpid.amqp.version}"/>
+      <sysproperty key="qpid.transport.outgoing" value="${qpid.transport.outgoing}" />
 
       <syspropertyset>
         <propertyref prefix="test"/>
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index c366d956e9..a85311e7e1 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -284,11 +284,6 @@ public class QpidBrokerTestCase extends QpidTestCase
     @Override
     protected void setUp() throws Exception
     {
-        if (isVmBroker())
-        {
-            Transport.registerOutgoingTransport(MinaNetworkTransport.class);
-        }
-
         if (!_configFile.exists())
         {
             fail("Unable to test without config file:" + _configFile);
diff --git a/qpid/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes
index 9ce968fcc1..2c1e685850 100755
--- a/qpid/java/test-profiles/Java010Excludes
+++ b/qpid/java/test-profiles/Java010Excludes
@@ -52,26 +52,25 @@ org.apache.qpid.server.logging.SubscriptionLoggingTest#testSubscriptionSuspend
 // 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
+// 0-10 has many different ideas
+// Some are 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#*
+//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-2471 : Issues with 0-10 recovery
-org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener
-org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverInAutoAckListener
+//org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener
+//org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testRecoverInAutoAckListener
 
-// Temporarily disabling until properly investigated.
+// Temporarily disabling until properly investigated
+// Failover from inside onMessage stalls the Dispatcher restart
 org.apache.qpid.test.unit.publish.DirtyTransactedPublishTest#*
 
 //rollback with subscriptions does not work in 0-10 yet
@@ -82,6 +81,12 @@ org.apache.qpid.test.unit.ack.RecoverTest#testRecoverInAutoAckListener
 org.apache.qpid.transport.network.mina.MinaNetworkTransportTest#testSetReadIdle
 org.apache.qpid.transport.network.mina.MinaNetworkTransportTest#testSetWriteIdle
 
+// This test uses 0-8 channel frames
+org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
+
+//QPID-1950 : Commit to test this failure. This can only be tested with non 0-10 VM brokers.
+org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#*
+
 //Temporarily adding the following until the issues are sorted out.
 //Should probably raise JIRAs for them.
 org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchange
diff --git a/qpid/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes
index c38a250abc..567829e1c8 100644
--- a/qpid/java/test-profiles/JavaExcludes
+++ b/qpid/java/test-profiles/JavaExcludes
@@ -46,9 +46,14 @@ org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#testOderingWith
 
 org.apache.qpid.test.client.queue.LVQTest#*
 
-// Session resume is not supported in the Java client
+// Session resume is not supported in the (0-10) Java client
 org.apache.qpid.transport.ConnectionTest#testResumeNonemptyReplayBuffer
+org.apache.qpid.transport.ConnectionTest#testResumeEmptyReplayBuffer
 
 //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
+
+// Mina does not suopport idle timeouts
+org.apache.qpid.transport.network.mina.MinaNetworkTransportTest#testSetReadIdle
+org.apache.qpid.transport.network.mina.MinaNetworkTransportTest#testSetWriteIdle
diff --git a/qpid/java/test-profiles/JavaStandaloneExcludes b/qpid/java/test-profiles/JavaStandaloneExcludes
index d208a20d15..e22021a7a8 100644
--- a/qpid/java/test-profiles/JavaStandaloneExcludes
+++ b/qpid/java/test-profiles/JavaStandaloneExcludes
@@ -53,3 +53,5 @@ org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
 // Excluding here does not reduce test coverage.
 org.apache.qpid.server.configuration.ServerConfigurationFileTest#*
 
+//QPID-1950 : Commit to test this failure. This can only be tested with non 0-10 VM brokers.
+org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#*
diff --git a/qpid/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile
index fe710f0e29..93a41c19d5 100644
--- a/qpid/java/test-profiles/default.testprofile
+++ b/qpid/java/test-profiles/default.testprofile
@@ -16,19 +16,24 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+
 java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory
 java.naming.provider.url=${test.profiles}/test-provider.properties
 
 broker.version=0-9-1
-qpid.amqp.version=
-broker=vm
+qpid.amqp.version=0-9-1
+
 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
+broker.persistent=false
+broker.clean.between.tests=false
 messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
 
+qpid.transport.outgoing=org.apache.qpid.transport.network.io.IoNetworkTransport
+
 max_prefetch=1000
 qpid.dest_syntax=BURL
 
@@ -60,3 +65,4 @@ haltonerror=no
 exclude.modules=none
 
 profile.clustered=false
+profile=vm.0.10
diff --git a/qpid/java/test-profiles/java-derby.testprofile b/qpid/java/test-profiles/java-derby.0.9.1.testprofile
index b277adb4fa..b277adb4fa 100644
--- a/qpid/java/test-profiles/java-derby.testprofile
+++ b/qpid/java/test-profiles/java-derby.0.9.1.testprofile
diff --git a/qpid/java/test-profiles/java-derby.0.9.testprofile b/qpid/java/test-profiles/java-derby.0.9.testprofile
new file mode 100644
index 0000000000..9f2b29d963
--- /dev/null
+++ b/qpid/java/test-profiles/java-derby.0.9.testprofile
@@ -0,0 +1,33 @@
+#
+# 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=0-9
+qpid.amqp.version=0-10
+
+broker.language=java
+broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT --exclude-0-9-1 @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=${project.root}/build/etc/config-systests-derby.xml
+messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
+broker.clean.between.tests=true
+broker.persistent=true
+
+profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes
diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.0.9.1.testprofile
index f1175c7c39..f1175c7c39 100644
--- a/qpid/java/test-profiles/java.testprofile
+++ b/qpid/java/test-profiles/java.0.9.1.testprofile
diff --git a/qpid/java/test-profiles/java.0.9.testprofile b/qpid/java/test-profiles/java.0.9.testprofile
new file mode 100644
index 0000000000..7a25e2ea41
--- /dev/null
+++ b/qpid/java/test-profiles/java.0.9.testprofile
@@ -0,0 +1,29 @@
+#
+# 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=0-9
+qpid.amqp.version=0-10
+
+broker.language=java
+broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT --exclude-0-9-1 @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
+
+profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes
diff --git a/qpid/java/test-profiles/vm.0.10.testprofile b/qpid/java/test-profiles/vm.0.10.testprofile
new file mode 100644
index 0000000000..a52b1264c9
--- /dev/null
+++ b/qpid/java/test-profiles/vm.0.10.testprofile
@@ -0,0 +1,28 @@
+#
+# 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=0-10
+qpid.amqp.version=0-10
+
+broker.language=java
+broker=vm
+
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes Java010Excludes
diff --git a/qpid/java/test-profiles/vm.0.8.testprofile b/qpid/java/test-profiles/vm.0.8.testprofile
new file mode 100644
index 0000000000..1e254ac4c5
--- /dev/null
+++ b/qpid/java/test-profiles/vm.0.8.testprofile
@@ -0,0 +1,29 @@
+#
+# 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=0-8
+qpid.amqp.version=0-8
+
+broker.language=java
+broker=vm
+
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes
+
diff --git a/qpid/java/test-profiles/vm.0.9.1.testprofile b/qpid/java/test-profiles/vm.0.9.1.testprofile
new file mode 100644
index 0000000000..20e13f6e5d
--- /dev/null
+++ b/qpid/java/test-profiles/vm.0.9.1.testprofile
@@ -0,0 +1,28 @@
+#
+# 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=0-9-1
+qpid.amqp.version=0-9-1
+
+broker.language=java
+broker=vm
+
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes
diff --git a/qpid/java/test-profiles/vm.0.9.testprofile b/qpid/java/test-profiles/vm.0.9.testprofile
new file mode 100644
index 0000000000..7258454c08
--- /dev/null
+++ b/qpid/java/test-profiles/vm.0.9.testprofile
@@ -0,0 +1,28 @@
+#
+# 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=0-9
+qpid.amqp.version=0-9
+
+broker.language=java
+broker=vm
+
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes