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

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

Author: timfox
Date: 2007-05-03 12:45:28 -0400 (Thu, 03 May 2007)
New Revision: 2631

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java
Log:
Moved test to ExpiryQueueTest


Modified: trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java	2007-05-03 04:34:08 UTC (rev 2630)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ExpiryQueueTest.java	2007-05-03 16:45:28 UTC (rev 2631)
@@ -622,7 +622,60 @@
          if (conn != null) conn.close();
       }
    }
+   
+   public void testExpirationTransfer() throws Exception
+   {
 
+      ServerManagement.deployQueue("expiredTarget");
+
+      Object originalValue = ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue");
+
+      ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue", "jboss.messaging.destination:service=Queue,name=expiredTarget");
+
+      try
+      {
+
+         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
+         Queue queue = (Queue)ic.lookup("/queue/expiredMessageTestQueue");
+
+         Connection conn = cf.createConnection();
+
+         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+         MessageConsumer cons = session.createConsumer(queue);
+
+         conn.start();
+
+         MessageProducer prod = session.createProducer(queue);
+         prod.setTimeToLive(100);
+
+         Message m = session.createTextMessage("This message will die");
+
+         prod.send(m);
+
+         assertNull(cons.receive(3000));
+
+         // wait for the message to die
+
+         Thread.sleep(2000);
+
+         MessageConsumer consumerExpiredQueue = session.createConsumer(queue);
+
+         TextMessage txt = (TextMessage) consumerExpiredQueue.receive(1000);
+
+         assertEquals("This message will die", txt.getText());
+
+         assertNull(consumerExpiredQueue.receive(1000));
+      }
+      finally
+      {
+         ServerManagement.destroyQueue("expiredSource");
+         ServerManagement.destroyQueue("expiredTarget");
+         ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue", originalValue.toString());
+      }
+
+   }
+
       
    // Package protected ---------------------------------------------
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java	2007-05-03 04:34:08 UTC (rev 2630)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java	2007-05-03 16:45:28 UTC (rev 2631)
@@ -76,61 +76,8 @@
       assertNull(cons.receive(3000));
    }
 
-   public void testExpirationTransfer() throws Exception
-   {
+  
 
-      ServerManagement.deployQueue("expiredTarget");
-
-      Object originalValue = ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue");
-
-      ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue", "jboss.messaging.destination:service=Queue,name=expiredTarget");
-
-      try
-      {
-
-         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
-         Queue queue = (Queue)ic.lookup("/queue/expiredMessageTestQueue");
-
-         Connection conn = cf.createConnection();
-
-         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         MessageConsumer cons = session.createConsumer(queue);
-
-         conn.start();
-
-         MessageProducer prod = session.createProducer(queue);
-         prod.setTimeToLive(100);
-
-         Message m = session.createTextMessage("This message will die");
-
-         prod.send(m);
-
-         assertNull(cons.receive(3000));
-
-         // wait for the message to die
-
-         Thread.sleep(2000);
-
-         Queue queueExpiryQueue = (Queue)ic.lookup("/queue/expiredTarget");
-
-         MessageConsumer consumerExpiredQueue = session.createConsumer(queue);
-
-         TextMessage txt = (TextMessage) consumerExpiredQueue.receive(1000);
-
-         assertEquals("This message will die", txt.getText());
-
-         assertNull(consumerExpiredQueue.receive(1000));
-      }
-      finally
-      {
-         ServerManagement.destroyQueue("expiredSource");
-         ServerManagement.destroyQueue("expiredTarget");
-         ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "DefaultExpiryQueue", originalValue.toString());
-      }
-
-   }
-
    // Package protected ----------------------------------------------------------------------------
 
    // Protected ------------------------------------------------------------------------------------