You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/11/14 15:48:36 UTC
[2/3] activemq-artemis git commit: NO-JIRA fix on JMSBridgeTestBase
NO-JIRA fix on JMSBridgeTestBase
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d6ffa8b4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d6ffa8b4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d6ffa8b4
Branch: refs/heads/master
Commit: d6ffa8b42607f7bb9c14965c771064b74638546e
Parents: ff5f121
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Nov 14 10:31:33 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Nov 14 10:43:20 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/d6ffa8b4/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 59ec018..e76643c 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
@@ -423,7 +423,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);
@@ -481,7 +481,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/d6ffa8b4/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 40c72e1..41288a9 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
@@ -1164,7 +1164,7 @@ public class JMSBridgeTest extends BridgeTestBase {
Assert.assertEquals(0, tm.getJMSExpiration());
- m = cons.receive(5000);
+ m = cons.receive(500);
Assert.assertNull(m);
@@ -1615,7 +1615,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();