You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/02/16 20:33:36 UTC
[1/2] qpid-jms git commit: Turn off some more features we don't need
for these tests to speed them up a little.
Repository: qpid-jms
Updated Branches:
refs/heads/master 98a155755 -> 1ba99d539
Turn off some more features we don't need for these tests to speed them
up a little.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/94422fb3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/94422fb3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/94422fb3
Branch: refs/heads/master
Commit: 94422fb3be84f4370f7da9e59008fc7fdee78d42
Parents: 98a1557
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Feb 16 14:13:51 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Feb 16 14:13:51 2015 -0500
----------------------------------------------------------------------
.../src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/94422fb3/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java
index f1e7db1..532923e 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java
@@ -53,7 +53,8 @@ public class ActiveMQAdmin implements Admin {
}
protected BrokerService createBroker() throws Exception {
- return BrokerFactory.createBroker(new URI("broker://()/localhost?persistent=false"));
+ return BrokerFactory.createBroker(
+ new URI("broker://()/localhost?persistent=false&useJmx=false&schedulerSupport=false"));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: add some code to test that the values are
overridden by the connection info values.
Posted by ta...@apache.org.
add some code to test that the values are overridden by the connection
info values.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1ba99d53
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1ba99d53
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1ba99d53
Branch: refs/heads/master
Commit: 1ba99d5397ff48ce377a199dd47e10bf30cc0b40
Parents: 94422fb
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Feb 16 14:16:31 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Feb 16 14:16:31 2015 -0500
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/AmqpProviderTest.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1ba99d53/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
index 90048a8..df1ced8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpProviderTest.java
@@ -150,18 +150,23 @@ public class AmqpProviderTest extends QpidJmsTestCase {
@Test(timeout=10000)
public void testTimeoutsSetFromConnectionInfo() throws IOException, JMSException {
+ final long CONNECT_TIMEOUT = TimeUnit.SECONDS.toMillis(4);
+ final long CLOSE_TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+ final long SEND_TIMEOUT = TimeUnit.SECONDS.toMillis(6);
+ final long REQUEST_TIMEOUT = TimeUnit.SECONDS.toMillis(7);
+
provider = new AmqpProvider(peerURI);
testPeer.expectPlainConnect(TEST_USERNAME, TEST_PASSWORD, null, null);
testPeer.expectBegin(true);
provider.connect();
testPeer.expectClose();
- JmsConnectionInfo connectionInfo = createConnectionInfo();
+ provider.setConnectTimeout(CONNECT_TIMEOUT + 100);
+ provider.setCloseTimeout(CLOSE_TIMEOUT + 100);
+ provider.setSendTimeout(SEND_TIMEOUT + 100);
+ provider.setRequestTimeout(REQUEST_TIMEOUT + 100);
- final long CONNECT_TIMEOUT = TimeUnit.SECONDS.toMillis(4);
- final long CLOSE_TIMEOUT = TimeUnit.SECONDS.toMillis(5);
- final long SEND_TIMEOUT = TimeUnit.SECONDS.toMillis(6);
- final long REQUEST_TIMEOUT = TimeUnit.SECONDS.toMillis(7);
+ JmsConnectionInfo connectionInfo = createConnectionInfo();
connectionInfo.setConnectTimeout(CONNECT_TIMEOUT);
connectionInfo.setCloseTimeout(CLOSE_TIMEOUT);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org