Author: aidan
Date: Mon Jun 22 14:39:08 2009
New Revision: 787250
URL: http://svn.apache.org/viewvc?rev=787250&view=rev
Log:
QPID-1914: make send() transacted so we know the messages got there.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=787250&r1=787249&r2=787250&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
Mon Jun 22 14:39:08 2009
@@ -116,7 +116,7 @@
{
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 @@
textMsg.setIntProperty(MESSAGE_ID_PROPERTY, messsageID);
producer.send(textMsg);
}
+ producerSession.commit();
producerConnection.close();
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=787250&r1=787249&r2=787250&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
Mon Jun 22 14:39:08 2009
@@ -57,22 +57,12 @@
}
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 @@
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 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++)
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
