[jboss-cvs] JBoss Messaging SVN: r5096 - trunk/tests/src/org/jboss/messaging/tests/integration/scheduling.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2008-10-09 11:27:10 -0400 (Thu, 09 Oct 2008)
New Revision: 5096

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
Log:
fixed test

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java	2008-10-09 11:48:21 UTC (rev 5095)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java	2008-10-09 15:27:10 UTC (rev 5096)
@@ -605,6 +605,7 @@
    public void testTxMessageDeliveredCorrectly(boolean recover) throws Exception
    {
       Xid xid = new XidImpl("xa1".getBytes(), 1, new GUID().toString().getBytes());
+      Xid xid2 = new XidImpl("xa2".getBytes(), 1, new GUID().toString().getBytes());
       TransportConfiguration transportConfig = new TransportConfiguration(ACCEPTOR_FACTORY);
       configuration.getAcceptorConfigurations().add(transportConfig);
       messagingService = MessagingServiceImpl.newNioStorageMessagingServer(configuration, journalDir, bindingsDir);
@@ -646,12 +647,16 @@
       ClientConsumer consumer = session.createConsumer(atestq);
 
       session.start();
-
+      session.start(xid2, XAResource.TMNOFLAGS);
       ClientMessage message2 = consumer.receive(10000);
       assertTrue(System.currentTimeMillis() >= cal.getTimeInMillis());
+      assertNotNull(message2);
       assertEquals("testINVMCoreClient", message2.getBody().getString());
 
       message2.processed();
+      session.end(xid2, XAResource.TMSUCCESS);
+      session.prepare(xid2);
+      session.commit(xid2, true);
       consumer.close();
       // Make sure no more messages
       consumer = session.createConsumer(atestq);