Repository: qpid-broker-j Updated Branches: refs/heads/master 7a2452d53 -> 67f78d364
QPID-7646: [Broker-J] Fix racy tests Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/67f78d36 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/67f78d36 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/67f78d36 Branch: refs/heads/master Commit: 67f78d364864f2df520e18592dd8eb7f639a7e8d Parents: 7a2452d Author: Alex Rudyy <[email protected]> Authored: Fri Oct 27 11:02:11 2017 +0100 Committer: Alex Rudyy <[email protected]> Committed: Fri Oct 27 11:02:11 2017 +0100 ---------------------------------------------------------------------- .../qpid/systest/rest/ConnectionRestTest.java | 31 ++++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/67f78d36/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java ---------------------------------------------------------------------- diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java index d781a15..a4fe6b3 100644 --- a/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java +++ b/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java @@ -117,23 +117,14 @@ public class ConnectionRestTest extends QpidRestTestCase Message m = consumer.receive(getReceiveTimeout()); assertNotNull("Subsequent messages were not received", m); - @SuppressWarnings("unchecked") Map<String, Object> statistics = getConnectionStatistics(connectionUrl); - assertEquals("Unexpected value of connection statistics attribute messagesIn", 1, - statistics.get("messagesIn")); - assertEquals("Unexpected value of connection statistics attribute messagesOut", - 1, statistics.get("messagesOut")); assertEquals("Unexpected value of statistic attribute localTransactionBegins", 2, statistics.get("localTransactionBegins")); assertEquals("Unexpected value of statistic attribute localTransactionRollbacks", 0, statistics.get("localTransactionRollbacks")); assertEquals("Unexpected value of statistic attribute localTransactionOpen", 1, statistics.get("localTransactionOpen")); - assertEquals("Unexpected value of statistic attribute transactedMessagesIn", 1, - statistics.get("transactedMessagesIn")); - assertEquals("Unexpected value of statistic attribute transactedMessagesOut", 1, - statistics.get("transactedMessagesOut")); _session.rollback(); m = consumer.receive(getReceiveTimeout()); @@ -141,20 +132,12 @@ public class ConnectionRestTest extends QpidRestTestCase final Map<String, Object> statistics2 = getConnectionStatistics(connectionUrl); - assertEquals("Unexpected value of connection statistics attribute messagesIn", 1, - statistics2.get("messagesIn")); - assertEquals("Unexpected value of connection statistics attribute messagesOut", - 2, statistics2.get("messagesOut")); assertEquals("Unexpected value of statistic attribute localTransactionBegins", 3, statistics2.get("localTransactionBegins")); assertEquals("Unexpected value of statistic attribute localTransactionRollbacks", 1, statistics2.get("localTransactionRollbacks")); assertEquals("Unexpected value of statistic attribute localTransactionOpen", 1, statistics2.get("localTransactionOpen")); - assertEquals("Unexpected value of statistic attribute transactedMessagesIn", 1, - statistics2.get("transactedMessagesIn")); - assertEquals("Unexpected value of statistic attribute transactedMessagesOut", 2, - statistics2.get("transactedMessagesOut")); _producer.send(_session.createMessage()); consumer.close(); @@ -162,20 +145,12 @@ public class ConnectionRestTest extends QpidRestTestCase final Map<String, Object> statistics3 = getConnectionStatistics(connectionUrl); - assertEquals("Unexpected value of connection statistics attribute messagesIn", 2, - statistics3.get("messagesIn")); - assertEquals("Unexpected value of connection statistics attribute messagesOut", - 2, statistics3.get("messagesOut")); assertEquals("Unexpected value of statistic attribute localTransactionBegins", 3, statistics3.get("localTransactionBegins")); assertEquals("Unexpected value of statistic attribute localTransactionRollbacks", 2, statistics3.get("localTransactionRollbacks")); assertEquals("Unexpected value of statistic attribute localTransactionOpen", 0, statistics3.get("localTransactionOpen")); - assertEquals("Unexpected value of statistic attribute transactedMessagesIn", 2, - statistics3.get("transactedMessagesIn")); - assertEquals("Unexpected value of statistic attribute transactedMessagesOut", 2, - statistics3.get("transactedMessagesOut")); } public void testConnectionMessageCountStatistics() throws Exception @@ -197,8 +172,12 @@ public class ConnectionRestTest extends QpidRestTestCase m = consumer.receive(getReceiveTimeout()); assertNotNull("First message was not received", m); + // close session to make sure message ack/disposition reaches the broker before rest request is made + _session.close(); + String connectionUrl = getVirtualHostConnectionUrl(); - @SuppressWarnings("unchecked") Map<String, Object> statistics = getConnectionStatistics(connectionUrl); + + Map<String, Object> statistics = getConnectionStatistics(connectionUrl); assertTrue("Unexpected value of connection statistics attribute bytesIn", Long.parseLong(String.valueOf(statistics.get("bytesIn"))) > 0); assertTrue("Unexpected value of connection statistics attribute bytesOut", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
