1 files changed, 1 insertions, 176 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/TransientMessageTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/TransientMessageTest.java
index 16d1ab60f3..6fd153f398 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/TransientMessageTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/TransientMessageTest.java
@@ -287,180 +287,5 @@ public class TransientMessageTest extends TestCase
         assertFalse(_message.isPersistent());
     }
 
-    public void testImmediateAndNotDelivered()
-    {
-        _message = newMessage();
-
-        MessagePublishInfo mpi = new MessagePublishInfoImpl(null, true, false, null);
-        int bodySize = 0;
-
-        BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-
-        props.setAppId("HandleTest");
-
-        ContentHeaderBody chb = new ContentHeaderBody(0, 0, props, bodySize);
-
-        try
-        {
-            _message.setPublishAndContentHeaderBody(_storeContext, mpi, chb);
-
-            assertTrue("Undelivered Immediate message should still be marked as so", _message.immediateAndNotDelivered());
-
-            assertFalse("Undelivered Message should not say it is delivered.", _message.getDeliveredToConsumer());
-
-            _message.setDeliveredToConsumer();
-
-            assertTrue("Delivered Message should say it is delivered.", _message.getDeliveredToConsumer());
-
-            assertFalse("Delivered Immediate message now be marked as so", _message.immediateAndNotDelivered());
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
-    }
-
-    public void testNotImmediateAndNotDelivered()
-    {
-        _message = newMessage();
-
-        MessagePublishInfo mpi = new MessagePublishInfoImpl(null, false, false, null);
-        int bodySize = 0;
-
-        BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-
-        props.setAppId("HandleTest");
-
-        ContentHeaderBody chb = new ContentHeaderBody(0, 0, props, bodySize);
-
-        try
-        {
-            _message.setPublishAndContentHeaderBody(_storeContext, mpi, chb);
-
-            assertFalse("Undelivered Non-Immediate message should not result in true.", _message.immediateAndNotDelivered());
-
-            assertFalse("Undelivered Message should not say it is delivered.", _message.getDeliveredToConsumer());
-
-            _message.setDeliveredToConsumer();
-
-            assertTrue("Delivered Message should say it is delivered.", _message.getDeliveredToConsumer());
-
-            assertFalse("Delivered Non-Immediate message not change this return", _message.immediateAndNotDelivered());
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
-    }
-
-    public void testExpiry()
-    {
-        _message = newMessage();
-
-        MessagePublishInfo mpi = new MessagePublishInfoImpl(null, false, false, null);
-        int bodySize = 0;
-
-        BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-
-        props.setAppId("HandleTest");
-
-        ContentHeaderBody chb = new ContentHeaderBody(0, 0, props, bodySize);
-
-        ReentrantLock waitLock = new ReentrantLock();
-        Condition wait = waitLock.newCondition();
-        try
-        {
-            _message.setExpiration(System.currentTimeMillis() + 10L);
-
-            _message.setPublishAndContentHeaderBody(_storeContext, mpi, chb);
-
-            assertFalse("New messages should not be expired.", _message.expired());
-
-            final long MILLIS =1000000L;
-            long waitTime = 20 * MILLIS;
-
-            while (waitTime > 0)
-            {
-                try
-                {
-                    waitLock.lock();
-
-                    waitTime = wait.awaitNanos(waitTime);
-                }
-                catch (InterruptedException e)
-                {
-                    //Stop if we are interrupted
-                    fail(e.getMessage());
-                }
-                finally
-                {
-                    waitLock.unlock();
-                }
-
-            }
-
-            assertTrue("After a sleep messages should now be expired.", _message.expired());
-
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
-    }
-
-
-        public void testNoExpiry()
-    {
-        _message = newMessage();
-
-        MessagePublishInfo mpi = new MessagePublishInfoImpl(null, false, false, null);
-        int bodySize = 0;
-
-        BasicContentHeaderProperties props = new BasicContentHeaderProperties();
-
-        props.setAppId("HandleTest");
-
-        ContentHeaderBody chb = new ContentHeaderBody(0, 0, props, bodySize);
-
-        ReentrantLock waitLock = new ReentrantLock();
-        Condition wait = waitLock.newCondition();
-        try
-        {
-
-            _message.setPublishAndContentHeaderBody(_storeContext, mpi, chb);
-
-            assertFalse("New messages should not be expired.", _message.expired());
-
-            final long MILLIS =1000000L;
-            long waitTime = 10 * MILLIS;
-
-            while (waitTime > 0)
-            {
-                try
-                {
-                    waitLock.lock();
-
-                    waitTime = wait.awaitNanos(waitTime);
-                }
-                catch (InterruptedException e)
-                {
-                    //Stop if we are interrupted
-                    fail(e.getMessage());
-                }
-                finally
-                {
-                    waitLock.unlock();
-                }
-
-            }
-
-            assertFalse("After a sleep messages without an expiry should not expire.", _message.expired());
-
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
-    }
-
+ 
 }