1 files changed, 0 insertions, 162 deletions
diff --git a/systests/src/org/apache/qpid/server/queue/DeliveryManagerTest.java b/systests/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
deleted file mode 100644
index a6739223b0..0000000000
--- a/systests/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-import org.junit.runners.Suite;
-import org.junit.runner.RunWith;
-import org.apache.qpid.server.handler.OnCurrentThreadExecutor;
-import org.apache.qpid.AMQException;
-import junit.framework.JUnit4TestAdapter;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        ConcurrentDeliveryManagerTest.class,
-        SynchronizedDeliveryManagerTest.class})
-
-abstract public class DeliveryManagerTest extends MessageTestHelper
-{
-    protected final SubscriptionSet _subscriptions = new SubscriptionSet();
-    protected DeliveryManager _mgr;
-
-    public DeliveryManagerTest() throws Exception
-    {
-    }
-
-
-    @Test
-    public void startInQueueingMode() throws AMQException
-    {
-        AMQMessage[] messages = new AMQMessage[10];
-        for (int i = 0; i < messages.length; i++)
-        {
-            messages[i] = message();
-        }
-        int batch = messages.length / 2;
-
-        for (int i = 0; i < batch; i++)
-        {
-            _mgr.deliver("Me", messages[i]);
-        }
-
-        TestSubscription s1 = new TestSubscription("1");
-        TestSubscription s2 = new TestSubscription("2");
-        _subscriptions.addSubscriber(s1);
-        _subscriptions.addSubscriber(s2);
-
-        for (int i = batch; i < messages.length; i++)
-        {
-            _mgr.deliver("Me", messages[i]);
-        }
-
-        assertTrue(s1.getMessages().isEmpty());
-        assertTrue(s2.getMessages().isEmpty());
-
-        _mgr.processAsync(new OnCurrentThreadExecutor());
-
-        assertEquals(messages.length / 2, s1.getMessages().size());
-        assertEquals(messages.length / 2, s2.getMessages().size());
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            if (i % 2 == 0)
-            {
-                assertTrue(s1.getMessages().get(i / 2) == messages[i]);
-            }
-            else
-            {
-                assertTrue(s2.getMessages().get(i / 2) == messages[i]);
-            }
-        }
-    }
-
-    @Test
-    public void startInDirectMode() throws AMQException
-    {
-        AMQMessage[] messages = new AMQMessage[10];
-        for (int i = 0; i < messages.length; i++)
-        {
-            messages[i] = message();
-        }
-        int batch = messages.length / 2;
-
-        TestSubscription s1 = new TestSubscription("1");
-        _subscriptions.addSubscriber(s1);
-
-        for (int i = 0; i < batch; i++)
-        {
-            _mgr.deliver("Me", messages[i]);
-        }
-
-        assertEquals(batch, s1.getMessages().size());
-        for (int i = 0; i < batch; i++)
-        {
-            assertTrue(messages[i] == s1.getMessages().get(i));
-        }
-        s1.getMessages().clear();
-        assertEquals(0, s1.getMessages().size());
-
-        s1.setSuspended(true);
-        for (int i = batch; i < messages.length; i++)
-        {
-            _mgr.deliver("Me", messages[i]);
-        }
-
-        _mgr.processAsync(new OnCurrentThreadExecutor());
-        assertEquals(0, s1.getMessages().size());
-        s1.setSuspended(false);
-
-        _mgr.processAsync(new OnCurrentThreadExecutor());
-        assertEquals(messages.length - batch, s1.getMessages().size());
-
-        for (int i = batch; i < messages.length; i++)
-        {
-            assertTrue(messages[i] == s1.getMessages().get(i - batch));
-        }
-
-    }
-
-    @Test(expected = NoConsumersException.class)
-    public void noConsumers() throws AMQException
-    {
-        AMQMessage msg = message(true);
-        _mgr.deliver("Me", msg);
-        msg.checkDeliveredToConsumer();
-    }
-
-    @Test(expected = NoConsumersException.class)
-    public void noActiveConsumers() throws AMQException
-    {
-        TestSubscription s = new TestSubscription("A");
-        _subscriptions.addSubscriber(s);
-        s.setSuspended(true);
-        AMQMessage msg = message(true);
-        _mgr.deliver("Me", msg);
-        msg.checkDeliveredToConsumer();
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new JUnit4TestAdapter(DeliveryManagerTest.class);
-    }
-}