summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-05-31 13:11:55 +0000
committerRobert Gemmell <robbie@apache.org>2010-05-31 13:11:55 +0000
commit7f957dec3739f454e85c4d7df90c092ff893d487 (patch)
tree200f907fd25a6d9a50f6fe0818d8d626abaaff8a /java
parent947b1491d7a39c87c4560126a6e50646aa2a2b24 (diff)
downloadqpid-python-7f957dec3739f454e85c4d7df90c092ff893d487.tar.gz
Make PersistentStoreTest.testForcibleStartStopMidTransaction() do a syncchronous op before killing the broker to ensure all the additional messages reach the broker before it is killed. Update message numbering to be based from 1 to aid log clarity.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@949735 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java b/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
index 65127e50ec..e1941d4629 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
@@ -21,6 +21,7 @@
package org.apache.qpid.server.store;
+import org.apache.qpid.client.AMQSession;
import org.apache.qpid.test.utils.QpidTestCase;
import javax.jms.Connection;
@@ -64,7 +65,7 @@ public class PersistentStoreTest extends QpidTestCase
_session = _con.createSession(false, Session.AUTO_ACKNOWLEDGE);
_con.start();
_consumer = _session.createConsumer(_destination);
- for (int i = 0; i < NUM_MESSAGES; i++)
+ for (int i = 1; i <= NUM_MESSAGES; i++)
{
Message msg = _consumer.receive(RECEIVE_TIMEOUT);
assertNotNull("Message " + i + " not received", msg);
@@ -118,6 +119,7 @@ public class PersistentStoreTest extends QpidTestCase
public void testForcibleStartStopMidTransaction() throws Exception
{
sendMessage(_session, _destination, 5);
+ ((AMQSession) _session).sync();
restartBroker();
checkMessages();
}
@@ -168,7 +170,7 @@ public class PersistentStoreTest extends QpidTestCase
MessageProducer producer = session.createProducer(destination);
- for (int i = 0;i < (count); i++)
+ for (int i = 1;i <= (count); i++)
{
Message next = createNextMessage(session, i);