You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/07/15 14:38:30 UTC
[1/2] activemq-artemis git commit: This closes #638
Repository: activemq-artemis
Updated Branches:
refs/heads/master baee468de -> 9df39ad56
This closes #638
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9df39ad5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9df39ad5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9df39ad5
Branch: refs/heads/master
Commit: 9df39ad56963009d72bf1fe27e5b6c8f5beb7613
Parents: baee468 4d16c07
Author: jbertram <jb...@apache.org>
Authored: Fri Jul 15 09:38:17 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Fri Jul 15 09:38:17 2016 -0500
----------------------------------------------------------------------
.../jms/server/management/JMSQueueControlTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-634
JMSQueueControlUsingJMSTest fails
Posted by jb...@apache.org.
ARTEMIS-634 JMSQueueControlUsingJMSTest fails
We have to wait some time until Artemis delivers all messages.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4d16c072
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4d16c072
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4d16c072
Branch: refs/heads/master
Commit: 4d16c0721a9df58908f0daa7d27735c60d8bee77
Parents: baee468
Author: Erich Duda <ed...@redhat.com>
Authored: Fri Jul 15 12:44:09 2016 +0200
Committer: jbertram <jb...@apache.org>
Committed: Fri Jul 15 09:38:17 2016 -0500
----------------------------------------------------------------------
.../jms/server/management/JMSQueueControlTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4d16c072/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
index 6acd9ae..90aa8f9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
@@ -46,6 +46,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.api.jms.management.DestinationControl;
import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
import org.apache.activemq.artemis.core.config.Configuration;
@@ -1451,6 +1452,8 @@ public class JMSQueueControlTest extends ManagementTestBase {
JMSQueueControl control = createManagementControl(pagedQueue);
+ Assert.assertTrue(waitForMessages(control, 100, 5000));
+
assertEquals(100, control.removeMessages(" "));
session.start();
@@ -1667,6 +1670,18 @@ public class JMSQueueControlTest extends ManagementTestBase {
return ManagementControlHelper.createJMSQueueControl(queueParameter, mbeanServer);
}
+ protected boolean waitForMessages(DestinationControl control, int count, long timeout) throws Exception {
+ long timeToWait = System.currentTimeMillis() + timeout;
+
+ while (System.currentTimeMillis() < timeToWait) {
+ if (control.getMessageCount() == count) {
+ return true;
+ }
+ Thread.sleep(100);
+ }
+ return false;
+ }
+
// Private -------------------------------------------------------
private Connection createConnection() throws JMSException {