[jboss-cvs] JBoss Messaging SVN: r4256 - trunk/tests/jms-tests/src/org/jboss/test/messaging/jms.

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

Author: clebert.suconic at jboss.com
Date: 2008-05-20 19:43:19 -0400 (Tue, 20 May 2008)
New Revision: 4256

Modified:
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
Log:
Some of these tests were hanging. .receive was failing because of some weirdness and the whole testsuite hanged instead of just failures. 

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2008-05-20 15:53:05 UTC (rev 4255)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2008-05-20 23:43:19 UTC (rev 4256)
@@ -68,7 +68,8 @@
 	      s = conn.createSession(true, Session.SESSION_TRANSACTED);
 	      MessageConsumer c = s.createConsumer(queue1);
 	      conn.start();
-	      Message m = c.receive();
+	      Message m = c.receive(1000);
+	      assertNotNull(m);
 
 	      assertEquals("one", ((TextMessage)m).getText());
 	      assertFalse(m.getJMSRedelivered());
@@ -77,7 +78,9 @@
 	      s.rollback();
 
 	      // get the message again
-	      m = c.receive();
+	      m = c.receive(1000);
+	      assertNotNull(m);
+	      
 	      assertTrue(m.getJMSRedelivered());
 	      assertEquals(2, m.getIntProperty("JMSXDeliveryCount"));
 
@@ -118,6 +121,8 @@
          conn.start();
 
          TextMessage mRec1 = (TextMessage)consumer1.receive(2000);
+         assertNotNull(mRec1);
+         
          assertEquals("igloo", mRec1.getText());
          assertFalse(mRec1.getJMSRedelivered());
 
@@ -504,7 +509,8 @@
 
          conn.start();
 
-         TextMessage tm = (TextMessage)cons.receive();
+         TextMessage tm = (TextMessage)cons.receive(1000);
+         assertNotNull(tm);
 
          assertEquals("a message", tm.getText());
 
@@ -556,7 +562,8 @@
 
       sess.commit();
 
-      TextMessage mRec = (TextMessage)consumer.receive();
+      TextMessage mRec = (TextMessage)consumer.receive(1000);
+      assertNotNull(mRec);
       log.trace("Got 1");
       assertNotNull(mRec);
       assertEquals("igloo", mRec.getText());
@@ -569,14 +576,16 @@
       sess.commit();
 
       log.trace("Receiving 2");
-      mRec = (TextMessage)consumer.receive();
+      mRec = (TextMessage)consumer.receive(1000);
+      assertNotNull(mRec);
+      
       log.trace("Received 2");
       assertNotNull(mRec);
       assertEquals("rollback", mRec.getText());
 
       sess.rollback();
 
-      TextMessage mRec2 = (TextMessage)consumer.receive();
+      TextMessage mRec2 = (TextMessage)consumer.receive(1000);
       assertNotNull(mRec2);
       assertEquals("rollback", mRec2.getText());