[activemq-artemis] branch master updated: NO-JIRA improving duplicate detection test

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new edbf357  NO-JIRA improving duplicate detection test
edbf357 is described below

commit edbf3575d093027dd4a7f48227daf72d47e02c04
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Thu Apr 25 22:07:43 2019 -0400

    NO-JIRA improving duplicate detection test
---
 .../artemis/tests/integration/amqp/AmqpSenderTest.java         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java
index dc1b6e4..09b8025 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderTest.java
@@ -28,6 +28,7 @@ import org.apache.activemq.artemis.tests.util.Wait;
 import org.apache.activemq.transport.amqp.client.AmqpClient;
 import org.apache.activemq.transport.amqp.client.AmqpConnection;
 import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import org.apache.activemq.transport.amqp.client.AmqpReceiver;
 import org.apache.activemq.transport.amqp.client.AmqpSender;
 import org.apache.activemq.transport.amqp.client.AmqpSession;
 import org.apache.activemq.transport.amqp.client.AmqpValidator;
@@ -35,6 +36,7 @@ import 
org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
 import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
 import org.apache.qpid.proton.engine.Delivery;
 import org.apache.qpid.proton.engine.Sender;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -193,13 +195,19 @@ public class AmqpSenderTest extends AmqpClientTestSupport 
{
 
       AmqpSender sender = session.createSender(getQueueName(), true);
 
+      AmqpReceiver receiver = session.createReceiver(getQueueName());
+      receiver.setPresettle(true);
+      receiver.flow(10);
+      Assert.assertNull("somehow the queue had messages from a previous test", 
receiver.receiveNoWait());
+
       for (int i = 1; i <= MSG_COUNT; ++i) {
          AmqpMessage message = new AmqpMessage();
          
message.setApplicationProperty(Message.HDR_DUPLICATE_DETECTION_ID.toString(), 
"123");
          sender.send(message);
       }
 
-      Wait.assertTrue("Only 1 message should arrive", () -> 
getProxyToQueue(getQueueName()).getMessageCount() == 1);
+      AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS);
+      Assert.assertNull(receiver.receiveNoWait());
 
       sender.close();
       connection.close();