[jboss-cvs] JBossAS SVN: r82762 - projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit.

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

Author: wolfc
Date: 2009-01-12 05:01:22 -0500 (Mon, 12 Jan 2009)
New Revision: 82762

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
EJBTHREE-1679: removed testExpiredMessagesMove

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2009-01-12 09:33:36 UTC (rev 82761)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2009-01-12 10:01:22 UTC (rev 82762)
@@ -50,8 +50,6 @@
 import org.jboss.ejb3.test.mdb.Stateless;
 import org.jboss.ejb3.test.mdb.TestStatus;
 import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
 import org.jboss.security.client.SecurityClient;
 import org.jboss.security.client.SecurityClientFactory;
 import org.jboss.test.JBossTestCase;
@@ -359,64 +357,6 @@
       assertEquals(1, status.cmtQueueRan());
    }
 
-   /**
-    * Test that expired messages are moved to a separate queue.
-    */
-   public void testExpiredMessagesMove() throws Exception
-   {
-      QueueConnection connection = null;
-      QueueSender sender = null;
-      QueueSession session = null;
-
-      QueueConnectionFactory factory = getQueueConnectionFactory();
-      connection = factory.createQueueConnection();
-      connection.start();
-      session = connection.createQueueSession(false,
-            QueueSession.AUTO_ACKNOWLEDGE);
-
-      Queue queue = (Queue) getInitialContext().lookup("queue/expirytest");
-      sender = session.createSender(queue);
-
-      Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
-
-      removeAllMessagesFromDLQ();
-
-      long now = System.currentTimeMillis();
-
-      TextMessage message = session.createTextMessage();
-      message.setStringProperty("foo", "bar");
-      message.setStringProperty("null", null);
-      String text = "expire on server";
-      message.setText(text);
-      
-      sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 1);
-
-      Thread.sleep(1000 * 5);
-
-      assertSize(session, queue, 0);
-      
-      /* TODO: await implementation of JBMESSAGING-126
-      assertSize(session, dlq, 1);
-
-      QueueReceiver receiver = session.createReceiver(dlq);
-      message = (TextMessage) receiver.receiveNoWait();
-      assertNotNull(message);
-      assertEquals("QUEUE.expirytest", message
-            .getStringProperty("JBOSS_ORIG_DESTINATION"));
-      assertTrue(message.getLongProperty("JBOSS_ORIG_EXPIRATION") > now);
-      assertEquals(0L, message.getJMSExpiration());
-      assertEquals(text, message.getText());
-      assertEquals("bar", message.getStringProperty("foo"));
-      assertNull(message.getStringProperty("null"));
-      
-      receiver.close();
-       */
-      sender.close();
-      
-      session.close();
-      connection.close();
-   }
-
    public void testDlqMaxResent() throws Exception
    {
       QueueConnection connection = null;