NO-JIRA fix on JMSBridgeTestBase (cherry picked from commit d6ffa8b42607f7bb9c14965c771064b74638546e)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6f62113a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6f62113a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6f62113a Branch: refs/heads/2.6.x Commit: 6f62113a304465099b40937321d5c05846b1ad55 Parents: 566ecbb Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Wed Nov 14 10:31:33 2018 -0500 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Nov 14 11:44:50 2018 -0500 ---------------------------------------------------------------------- .../artemis/tests/extras/jms/bridge/BridgeTestBase.java | 6 ++++-- .../artemis/tests/extras/jms/bridge/JMSBridgeTest.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6f62113a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java index c47d026..b5dc32e 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java @@ -459,7 +459,7 @@ public abstract class BridgeTestBase extends ActiveMQTestBase { // Consume the messages for (int i = 0; i < numMessages; i++) { - Message tm = cons.receive(30000); + Message tm = cons.receive(3000); Assert.assertNotNull(tm); @@ -517,7 +517,9 @@ public abstract class BridgeTestBase extends ActiveMQTestBase { managementService = server1.getManagementService(); } QueueControl queueControl = (QueueControl) managementService.getResource("queue." + queueName); - queueControl.removeMessages(null); + if (queueControl != null) { + queueControl.removeMessages(null); + } } protected TransactionManager newTransactionManager() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6f62113a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java index 33edaec..d3486f1 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java @@ -1166,7 +1166,7 @@ public class JMSBridgeTest extends BridgeTestBase { Assert.assertEquals(0, tm.getJMSExpiration()); - m = cons.receive(5000); + m = cons.receive(500); Assert.assertNull(m); @@ -1617,7 +1617,7 @@ public class JMSBridgeTest extends BridgeTestBase { try { final int NUM_MESSAGES = 10; - bridge = new JMSBridgeImpl(factInUse0, factInUse0, sourceQueueFactory, localTargetQueueFactory, null, null, null, null, null, 5000, 10, qosMode, NUM_MESSAGES, -1, null, null, false).setBridgeName("test-bridge"); + bridge = new JMSBridgeImpl(factInUse0, factInUse0, sourceQueueFactory, localTargetQueueFactory, null, null, null, null, null, 500, 10, qosMode, NUM_MESSAGES, -1, null, null, false).setBridgeName("test-bridge"); bridge.start();
