Author: grkvlt
Date: Thu Mar 3 01:53:16 2011
New Revision: 1076490
URL: http://svn.apache.org/viewvc?rev=1076490&view=rev
Log:
QPID-3052: Create test profiles that set amqp client version explicitly, and
add vm profile
Added:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.1.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.1.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.10.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.8.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.1.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.testprofile
- copied, changed from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
Removed:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/module.xml
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaExcludes
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaStandaloneExcludes
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/default.testprofile
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/module.xml?rev=1076490&r1=1076489&r2=1076490&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/module.xml (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/module.xml Thu Mar 3
01:53:16 2011
@@ -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"/>
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1076490&r1=1076489&r2=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Thu Mar 3 01:53:16 2011
@@ -284,11 +284,6 @@ public class QpidBrokerTestCase extends
@Override
protected void setUp() throws Exception
{
- if (isVmBroker())
- {
- Transport.registerOutgoingTransport(MinaNetworkTransport.class);
- }
-
if (!_configFile.exists())
{
fail("Unable to test without config file:" + _configFile);
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes?rev=1076490&r1=1076489&r2=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
Thu Mar 3 01:53:16 2011
@@ -52,26 +52,25 @@ org.apache.qpid.server.logging.Subscript
// 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.RecoverTes
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
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaExcludes?rev=1076490&r1=1076489&r2=1076490&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaExcludes
(original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaExcludes
Thu Mar 3 01:53:16 2011
@@ -46,9 +46,14 @@ org.apache.qpid.test.unit.ack.FailoverBe
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
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaStandaloneExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaStandaloneExcludes?rev=1076490&r1=1076489&r2=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaStandaloneExcludes
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/JavaStandaloneExcludes
Thu Mar 3 01:53:16 2011
@@ -53,3 +53,5 @@ org.apache.qpid.server.persistent.NoLoca
// 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#*
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/default.testprofile
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/default.testprofile?rev=1076490&r1=1076489&r2=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/default.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/default.testprofile
Thu Mar 3 01:53:16 2011
@@ -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
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.1.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.1.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.1.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
(empty)
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java-derby.0.9.testprofile
Thu Mar 3 01:53:16 2011
@@ -17,11 +17,11 @@
# under the License.
#
-broker.version=0-9-1
+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 -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+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
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.1.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.1.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.1.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
(empty)
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.0.9.testprofile
Thu Mar 3 01:53:16 2011
@@ -17,11 +17,11 @@
# under the License.
#
-broker.version=0-9-1
+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 -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+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
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.10.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.10.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.10.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.10.testprofile
Thu Mar 3 01:53:16 2011
@@ -17,13 +17,12 @@
# under the License.
#
-broker.version=0-9-1
+broker.version=0-10
qpid.amqp.version=0-10
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.ready=BRK-1004
-broker.stopped=Exception
+broker=vm
-profile.excludes=JavaTransientExcludes JavaStandaloneExcludes
08StandaloneExcludes
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes Java010Excludes
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.8.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.8.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.8.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.8.testprofile
Thu Mar 3 01:53:16 2011
@@ -17,13 +17,13 @@
# under the License.
#
-broker.version=0-9-1
-qpid.amqp.version=0-10
+broker.version=0-8
+qpid.amqp.version=0-8
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.ready=BRK-1004
-broker.stopped=Exception
+broker=vm
+
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes
-profile.excludes=JavaTransientExcludes JavaStandaloneExcludes
08StandaloneExcludes
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.1.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.1.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.1.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.1.testprofile
Thu Mar 3 01:53:16 2011
@@ -18,12 +18,11 @@
#
broker.version=0-9-1
-qpid.amqp.version=0-10
+qpid.amqp.version=0-9-1
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.ready=BRK-1004
-broker.stopped=Exception
+broker=vm
-profile.excludes=JavaTransientExcludes JavaStandaloneExcludes
08StandaloneExcludes
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes
Copied:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.testprofile
(from r1076489,
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.testprofile?p2=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.testprofile&p1=qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile&r1=1076489&r2=1076490&rev=1076490&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/java.testprofile
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/vm.0.9.testprofile
Thu Mar 3 01:53:16 2011
@@ -17,13 +17,12 @@
# under the License.
#
-broker.version=0-9-1
-qpid.amqp.version=0-10
+broker.version=0-9
+qpid.amqp.version=0-9
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.ready=BRK-1004
-broker.stopped=Exception
+broker=vm
-profile.excludes=JavaTransientExcludes JavaStandaloneExcludes
08StandaloneExcludes
+qpid.transport.outgoing=org.apache.qpid.transport.network.mina.MinaNetworkTransport
+
+profile.excludes=JavaTransientExcludes JavaInVMExcludes 08StandaloneExcludes
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
