[jboss-cvs] JBoss Messaging SVN: r5888 - in trunk/tests/jms-tests/src/org/jboss/test/messaging/jms: message and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2009-02-17 23:13:16 -0500 (Tue, 17 Feb 2009)
New Revision: 5888

Modified:
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
Log:
JBMESSAGING-1339 and JBMESSAGING-1294 - Fixing tests after behaviour changes on DeliveryCounters

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	2009-02-18 02:07:44 UTC (rev 5887)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2009-02-18 04:13:16 UTC (rev 5888)
@@ -518,11 +518,14 @@
          assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
 
          log.info("rolling back");
+         conn.stop();
          sess.rollback();
          
          log.info("closing");
          sess.close();
          log.info("Closed");
+         
+         conn.start();
 
          Session sess2 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java	2009-02-18 02:07:44 UTC (rev 5887)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java	2009-02-18 04:13:16 UTC (rev 5888)
@@ -164,26 +164,26 @@
          tm = (TextMessage)c.receive(1000);
          
          assertEquals("message2", tm.getText());
-	      assertFalse(tm.getJMSRedelivered());
-         assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+	      assertTrue(tm.getJMSRedelivered());
+         assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
          
          tm = (TextMessage)c.receive(1000);
          
          assertEquals("message3", tm.getText());
-	      assertFalse(tm.getJMSRedelivered());
-         assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+	      assertTrue(tm.getJMSRedelivered());
+         assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
          
          tm = (TextMessage)c.receive(1000);
          
          assertEquals("message4", tm.getText());
-	      assertFalse(tm.getJMSRedelivered());
-         assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+	      assertTrue(tm.getJMSRedelivered());
+         assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
          
          tm = (TextMessage)c.receive(1000);
          
          assertEquals("message5", tm.getText());
-	      assertFalse(tm.getJMSRedelivered());
-         assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+	      assertTrue(tm.getJMSRedelivered());
+         assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
          
 	      tm.acknowledge();
       }
@@ -633,7 +633,7 @@
          
          assertEquals(tm.getText(), rm.getText());
          
-         assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
+         assertEquals(5, rm.getIntProperty("JMSXDeliveryCount"));
          
          assertTrue(rm.getJMSRedelivered());