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 abb7d16 NO-JIRA Improving SessionTest reliability abb7d16 is described below commit abb7d16b92f12b3c90cad5fd61971733fa8dce0c Author: Clebert Suconic <clebertsuco...@apache.org> AuthorDate: Wed Oct 9 11:18:53 2019 -0400 NO-JIRA Improving SessionTest reliability This test was eventually failing Improving the assertions and loops --- .../tests/integration/client/SessionTest.java | 137 +++++---------------- 1 file changed, 30 insertions(+), 107 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java index c8c9d1a..ed6ab54 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java @@ -331,18 +331,11 @@ public class SessionTest extends ActiveMQTestBase { ClientSession clientSession = cf.createSession(false, false, true); clientSession.createQueue(queueName, queueName, false); ClientProducer cp = clientSession.createProducer(queueName); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); + for (int i = 0; i < 10; i++) { + cp.send(clientSession.createMessage(false)); + } Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable(); - Assert.assertEquals(0, getMessageCount(q)); + Wait.assertEquals(0, () -> getMessageCount(q)); clientSession.commit(); Assert.assertTrue(Wait.waitFor(() -> getMessageCount(q) == 10, 2000, 100)); clientSession.close(); @@ -354,23 +347,16 @@ public class SessionTest extends ActiveMQTestBase { ClientSession clientSession = cf.createSession(false, false, true); clientSession.createQueue(queueName, queueName, false); ClientProducer cp = clientSession.createProducer(queueName); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); + for (int i = 0; i < 10; i++) { + cp.send(clientSession.createMessage(false)); + } Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable(); - Assert.assertEquals(0, getMessageCount(q)); + Wait.assertEquals(0, () -> getMessageCount(q)); clientSession.rollback(); cp.send(clientSession.createMessage(false)); cp.send(clientSession.createMessage(false)); clientSession.commit(); - Assert.assertEquals(2, getMessageCount(q)); + Wait.assertEquals(2, () -> getMessageCount(q)); clientSession.close(); } @@ -382,52 +368,22 @@ public class SessionTest extends ActiveMQTestBase { ClientProducer cp = sendSession.createProducer(queueName); ClientSession clientSession = cf.createSession(false, true, false); clientSession.createQueue(queueName, queueName, false); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); + for (int i = 0; i < 10; i++) { + cp.send(clientSession.createMessage(false)); + } Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable(); - Assert.assertEquals(10, getMessageCount(q)); + Wait.assertEquals(10, () -> getMessageCount(q)); ClientConsumer cc = clientSession.createConsumer(queueName); clientSession.start(); - ClientMessage m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); + + for (int i = 0; i < 10; i++) { + ClientMessage m = cc.receive(5000); + Assert.assertNotNull(m); + m.acknowledge(); + } clientSession.commit(); - Assert.assertEquals(0, getMessageCount(q)); + Assert.assertNull(cc.receiveImmediate()); + Wait.assertEquals(0, () -> getMessageCount(q)); clientSession.close(); sendSession.close(); } @@ -440,51 +396,18 @@ public class SessionTest extends ActiveMQTestBase { ClientProducer cp = sendSession.createProducer(queueName); ClientSession clientSession = cf.createSession(false, true, false); clientSession.createQueue(queueName, queueName, false); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); - cp.send(clientSession.createMessage(false)); + for (int i = 0; i < 10; i++) { + cp.send(clientSession.createMessage(false)); + } Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable(); - Assert.assertEquals(10, getMessageCount(q)); + Wait.assertEquals(10, () -> getMessageCount(q)); ClientConsumer cc = clientSession.createConsumer(queueName); clientSession.start(); - ClientMessage m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - m = cc.receive(5000); - Assert.assertNotNull(m); - m.acknowledge(); - clientSession.rollback(); + for (int i = 0; i < 10; i++) { + ClientMessage m = cc.receive(5000); + Assert.assertNotNull(m); + m.acknowledge(); + } Wait.assertEquals(10, () -> getMessageCount(q)); clientSession.close(); sendSession.close();