diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java | 3 | ||||
| -rw-r--r-- | java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java | 22 |
2 files changed, 9 insertions, 16 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java index 737e7aa6a7..b09d0456a6 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java @@ -116,7 +116,7 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase { producerConnection.start(); - Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Session producerSession = producerConnection.createSession(true, Session.AUTO_ACKNOWLEDGE); //Ensure _queue is created producerSession.createConsumer(_queue).close(); @@ -129,6 +129,7 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase textMsg.setIntProperty(MESSAGE_ID_PROPERTY, messsageID); producer.send(textMsg); } + producerSession.commit(); producerConnection.close(); } diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java index a05e5bb042..c367a0856c 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java @@ -57,22 +57,12 @@ public class AcknowledgeTest extends QpidTestCase } private void init(boolean transacted, int mode) throws JMSException { - _producerSession = _con.createSession(false, Session.AUTO_ACKNOWLEDGE); + _producerSession = _con.createSession(true, Session.AUTO_ACKNOWLEDGE); _consumerSession = _con.createSession(transacted, mode); _producer = _producerSession.createProducer(_queue); _consumerA = _consumerSession.createConsumer(_queue); } - - - private void sendMessages(int totalMessages) throws JMSException - { - for (int i = 0; i < totalMessages; i++) - { - _producer.send(_producerSession.createTextMessage("message " + i)); - } - } - /** * Produces and consumes messages an either ack or commit the receipt of those messages * @@ -83,10 +73,11 @@ public class AcknowledgeTest extends QpidTestCase private void testMessageAck(boolean transacted, int mode) throws Exception { init(transacted, mode); - sendMessages(NUM_MESSAGES/2); - Thread.sleep(1500); + sendMessage(_producerSession, _queue, NUM_MESSAGES/2); + _producerSession.commit(); MessageConsumer consumerB = _consumerSession.createConsumer(_queue); - sendMessages(NUM_MESSAGES/2); + sendMessage(_producerSession, _queue, NUM_MESSAGES/2); + _producerSession.commit(); int count = 0; Message msg = consumerB.receive(1500); while (msg != null) @@ -146,7 +137,8 @@ public class AcknowledgeTest extends QpidTestCase public void testIndividualAck() throws Exception { init(false, Session.CLIENT_ACKNOWLEDGE); - sendMessages(3); + sendMessage(_producerSession, _queue, 3); + _producerSession.commit(); Message msg = null; for (int i = 0; i < 2; i++) { |