From a5273319e880200c1e3b26e140a9cf8423daf3ce 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@792157 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/test-provider.properties | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 qpid/java/test-profiles/test-provider.properties (limited to 'qpid/java/test-profiles/test-provider.properties') diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties new file mode 100644 index 0000000000..2479b5a5f0 --- /dev/null +++ b/qpid/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 -- cgit v1.2.1 From 06d1a8ad0bbfb4580bd7ba9fca8622d951e7b5c9 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Tue, 18 Aug 2009 03:39:04 +0000 Subject: This commit allows a limited number of failover tests to run under the SSL profile using SSL connections. This commit should also fix the tests hanging under the SSL test profile due to port conflicts with SSL and failover ports. FailoverBaseCase and FailoverTest is improved to handle the failover port without having to rely on port arithmetic. The FailoverBaseCase is modified to use the failover.ssl connection factory when running under the SSL profile. I have uncommented the FailoverTest from the cpp.ssl.excludes. However only a selected set of tests will run outside the cpp.clustered profile. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805267 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/test-provider.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/test-provider.properties') diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties index 2479b5a5f0..e5cb18da0b 100644 --- a/qpid/java/test-profiles/test-provider.properties +++ b/qpid/java/test-profiles/test-provider.properties @@ -21,13 +21,17 @@ test.port=5672 test.port.ssl=5671 -test.port.alt=5673 +test.port.alt=5772 +test.port.alt.ssl=5771 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.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}' -- cgit v1.2.1 From e4dc41ed4d12c81a9683d69f6328b2de63c9288f Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 21 Sep 2009 15:41:33 +0000 Subject: FailoverBaseCase has not been using the testprofile defined test.port.alt for the failover server. As a result the connection has been failing. Updated to use correct system property and added text to both default.testprofile and test-provider.properties to ensure that the changes are made in both locations, Ideally JNDI connection would use the same system property that is used by QTC for starting the broker. However I don't believe that it is currently doing that. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@817295 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/test-provider.properties | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'qpid/java/test-profiles/test-provider.properties') diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties index e5cb18da0b..a349b0fcbf 100644 --- a/qpid/java/test-profiles/test-provider.properties +++ b/qpid/java/test-profiles/test-provider.properties @@ -19,10 +19,14 @@ # # -test.port=5672 -test.port.ssl=5671 -test.port.alt=5772 -test.port.alt.ssl=5771 +# Copied from default.testprofile +test.port=15672 +test.mport=18999 +#Note : Java Management will start open second port on: mport + 100 : 19099 +test.port.ssl=15671 +test.port.alt=25672 +test.port.alt.ssl=25671 + connectionfactory.default = amqp://username:password@clientid/test?brokerlist='tcp://localhost:${test.port}' connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist='vm://:1' -- cgit v1.2.1 From cad783ccf354fcbc8aae2517c80ee0421b033f0c 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@821821 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/test-provider.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'qpid/java/test-profiles/test-provider.properties') diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties index a349b0fcbf..70a2672263 100644 --- a/qpid/java/test-profiles/test-provider.properties +++ b/qpid/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 From 7568fef734b03114883a9256a927d5f9151da0b1 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 8 Oct 2009 08:17:33 +0000 Subject: QPID-1950 : Problem is that the thrown exception whilst an IOException does not signify that the socket has closed. So the broker had two open connections to send messages on. Change was to ensure that the previous Socket/IOSession has been closed before failover starts. Also added protected to ChannelOpenHandler to guard against out of order frames causing a NPE. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@823087 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/test-provider.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/test-provider.properties') diff --git a/qpid/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties index 70a2672263..8cea012c1d 100644 --- a/qpid/java/test-profiles/test-provider.properties +++ b/qpid/java/test-profiles/test-provider.properties @@ -34,7 +34,7 @@ connectionfactory.default.vm = amqp://username:password@clientid/test?brokerlist 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.failover.vm = amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'&failover='roundrobin?cyclecount='20'' 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}' -- cgit v1.2.1