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/08/07 23:36:45 UTC
activemq-artemis git commit: NO-JIRA Improving ExpiryMessageTest
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x 548459f4c -> faf70e940
NO-JIRA Improving ExpiryMessageTest
(cherry picked from commit 901e5c4a98c9b1ecb5f82f129c889023a1077374)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/faf70e94
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/faf70e94
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/faf70e94
Branch: refs/heads/2.6.x
Commit: faf70e94097f02676eaa7067a9d0e510815d9c3b
Parents: 548459f
Author: Clebert Suconic <cl...@apache.org>
Authored: Sat Jun 23 10:33:33 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 7 19:36:37 2018 -0400
----------------------------------------------------------------------
.../integration/jms/client/ExpiryMessageTest.java | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/faf70e94/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
index b5091dc..53a3637 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
@@ -25,6 +25,7 @@ import javax.jms.Topic;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.junit.Wait;
import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.junit.Test;
@@ -42,7 +43,7 @@ public class ExpiryMessageTest extends JMSTestBase {
@Override
protected Configuration createDefaultConfig(boolean netty) throws Exception {
- return super.createDefaultConfig(netty).setMessageExpiryScanPeriod(1000);
+ return super.createDefaultConfig(netty).setMessageExpiryScanPeriod(50);
}
@Test
@@ -64,7 +65,7 @@ public class ExpiryMessageTest extends JMSTestBase {
conn = cf.createConnection();
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer prod = sess.createProducer(topic);
- prod.setTimeToLive(1000);
+ prod.setTimeToLive(100);
for (int i = 0; i < 100; i++) {
TextMessage txt = sess.createTextMessage("txt");
@@ -75,17 +76,7 @@ public class ExpiryMessageTest extends JMSTestBase {
conn.close();
- // minimal time needed
- Thread.sleep(2000);
-
- long timeout = System.currentTimeMillis() + 10000;
-
- // We will wait some time, but we will wait as minimal as possible
- while (control.getMessageCount() != 0 && System.currentTimeMillis() > timeout) {
- Thread.sleep(100);
- }
-
- assertEquals(0, control.getMessageCount());
+ Wait.assertEquals(0, control::getMessageCount);
}