Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Improving SessionTest reliability 

This test was eventually failing
Improving the assertions and loops
This commit is contained in:
Clebert Suconic 2019-10-09 11:18:53 -04:00
parent 49c96c60d1
commit abb7d16b92
1 changed files with 30 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
View File

@ -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);
for (int i = 0; i < 10; i++) {
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));
}
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);
for (int i = 0; i < 10; i++) {
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));
}
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);
for (int i = 0; i < 10; i++) {
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));
}
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();
for (int i = 0; i < 10; i++) {
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.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);
for (int i = 0; i < 10; i++) {
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));
}
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();
for (int i = 0; i < 10; i++) {
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();
}
Wait.assertEquals(10, () -> getMessageCount(q));
clientSession.close();
sendSession.close();