[Jboss-cvs] JBoss Messaging SVN: r1351 - branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-22 15:39:30 -0400 (Fri, 22 Sep 2006)
New Revision: 1351

Modified:
   branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
Log:
removed semantically invalid test

Modified: branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2006-09-22 19:38:17 UTC (rev 1350)
+++ branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2006-09-22 19:39:30 UTC (rev 1351)
@@ -29,6 +29,7 @@
 import javax.jms.MessageProducer;
 import javax.jms.Message;
 import javax.jms.TextMessage;
+import javax.management.ObjectName;
 
 import org.jboss.jms.client.JBossConnectionFactory;
 import org.jboss.test.messaging.MessagingTestCase;
@@ -94,6 +95,42 @@
    
    
    // Public --------------------------------------------------------
+
+
+   public void testSimpleRollback() throws Exception
+   {
+      // send a message
+      Connection conn = cf.createConnection();
+      Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+      s.createProducer(queue).send(s.createTextMessage("one"));
+
+      log.debug("message sent");
+
+      s.close();
+
+      s = conn.createSession(true, Session.SESSION_TRANSACTED);
+      MessageConsumer c = s.createConsumer(queue);
+      conn.start();
+      Message m = c.receive();
+
+      assertEquals("one", ((TextMessage)m).getText());
+      assertFalse(m.getJMSRedelivered());
+      assertEquals(1, m.getIntProperty("JMSXDeliveryCount"));
+
+      s.rollback();
+
+      // get the message again
+      m = c.receive();
+      assertTrue(m.getJMSRedelivered());
+      assertEquals(2, m.getIntProperty("JMSXDeliveryCount"));
+
+      conn.close();
+
+      ObjectName on = new ObjectName("jboss.messaging.destination:service=Queue,name=Queue");
+      Integer i = (Integer)ServerManagement.getAttribute(on, "MessageCount");
+
+      assertEquals(1, i.intValue());
+   }
    
    public void testRedeliveredFlagTopic() throws Exception
    {
@@ -537,7 +574,9 @@
          TextMessage tm = (TextMessage)cons.receive();
 
          assertEquals("a message", tm.getText());
+
          assertFalse(tm.getJMSRedelivered());
+         assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
 
          sess.rollback();
          sess.close();
@@ -549,63 +588,9 @@
          tm = (TextMessage)cons.receive();
 
          assertEquals("a message", tm.getText());
-         assertTrue(tm.getJMSRedelivered());
-      }
-      finally
-      {
-         if (conn != null)
-         {
-            conn.close();
-         }
-      }
-   }
 
-   /**
-    * Make sure redelivered flag is set on redelivery via rollback, different setup: we don't close
-    * the rolled back session and we receive the message whose acknowledgment was cancelled on a new
-    * session.
-    *
-    * TODO: Is this test semantically correct.
-    */
-   public void testRedeliveredQueue3() throws Exception
-   {
-      Connection conn = null;
-
-      try
-      {
-         conn = cf.createConnection();
-
-         Session sendSession = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         MessageProducer prod = sendSession.createProducer(queue);
-         prod.send(sendSession.createTextMessage("a message"));
-
-         log.debug("Message was sent to the queue");
-
-         conn.close();
-
-         conn = cf.createConnection();
-         Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
-
-         MessageConsumer cons = sess.createConsumer(queue);
-
-         conn.start();
-
-         TextMessage tm = (TextMessage)cons.receive();
-
-         assertEquals("a message", tm.getText());
-         assertFalse(tm.getJMSRedelivered());
-
-         sess.rollback();
-
-         Session sess2 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         cons = sess2.createConsumer(queue);
-
-         tm = (TextMessage)cons.receive(3000);
-
-         assertEquals("a message", tm.getText());
          assertTrue(tm.getJMSRedelivered());
+         assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
       }
       finally
       {
@@ -616,7 +601,6 @@
       }
    }
 
-
    public void testReceivedRollbackQueue() throws Exception
    {
       Connection conn = cf.createConnection();