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

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

Author: clebert.suconic at jboss.com
Date: 2007-05-03 13:29:32 -0400 (Thu, 03 May 2007)
New Revision: 2632

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-951 - fixing test

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java	2007-05-03 16:45:28 UTC (rev 2631)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java	2007-05-03 17:29:32 UTC (rev 2632)
@@ -627,23 +627,25 @@
    {
 
       ServerManagement.deployQueue("expiredTarget");
+      ServerManagement.deployQueue("expiredMessageTestQueue");
 
+
       Object originalValue = ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue");
 
       ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue", "jboss.messaging.destination:service=Queue,name=expiredTarget");
 
+      Connection conn = null;
+
       try
       {
 
          ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
          Queue queue = (Queue)ic.lookup("/queue/expiredMessageTestQueue");
 
-         Connection conn = cf.createConnection();
+         conn = cf.createConnection();
 
          Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-         MessageConsumer cons = session.createConsumer(queue);
-
          conn.start();
 
          MessageProducer prod = session.createProducer(queue);
@@ -653,14 +655,17 @@
 
          prod.send(m);
 
+         // wait for the message to die
+         Thread.sleep(2000);
+
+         MessageConsumer cons = session.createConsumer(queue);
+
          assertNull(cons.receive(3000));
 
-         // wait for the message to die
+         Queue queueExpiryQueue = (Queue)ic.lookup("/queue/expiredTarget");
 
-         Thread.sleep(2000);
+         MessageConsumer consumerExpiredQueue = session.createConsumer(queueExpiryQueue);
 
-         MessageConsumer consumerExpiredQueue = session.createConsumer(queue);
-
          TextMessage txt = (TextMessage) consumerExpiredQueue.receive(1000);
 
          assertEquals("This message will die", txt.getText());
@@ -669,11 +674,14 @@
       }
       finally
       {
-         ServerManagement.destroyQueue("expiredSource");
+         if (conn != null)
+         {
+            conn.close();
+         }
          ServerManagement.destroyQueue("expiredTarget");
+         ServerManagement.destroyQueue("expiredMessageTestQueue");
          ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue", originalValue.toString());
       }
-
    }