From 74ebccda962ff1ae8998bcc317b1b0f79a7eb523 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 5 Oct 2009 15:01:17 +0000 Subject: Updated testing harness: QpidTestCase and FailoverBaseCase. Updates to QpidTestCase: to allow the sending of messages that are tagged from an offset value. to correctly commit the sent messages if the sent number does not fit within the batch window. update to createMessage to add an INDEX int property. update to rename ssl connectionfactory default.ssl to align with other factories. updated test-provider accordingly. added a getTestQueue method that creates an AMQQueue using getTestQueueName to further simplify tests. Updates to FailoverBaseCase removed setFailingPort, failBroker now takes the port to fail, this allows both brokers to be failed more easily. Update to ensure that all subclasses get a failover connection url, through the getConnection(), some were not. Fixed by overriding getConnectionFactory() call. Fixed second broker work directory to write to defined QPID_WORK rather than java.io.tmpdir. If QPID_WORK is not set then tests will fall back to java.io.tmpdir getFailingPort now returns the correct value if you are running InVM (2)or externally(test.alt.port) Updated tests that used failBroker to use failBroker(getFailingPort()) so tests will work InVM and externally. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821821 13f79535-47bb-0310-9956-ffa450edef68 --- java/test-profiles/test-provider.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'java/test-profiles') diff --git a/java/test-profiles/test-provider.properties b/java/test-profiles/test-provider.properties index a349b0fcbf..70a2672263 100644 --- a/java/test-profiles/test-provider.properties +++ b/java/test-profiles/test-provider.properties @@ -29,14 +29,13 @@ test.port.alt.ssl=25671 connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' +connectionfactory.default.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.ssl}?ssl='true'' connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -connectionfactory.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.ssl = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port.alt.ssl}?ssl='true';tcp://localhost:${test.port.ssl}?ssl='true''&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20'' - connectionfactory.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1' + 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' -- cgit v1.2.1