You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2006/11/24 13:00:23 UTC

svn commit: r478846 [2/2] - in /incubator/qpid/branches/new_persistence/java/systests/src/test: ./ java/ java/org/ java/org/apache/ java/org/apache/qpid/ java/org/apache/qpid/server/ java/org/apache/qpid/server/ack/ java/org/apache/qpid/server/exchange...

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,49 @@
+/*
+ *
+ * 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 org.apache.qpid.server.util.AveragedRun;
+import org.apache.qpid.server.util.ConcurrentTest;
+
+public class QueueConcurrentPerfTest extends QueuePerfTest
+{
+    QueueConcurrentPerfTest(Factory factory, int queueCount, int messages)
+    {
+        super(factory, queueCount, messages);
+    }
+
+    public static void main(String[] argv) throws Exception
+    {
+        Factory[] factories = new Factory[]{SYNCHRONIZED, CONCURRENT};
+        int iterations = 5;
+        String label = argv.length > 0 ? argv[0]: null;
+        System.out.println((label == null ? "" : "Label, ") + "Queue Type, No. of Queues, No. of Operations, Avg Time, Min Time, Max Time");
+        //vary number of queues:
+        for(Factory f : factories)
+        {
+            run(label, new AveragedRun(new ConcurrentTest(new QueuePerfTest(f, 100, 10000), iterations), 5));
+            run(label, new AveragedRun(new ConcurrentTest(new QueuePerfTest(f, 1000, 10000), iterations), 5));
+            run(label, new AveragedRun(new ConcurrentTest(new QueuePerfTest(f, 10000, 10000), iterations), 5));
+            run(label, new AveragedRun(new ConcurrentTest(new QueuePerfTest(f, 1000, 1000), iterations), 5));
+            run(label, new AveragedRun(new ConcurrentTest(new QueuePerfTest(f, 1000, 100000), iterations), 5));
+        }
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,258 @@
+/*
+ *
+ * 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 org.apache.qpid.server.util.AveragedRun;
+import org.apache.qpid.server.util.TimedRun;
+import org.apache.qpid.server.util.RunStats;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+public class QueuePerfTest extends TimedRun
+{
+    private final Factory _factory;
+    private final int _queueCount;
+    private final int _messages;
+    private final String _msg = "";
+    private List<Queue<String>> _queues;
+
+    QueuePerfTest(Factory factory, int queueCount, int messages)
+    {
+        super(factory + ", " + queueCount + ", " + messages);
+        _factory = factory;
+        _queueCount = queueCount;
+        _messages = messages;
+    }
+
+    protected void setup() throws Exception
+    {
+        //init
+        int count = Integer.getInteger("prepopulate", 0);
+//        System.err.println("Prepopulating with " + count + " items");
+        _queues = new ArrayList<Queue<String>>(_queueCount);
+        for (int i = 0; i < _queueCount; i++)
+        {
+            Queue<String> q = _factory.create();
+            for(int j = 0; j < count; ++j)
+            {
+                q.add("Item"+ j);
+            }
+            _queues.add(q);
+        }
+        System.gc();
+    }
+
+    protected void teardown() throws Exception
+    {
+        System.gc();
+    }
+
+    protected void run() throws Exception
+    {
+        //dispatch
+        for (int i = 0; i < _messages; i++)
+        {
+            for (Queue<String> q : _queues)
+            {
+                q.offer(_msg);
+                q.poll();
+            }
+        }
+    }
+
+    static interface Factory
+    {
+        Queue<String> create();
+    }
+
+    static Factory CONCURRENT = new Factory()
+    {
+        public Queue<String> create()
+        {
+            return new ConcurrentLinkedQueue<String>();
+        }
+
+        public String toString()
+        {
+            return "ConcurrentLinkedQueue";
+        }
+
+    };
+
+    static Factory SYNCHRONIZED = new Factory()
+    {
+        public Queue<String> create()
+        {
+            return new SynchronizedQueue<String>(new LinkedList<String>());
+        }
+
+
+        public String toString()
+        {
+            return "Synchronized LinkedList";
+        }
+    };
+
+    static Factory PLAIN = new Factory()
+    {
+        public Queue<String> create()
+        {
+            return new LinkedList<String>();
+        }
+
+        public String toString()
+        {
+            return "Plain LinkedList";
+        }
+    };
+
+    static class SynchronizedQueue<E> implements Queue<E>
+    {
+        private final Queue<E> queue;
+
+        SynchronizedQueue(Queue<E> queue)
+        {
+            this.queue = queue;
+        }
+
+        public synchronized E element()
+        {
+            return queue.element();
+        }
+
+        public synchronized boolean offer(E o)
+        {
+            return queue.offer(o);
+        }
+
+        public synchronized E peek()
+        {
+            return queue.peek();
+        }
+
+        public synchronized E poll()
+        {
+            return queue.poll();
+        }
+
+        public synchronized E remove()
+        {
+            return queue.remove();
+        }
+
+        public synchronized int size()
+        {
+            return queue.size();
+        }
+
+        public synchronized boolean isEmpty()
+        {
+            return queue.isEmpty();
+        }
+
+        public synchronized boolean contains(Object o)
+        {
+            return queue.contains(o);
+        }
+
+        public synchronized Iterator<E> iterator()
+        {
+            return queue.iterator();
+        }
+
+        public synchronized Object[] toArray()
+        {
+            return queue.toArray();
+        }
+
+        public synchronized <T>T[] toArray(T[] a)
+        {
+            return queue.toArray(a);
+        }
+
+        public synchronized boolean add(E o)
+        {
+            return queue.add(o);
+        }
+
+        public synchronized boolean remove(Object o)
+        {
+            return queue.remove(o);
+        }
+
+        public synchronized boolean containsAll(Collection<?> c)
+        {
+            return queue.containsAll(c);
+        }
+
+        public synchronized boolean addAll(Collection<? extends E> c)
+        {
+            return queue.addAll(c);
+        }
+
+        public synchronized boolean removeAll(Collection<?> c)
+        {
+            return queue.removeAll(c);
+        }
+
+        public synchronized boolean retainAll(Collection<?> c)
+        {
+            return queue.retainAll(c);
+        }
+
+        public synchronized void clear()
+        {
+            queue.clear();
+        }
+    }
+
+    static void run(String label, AveragedRun test) throws Exception
+    {
+        RunStats stats = test.call();
+        System.out.println((label == null ? "" : label + ", ") + test
+                + ", " + stats.getAverage() + ", " + stats.getMax() + ", " + stats.getMin());
+    }
+
+    public static void main(String[] argv) throws Exception
+    {
+        Factory[] factories = new Factory[]{PLAIN, SYNCHRONIZED, CONCURRENT};
+        int iterations = 5;
+        String label = argv.length > 0 ? argv[0]: null;
+        System.out.println((label == null ? "" : "Label, ") + "Queue Type, No. of Queues, No. of Operations, Avg Time, Min Time, Max Time");
+        //vary number of queues:
+
+        for(Factory f : factories)
+        {
+            run(label, new AveragedRun(new QueuePerfTest(f, 100, 10000), iterations));
+            run(label, new AveragedRun(new QueuePerfTest(f, 1000, 10000), iterations));
+            run(label, new AveragedRun(new QueuePerfTest(f, 10000, 10000), iterations));
+            run(label, new AveragedRun(new QueuePerfTest(f, 1000, 1000), iterations));
+            run(label, new AveragedRun(new QueuePerfTest(f, 1000, 100000), iterations));
+        }
+    }
+
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,174 @@
+/*
+ *
+ * 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 org.apache.qpid.AMQException;
+import org.apache.qpid.codec.AMQCodecFactory;
+import org.apache.qpid.framing.BasicPublishBody;
+import org.apache.qpid.framing.ContentBody;
+import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.exchange.AbstractExchange;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.handler.OnCurrentThreadExecutor;
+import org.apache.qpid.server.protocol.AMQMinaProtocolSession;
+import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.protocol.MockIoSession;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.SkeletonMessageStore;
+import org.apache.qpid.server.util.AveragedRun;
+import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.server.util.TimedRun;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SendPerfTest extends TimedRun
+{
+    private int _messages = 1000;
+    private int _clients = 10;
+    private List<AMQQueue> _queues;
+
+    public SendPerfTest(int clients, int messages)
+    {
+        super("SendPerfTest, msgs=" + messages + ", clients=" + clients);
+        _messages = messages;
+        _clients = clients;
+    }
+
+    protected void setup() throws Exception
+    {
+        _queues = initQueues(_clients);
+        System.gc();
+    }
+
+    protected void teardown() throws Exception
+    {
+        System.gc();
+    }
+
+    protected void run() throws Exception
+    {
+        deliver(_messages, _queues);
+    }
+
+    //have a dummy AMQProtocolSession that does nothing on the writeFrame()
+    //set up x number of queues
+    //create necessary bits and pieces to deliver a message
+    //deliver y messages to each queue
+
+    public static void main(String[] argv) throws Exception
+    {
+        ApplicationRegistry.initialise(new TestApplicationRegistry());
+        int clients = Integer.parseInt(argv[0]);
+        int messages = Integer.parseInt(argv[1]);
+        int iterations = Integer.parseInt(argv[2]);
+        AveragedRun test = new AveragedRun(new SendPerfTest(clients, messages), iterations);
+        test.run();
+    }
+
+    /**
+     * Delivers messages to a number of queues.
+     * @param count the number of messages to deliver
+     * @param queues the list of queues
+     * @throws NoConsumersException
+     */
+    static void deliver(int count, List<AMQQueue> queues) throws AMQException
+    {
+        BasicPublishBody publish = new BasicPublishBody();
+        publish.exchange = new NullExchange().getName();
+        ContentHeaderBody header = new ContentHeaderBody();
+        List<ContentBody> body = new ArrayList<ContentBody>();
+        MessageStore messageStore = new SkeletonMessageStore();
+        body.add(new ContentBody());
+        for (int i = 0; i < count; i++)
+        {
+            for (AMQQueue q : queues)
+            {
+                q.deliver(new AMQMessage(messageStore, i, publish, header, body));
+            }
+        }
+    }
+
+    static List<AMQQueue> initQueues(int number) throws AMQException
+    {
+        Exchange exchange = new NullExchange();
+        List<AMQQueue> queues = new ArrayList<AMQQueue>(number);
+        for (int i = 0; i < number; i++)
+        {
+            AMQQueue q = createQueue("Queue" + (i + 1));
+            q.bind("routingKey", exchange);
+            try
+            {
+                q.registerProtocolSession(createSession(), 1, "1", false);
+            }
+            catch (Exception e)
+            {
+                throw new AMQException("Error creating protocol session: " + e, e);
+            }
+            queues.add(q);
+        }
+        return queues;
+    }
+
+    static AMQQueue createQueue(String name) throws AMQException
+    {
+        return new AMQQueue(name, false, null, false, ApplicationRegistry.getInstance().getQueueRegistry(),
+                new OnCurrentThreadExecutor());
+    }
+
+    static AMQProtocolSession createSession() throws Exception
+    {
+        IApplicationRegistry reg = ApplicationRegistry.getInstance();
+        AMQCodecFactory codecFactory = new AMQCodecFactory(true);
+        AMQMinaProtocolSession result = new AMQMinaProtocolSession(new MockIoSession(), reg.getQueueRegistry(), reg.getExchangeRegistry(), codecFactory);
+        result.addChannel(new AMQChannel(1, null, null));
+        return result;
+    }
+
+    static class NullExchange extends AbstractExchange
+    {
+        public String getName()
+        {
+            return "NullExchange";
+        }
+
+        protected ExchangeMBean createMBean()
+        {
+            return null;
+        }
+
+        public void registerQueue(String routingKey, AMQQueue queue, FieldTable args) throws AMQException
+        {
+        }
+
+        public void deregisterQueue(String routingKey, AMQQueue queue) throws AMQException
+        {
+        }
+
+        public void route(AMQMessage payload) throws AMQException
+        {
+        }
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,102 @@
+/*
+ *
+ * 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 junit.framework.TestCase;
+
+public class SubscriptionManagerTest extends TestCase
+{
+    private final SubscriptionSet mgr = new SubscriptionSet();
+
+    public void testBasicSubscriptionManagement()
+    {
+        assertTrue(mgr.isEmpty());
+        assertFalse(mgr.hasActiveSubscribers());
+        TestSubscription s1 = new TestSubscription("S1");
+        mgr.addSubscriber(s1);
+        assertFalse(mgr.isEmpty());
+        assertTrue(mgr.hasActiveSubscribers());
+
+        TestSubscription s2 = new TestSubscription("S2");
+        mgr.addSubscriber(s2);
+
+        s2.setSuspended(true);
+        assertFalse(mgr.isEmpty());
+        assertTrue(mgr.hasActiveSubscribers());
+        assertTrue(s2.isSuspended());
+        assertFalse(s1.isSuspended());
+
+        s1.setSuspended(true);
+        assertFalse(mgr.hasActiveSubscribers());
+
+        mgr.removeSubscriber(new TestSubscription("S1"));
+        assertFalse(mgr.isEmpty());
+        mgr.removeSubscriber(new TestSubscription("S2"));
+        assertTrue(mgr.isEmpty());
+    }
+
+    public void testRoundRobin()
+    {
+        TestSubscription a = new TestSubscription("A");
+        TestSubscription b = new TestSubscription("B");
+        TestSubscription c = new TestSubscription("C");
+        TestSubscription d = new TestSubscription("D");
+        mgr.addSubscriber(a);
+        mgr.addSubscriber(b);
+        mgr.addSubscriber(c);
+        mgr.addSubscriber(d);
+
+        for (int i = 0; i < 3; i++)
+        {
+            assertEquals(a, mgr.nextSubscriber(null));
+            assertEquals(b, mgr.nextSubscriber(null));
+            assertEquals(c, mgr.nextSubscriber(null));
+            assertEquals(d, mgr.nextSubscriber(null));
+        }
+
+        c.setSuspended(true);
+
+        for (int i = 0; i < 3; i++)
+        {
+            assertEquals(a, mgr.nextSubscriber(null));
+            assertEquals(b, mgr.nextSubscriber(null));
+            assertEquals(d, mgr.nextSubscriber(null));
+        }
+
+        mgr.removeSubscriber(a);
+        d.setSuspended(true);
+        c.setSuspended(false);
+        Subscription e = new TestSubscription("D");
+        mgr.addSubscriber(e);
+
+        for (int i = 0; i < 3; i++)
+        {
+            assertEquals(b, mgr.nextSubscriber(null));
+            assertEquals(c, mgr.nextSubscriber(null));
+            assertEquals(e, mgr.nextSubscriber(null));
+        }
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(SubscriptionManagerTest.class);
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,144 @@
+/*
+ *
+ * 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 junit.framework.TestCase;
+
+public class SubscriptionSetTest extends TestCase
+{
+    /**
+     * A SubscriptionSet that counts the number of items scanned.
+     */
+    static class TestSubscriptionSet extends SubscriptionSet
+    {
+        private int scanned = 0;
+
+        void resetScanned()
+        {
+            scanned = 0;
+        }
+
+        protected void subscriberScanned()
+        {
+            ++scanned;
+        }
+
+        int getScanned()
+        {
+            return scanned;
+        }
+    }
+
+    final TestSubscription sub1 = new TestSubscription("1");
+    final TestSubscription sub2 = new TestSubscription("2");
+    final TestSubscription sub3 = new TestSubscription("3");
+
+    final TestSubscription suspendedSub1 = new TestSubscription("sus1", true);
+    final TestSubscription suspendedSub2 = new TestSubscription("sus2", true);
+    final TestSubscription suspendedSub3 = new TestSubscription("sus3", true);
+
+    public void testNextMessage()
+    {
+        SubscriptionSet ss = new SubscriptionSet();
+        assertNull(ss.nextSubscriber(null));
+        assertEquals(0, ss.getCurrentSubscriber());
+
+        ss.addSubscriber(sub1);
+        assertEquals(sub1, ss.nextSubscriber(null));
+        assertEquals(1, ss.getCurrentSubscriber());
+        assertEquals(sub1, ss.nextSubscriber(null));
+        assertEquals(1, ss.getCurrentSubscriber());
+
+        ss.addSubscriber(sub2);
+        ss.addSubscriber(sub3);
+
+        assertEquals(sub2, ss.nextSubscriber(null));
+        assertEquals(2, ss.getCurrentSubscriber());
+
+        assertEquals(sub3, ss.nextSubscriber(null));
+        assertEquals(3, ss.getCurrentSubscriber());
+    }
+
+    public void testNextMessageWhenAllSuspended()
+    {
+        SubscriptionSet ss = createAllSuspendedSubscriptionSet();
+        assertNull(ss.nextSubscriber(null));
+        assertEquals(3, ss.getCurrentSubscriber());
+
+        assertNull(ss.nextSubscriber(null));
+        assertEquals(3, ss.getCurrentSubscriber());
+    }
+
+    private TestSubscriptionSet createAllSuspendedSubscriptionSet()
+    {
+        TestSubscriptionSet ss = new TestSubscriptionSet();
+        ss.addSubscriber(suspendedSub1);
+        ss.addSubscriber(suspendedSub2);
+        ss.addSubscriber(suspendedSub3);
+        return ss;
+    }
+
+    public void testNextMessageAfterRemove()
+    {
+        SubscriptionSet ss = new SubscriptionSet();
+        ss.addSubscriber(suspendedSub1);
+        ss.addSubscriber(suspendedSub2);
+        ss.addSubscriber(sub3);
+        assertEquals(sub3, ss.nextSubscriber(null));
+        assertEquals(3, ss.getCurrentSubscriber());
+
+        assertEquals(suspendedSub1, ss.removeSubscriber(suspendedSub1));
+
+        assertEquals(sub3, ss.nextSubscriber(null)); // Current implementation handles OutOfBoundsException here.
+        assertEquals(2, ss.getCurrentSubscriber());
+    }
+
+    public void testNextMessageOverScanning()
+    {
+        TestSubscriptionSet ss = new TestSubscriptionSet();
+        TestSubscription sub = new TestSubscription("test");
+        ss.addSubscriber(suspendedSub1);
+        ss.addSubscriber(sub);
+        ss.addSubscriber(suspendedSub3);
+        assertEquals(sub, ss.nextSubscriber(null));
+        assertEquals(2, ss.getCurrentSubscriber());
+        assertEquals(2, ss.getScanned());
+
+        ss.resetScanned();
+        sub.setSuspended(true);
+        assertNull(ss.nextSubscriber(null));
+        assertEquals(3, ss.getCurrentSubscriber());
+         // Current implementation overscans by one item here.
+        assertEquals(ss.size() + 1, ss.getScanned());
+    }
+
+    public void testNextMessageOverscanWorstCase() {
+        TestSubscriptionSet ss = createAllSuspendedSubscriptionSet();
+        ss.nextSubscriber(null);
+        // Scans the subscriptions twice.
+        assertEquals(ss.size() * 2, ss.getScanned());
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(SubscriptionSetTest.class);
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,55 @@
+/*
+ *
+ * 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 org.apache.qpid.server.queue.SynchronizedDeliveryManager;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.DefaultQueueRegistry;
+import org.apache.qpid.server.queue.ConcurrentDeliveryManager;
+import org.apache.qpid.server.queue.DeliveryManagerTest;
+import org.apache.qpid.AMQException;
+
+import junit.framework.TestSuite;
+
+public class SynchronizedDeliveryManagerTest extends DeliveryManagerTest
+{
+    public SynchronizedDeliveryManagerTest() throws Exception
+    {
+        try
+        {
+            System.setProperty("concurrentdeliverymanager","false");
+            _mgr = new SynchronizedDeliveryManager(_subscriptions, new AMQQueue("myQ", false, "guest", false,
+                                                                                new DefaultQueueRegistry()));
+        }
+        catch (Throwable t)
+        {
+            t.printStackTrace();
+            throw new AMQException("Could not initialise delivery manager", t);
+        }
+    }
+
+    public static junit.framework.Test suite()
+    {
+        TestSuite suite = new TestSuite();
+        suite.addTestSuite(SynchronizedDeliveryManagerTest.class);
+        return suite;
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,87 @@
+/*
+ *
+ * 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 java.util.ArrayList;
+import java.util.List;
+
+public class TestSubscription implements Subscription
+{
+    private final List<AMQMessage> messages;
+    private final Object key;
+    private boolean isSuspended;
+
+    public TestSubscription(Object key)
+    {
+        this(key, new ArrayList<AMQMessage>());
+    }
+
+    public TestSubscription(final Object key, final boolean isSuspended)
+    {
+        this(key);
+        setSuspended(isSuspended);
+    }
+
+    TestSubscription(Object key, List<AMQMessage> messages)
+    {
+        this.key = key;
+        this.messages = messages;
+    }
+
+    List<AMQMessage> getMessages()
+    {
+        return messages;
+    }
+
+    public void send(AMQMessage msg, AMQQueue queue)
+    {
+        messages.add(msg);
+    }
+
+    public void setSuspended(boolean suspended)
+    {
+        isSuspended = suspended;
+    }
+
+    public boolean isSuspended()
+    {
+        return isSuspended;
+    }
+
+    public void queueDeleted(AMQQueue queue)
+    {
+    }
+
+    public int hashCode()
+    {
+        return key.hashCode();
+    }
+
+    public boolean equals(Object o)
+    {
+        return o instanceof TestSubscription && ((TestSubscription) o).key.equals(key);
+    }
+
+    public String toString()
+    {
+        return key.toString();
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,102 @@
+/*
+ *
+ * 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.store;
+
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.AMQException;
+import org.apache.commons.configuration.Configuration;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A message store that does nothing. Designed to be used in tests that do not want to use any message store
+ * functionality.
+ */
+public class SkeletonMessageStore implements MessageStore
+{
+    private final AtomicLong _messageId = new AtomicLong(1);
+
+    public void configure(String base, Configuration config) throws Exception
+    {
+    }
+
+    public void configure(QueueRegistry queueRegistry, String base, Configuration config) throws Exception
+    {
+    }
+
+    public void close() throws Exception
+    {
+    }
+
+    public void put(AMQMessage msg)
+    {
+    }
+
+    public void removeMessage(long messageId)
+    {
+    }
+
+    public void createQueue(AMQQueue queue) throws AMQException
+    {
+    }
+
+    public void removeQueue(String name) throws AMQException
+    {
+    }
+
+    public void enqueueMessage(String name, long messageId) throws AMQException
+    {
+    }
+
+    public void dequeueMessage(String name, long messageId) throws AMQException
+    {
+    }
+
+    public void beginTran() throws AMQException
+    {
+    }
+
+    public boolean inTran()
+    {
+        return false;
+    }
+    
+    public void commitTran() throws AMQException
+    {
+    }
+
+    public void abortTran() throws AMQException
+    {
+    }
+
+    public List<AMQQueue> createQueues() throws AMQException
+    {
+        return null;
+    }
+
+    public long getNewMessageId()
+    {
+        return _messageId.getAndIncrement();
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,67 @@
+/*
+ *
+ * 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.store;
+
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.AMQException;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests that reference counting works correctly with AMQMessage and the message store
+ */
+public class TestReferenceCounting extends TestCase
+{
+    private TestableMemoryMessageStore _store;
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        _store = new TestableMemoryMessageStore();
+    }
+
+    /**
+     * Check that when the reference count is decremented the message removes itself from the store
+     */
+    public void testMessageGetsRemoved() throws AMQException
+    {
+        AMQMessage message = new AMQMessage(_store, null);
+        _store.put(message);
+        assertTrue(_store.getMessageMap().size() == 1);
+        message.decrementReference();
+        assertTrue(_store.getMessageMap().size() == 0);
+    }
+
+    public void testMessageRemains() throws AMQException
+    {
+        AMQMessage message = new AMQMessage(_store, null);
+        _store.put(message);
+        assertTrue(_store.getMessageMap().size() == 1);
+        message.incrementReference();
+        message.decrementReference();
+        assertTrue(_store.getMessageMap().size() == 1);
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(TestReferenceCounting.class);
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,42 @@
+/*
+ *
+ * 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.store;
+
+import org.apache.qpid.server.queue.AMQMessage;
+
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Adds some extra methods to the memory message store for testing purposes.
+ */
+public class TestableMemoryMessageStore extends MemoryMessageStore
+{
+    public TestableMemoryMessageStore()
+    {
+        _messageMap = new ConcurrentHashMap<Long, AMQMessage>();
+    }
+
+    public ConcurrentMap<Long, AMQMessage> getMessageMap()
+    {
+        return _messageMap;
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,295 @@
+/*
+ *
+ * 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.txn;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
+
+import java.util.LinkedList;
+
+import junit.framework.TestCase;
+
+public class TxnBufferTest extends TestCase
+{
+    private final LinkedList<MockOp> ops = new LinkedList<MockOp>();  
+
+    public void testCommit() throws AMQException
+    {
+        MockStore store = new MockStore();
+
+        TxnBuffer buffer = new TxnBuffer(store);
+        buffer.enlist(new MockOp().expectPrepare().expectCommit());
+        //check relative ordering
+        MockOp op = new MockOp().expectPrepare().expectPrepare().expectCommit().expectCommit();
+        buffer.enlist(op);
+        buffer.enlist(op);
+        buffer.enlist(new MockOp().expectPrepare().expectCommit());
+
+        buffer.commit();
+
+        validateOps();
+        store.validate();
+    }
+
+    public void testRollback() throws AMQException
+    {
+        MockStore store = new MockStore();
+
+        TxnBuffer buffer = new TxnBuffer(store);
+        buffer.enlist(new MockOp().expectRollback());
+        buffer.enlist(new MockOp().expectRollback());
+        buffer.enlist(new MockOp().expectRollback());
+
+        buffer.rollback();
+
+        validateOps();
+        store.validate();
+    }
+
+    public void testCommitWithFailureDuringPrepare() throws AMQException
+    {
+        MockStore store = new MockStore();
+        store.expectBegin().expectAbort();
+
+        TxnBuffer buffer = new TxnBuffer(store);
+        buffer.containsPersistentChanges();
+        buffer.enlist(new MockOp().expectPrepare().expectUndoPrepare());
+        buffer.enlist(new TxnTester(store));
+        buffer.enlist(new MockOp().expectPrepare().expectUndoPrepare());
+        buffer.enlist(new FailedPrepare());
+        buffer.enlist(new MockOp());
+
+        buffer.commit();        
+        validateOps();
+        store.validate();
+    }
+
+    public void testCommitWithPersistance() throws AMQException
+    {
+        MockStore store = new MockStore();
+        store.expectBegin().expectCommit();
+
+        TxnBuffer buffer = new TxnBuffer(store);
+        buffer.enlist(new MockOp().expectPrepare().expectCommit());
+        buffer.enlist(new MockOp().expectPrepare().expectCommit());
+        buffer.enlist(new MockOp().expectPrepare().expectCommit());
+        buffer.enlist(new TxnTester(store));
+        buffer.containsPersistentChanges();
+
+        buffer.commit();
+        validateOps();
+        store.validate();
+    }
+
+    private void validateOps()
+    {
+        for (MockOp op : ops)
+        {
+            op.validate();
+        }
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(TxnBufferTest.class);
+    }
+
+    class MockOp implements TxnOp
+    {        
+        final Object PREPARE = "PREPARE";
+        final Object COMMIT = "COMMIT";
+        final Object UNDO_PREPARE = "UNDO_PREPARE";
+        final Object ROLLBACK = "ROLLBACK";
+
+        private final LinkedList expected = new LinkedList();
+
+        MockOp()
+        {
+            ops.add(this);
+        }
+
+        public void prepare()
+        {
+            assertEquals(expected.removeLast(), PREPARE);
+        }
+
+        public void commit()
+        {
+            assertEquals(expected.removeLast(), COMMIT);
+        }
+
+        public void undoPrepare()
+        {
+            assertEquals(expected.removeLast(), UNDO_PREPARE);
+        }
+
+        public void rollback()
+        {
+            assertEquals(expected.removeLast(), ROLLBACK);
+        }
+
+        private MockOp expect(Object optype)
+        {
+            expected.addFirst(optype);
+            return this;
+        }
+
+        MockOp expectPrepare()
+        {
+            return expect(PREPARE);
+        }
+
+        MockOp expectCommit()
+        {
+            return expect(COMMIT);
+        }
+
+        MockOp expectUndoPrepare()
+        {
+            return expect(UNDO_PREPARE);
+        }
+
+        MockOp expectRollback()
+        {
+            return expect(ROLLBACK);
+        }
+
+        void validate()
+        {
+            assertEquals("Expected ops were not all invoked", new LinkedList(), expected);
+        }
+
+        void clear()
+        {
+            expected.clear();
+        }
+    }
+
+    class MockStore extends TestableMemoryMessageStore
+    {
+        final Object BEGIN = "BEGIN";
+        final Object ABORT = "ABORT";
+        final Object COMMIT = "COMMIT";
+
+        private final LinkedList expected = new LinkedList();
+        private boolean inTran;
+
+        public void beginTran() throws AMQException
+        {
+            assertEquals(expected.removeLast(), BEGIN);
+            inTran = true;
+        }
+        
+        public void commitTran() throws AMQException
+        {
+            assertEquals(expected.removeLast(), COMMIT);
+            inTran = false;
+        }
+        
+        public void abortTran() throws AMQException
+        {
+            assertEquals(expected.removeLast(), ABORT);
+            inTran = false;
+        }
+
+        public boolean inTran()
+        {
+            return inTran;
+        }
+
+        private MockStore expect(Object optype)
+        {
+            expected.addFirst(optype);
+            return this;
+        }
+
+        MockStore expectBegin()
+        {
+            return expect(BEGIN);
+        }
+
+        MockStore expectCommit()
+        {
+            return expect(COMMIT);
+        }
+
+        MockStore expectAbort()
+        {
+            return expect(ABORT);
+        }
+
+        void clear()
+        {
+            expected.clear();
+        }
+
+        void validate()
+        {
+            assertEquals("Expected ops were not all invoked", new LinkedList(), expected);
+        }
+    }
+
+    class NullOp implements TxnOp
+    {        
+        public void prepare() throws AMQException
+        {
+        }
+        public void commit()
+        {
+        }
+        public void undoPrepare()
+        {
+        }
+        public void rollback()
+        {
+        }
+    }
+
+    class FailedPrepare extends NullOp
+    {        
+        public void prepare() throws AMQException
+        {
+            throw new AMQException("Fail!");
+        }
+    }
+
+    class TxnTester extends NullOp
+    {        
+        private final MessageStore store;
+
+        TxnTester(MessageStore store)
+        {
+            this.store = store;
+        }
+
+        public void prepare() throws AMQException
+        {
+            assertTrue("Expected prepare to be performed under txn", store.inTran());
+        }
+
+        public void commit()
+        {
+            assertTrue("Expected commit not to be performed under txn", !store.inTran());
+        }
+    }
+
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,66 @@
+/*
+ *
+ * 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.util;
+
+import org.apache.qpid.server.util.TimedRun;
+
+import java.util.concurrent.Callable;
+import java.util.Collection;
+
+public class AveragedRun implements Callable<RunStats>
+{
+    private final RunStats stats = new RunStats();
+    private final TimedRun test;
+    private final int iterations;
+
+    public AveragedRun(TimedRun test, int iterations)
+    {
+        this.test = test;
+        this.iterations = iterations;
+    }
+
+    public RunStats call() throws Exception
+    {
+        for (int i = 0; i < iterations; i++)
+        {
+            stats.record(test.call());
+        }
+        return stats;
+    }
+
+    public void run() throws Exception
+    {
+        System.out.println(test + ": " + call());
+    }
+
+    public String toString()
+    {
+        return test.toString();
+    }
+
+    static void run(Collection<AveragedRun> tests) throws Exception
+    {
+        for(AveragedRun test : tests)
+        {
+            test.run();
+        }
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/AveragedRun.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,79 @@
+/*
+ *
+ * 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.util;
+
+public class ConcurrentTest extends TimedRun
+{
+    private final TimedRun _test;
+    private final Thread[] _threads;
+
+    public ConcurrentTest(TimedRun test, int threads)
+    {
+        super(test.toString());
+        _test = test;
+        _threads = new Thread[threads];
+    }
+
+    protected void setup() throws Exception
+    {
+        _test.setup();
+        for(int i = 0; i < _threads.length; i++)
+        {
+            _threads[i] = new Thread(new Runner());
+        }
+    }
+
+    protected void teardown() throws Exception
+    {
+        _test.teardown();
+    }
+
+    protected void run() throws Exception
+    {
+        for(Thread t : _threads)
+        {
+            t.start();
+        }
+        for(Thread t : _threads)
+        {
+            t.join();
+        }
+    }
+
+    private class Runner implements Runnable
+    {
+        private Exception error;
+
+        public void run()
+        {
+            try
+            {
+                _test.run();
+            }
+            catch(Exception e)
+            {
+                error = e;
+                e.printStackTrace();
+            }
+        }
+    }
+
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,57 @@
+/*
+ *
+ * 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.util;
+
+public class RunStats
+{
+    private long min = Long.MAX_VALUE;
+    private long max;
+    private long total;
+    private int count;
+
+    public void record(long time)
+    {
+        max = Math.max(time, max);
+        min = Math.min(time, min);
+        total += time;
+        count++;
+    }
+
+    public long getMin()
+    {
+        return min;
+    }
+
+    public long getMax()
+    {
+        return max;
+    }
+
+    public long getAverage()
+    {
+       return total / count;
+    }
+
+    public String toString()
+    {
+        return "avg=" + getAverage() + ", min=" + min + ", max=" + max;
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/RunStats.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,107 @@
+/*
+ *
+ * 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.util;
+
+import org.apache.qpid.server.exchange.DefaultExchangeFactory;
+import org.apache.qpid.server.exchange.DefaultExchangeRegistry;
+import org.apache.qpid.server.exchange.ExchangeFactory;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.management.ManagedObjectRegistry;
+import org.apache.qpid.server.management.NoopManagedObjectRegistry;
+import org.apache.qpid.server.queue.DefaultQueueRegistry;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.security.auth.AuthenticationManager;
+import org.apache.qpid.server.security.auth.NullAuthenticationManager;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.MapConfiguration;
+
+import java.util.HashMap;
+
+public class TestApplicationRegistry extends ApplicationRegistry
+{
+    private QueueRegistry _queueRegistry;
+
+    private ExchangeRegistry _exchangeRegistry;
+
+    private ExchangeFactory _exchangeFactory;
+
+    private ManagedObjectRegistry _managedObjectRegistry;
+
+    private AuthenticationManager _authenticationManager;
+
+    private MessageStore _messageStore;
+
+    public TestApplicationRegistry()
+    {
+        super(new MapConfiguration(new HashMap()));
+    }
+
+    public void initialise() throws Exception
+    {
+        _managedObjectRegistry = new NoopManagedObjectRegistry();
+        _queueRegistry = new DefaultQueueRegistry();
+        _exchangeFactory = new DefaultExchangeFactory();
+        _exchangeRegistry = new DefaultExchangeRegistry(_exchangeFactory);
+        _authenticationManager = new NullAuthenticationManager();
+        _messageStore = new TestableMemoryMessageStore();
+
+        _configuration.addProperty("heartbeat.delay", 10 * 60); // 10 minutes
+    }
+
+    public Configuration getConfiguration()
+    {
+        return _configuration;
+    }
+
+    public QueueRegistry getQueueRegistry()
+    {
+        return _queueRegistry;
+    }
+
+    public ExchangeRegistry getExchangeRegistry()
+    {
+        return _exchangeRegistry;
+    }
+
+    public ExchangeFactory getExchangeFactory()
+    {
+        return _exchangeFactory;
+    }
+
+    public ManagedObjectRegistry getManagedObjectRegistry()
+    {
+        return _managedObjectRegistry;
+    }
+
+    public AuthenticationManager getAuthenticationManager()
+    {
+        return _authenticationManager;
+    }
+
+    public MessageStore getMessageStore()
+    {
+        return _messageStore;
+    }
+}
+

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,52 @@
+/*
+ *
+ * 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.util;
+
+import java.util.concurrent.Callable;
+
+public abstract class TimedRun implements Callable<Long>
+{
+    private final String description;
+
+    public TimedRun(String description)
+    {
+        this.description = description;
+    }
+
+    public Long call() throws Exception
+    {
+        setup();
+        long start = System.currentTimeMillis();
+        run();
+        long stop = System.currentTimeMillis();
+        teardown();
+        return stop - start;
+    }
+
+    public String toString()
+    {
+        return description;
+    }
+
+    protected void setup() throws Exception{}
+    protected void teardown() throws Exception{}
+    protected abstract void run() throws Exception;
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/server/util/TimedRun.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/VMBrokerSetup.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/VMBrokerSetup.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/VMBrokerSetup.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/VMBrokerSetup.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,52 @@
+/*
+ * 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.test;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.apache.qpid.client.transport.TransportConnection;
+
+public class VMBrokerSetup extends TestSetup
+{
+    public VMBrokerSetup(Test t)
+    {
+        super(t);
+    }
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        try
+        {
+            TransportConnection.createVMBroker(1);
+        }
+        catch (Exception e)
+        {
+            fail("Unable to create broker: " + e);
+        }
+    }
+
+    protected void tearDown() throws Exception
+    {
+        TransportConnection.killVMBroker(1);
+        super.tearDown();
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/VMBrokerSetup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java?view=auto&rev=478846
==============================================================================
--- incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java (added)
+++ incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java Fri Nov 24 04:00:21 2006
@@ -0,0 +1,216 @@
+/*
+ *
+ * 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.test.unit.ack;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
+import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.test.VMBrokerSetup;
+
+import javax.jms.*;
+
+import junit.framework.TestCase;
+
+public class DisconnectAndRedeliverTest extends TestCase
+{
+    private static final Logger _logger = Logger.getLogger(DisconnectAndRedeliverTest.class);
+
+    static
+    {
+        String workdir = System.getProperty("QPID_WORK");
+        if (workdir == null || workdir.equals(""))
+        {
+            String tempdir = System.getProperty("java.io.tmpdir");
+            System.out.println("QPID_WORK not set using tmp directory: " + tempdir);
+            System.setProperty("QPID_WORK", tempdir);
+        }
+        DOMConfigurator.configure("../broker/etc/log4j.xml");
+    }
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationRegistry.initialise(new TestApplicationRegistry(), 1);
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    /**
+     * This tests that when there are unacknowledged messages on a channel they are requeued for delivery when
+     * the channel is closed.
+     *
+     * @throws Exception
+     */
+    public void testDisconnectRedeliversMessages() throws Exception
+    {
+        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "/test");
+
+        TestableMemoryMessageStore store = (TestableMemoryMessageStore) ApplicationRegistry.getInstance().getMessageStore();
+
+        Session consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        AMQQueue queue = new AMQQueue("someQ", "someQ", false, false);
+        MessageConsumer consumer = consumerSession.createConsumer(queue);
+        //force synch to ensure the consumer has resulted in a bound queue
+        ((AMQSession) consumerSession).declareExchangeSynch("amq.direct", "direct");
+
+        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "/test");
+                 
+
+        Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        MessageProducer producer = producerSession.createProducer(queue);
+
+        _logger.info("Sending four messages");
+        producer.send(producerSession.createTextMessage("msg1"));
+        producer.send(producerSession.createTextMessage("msg2"));
+        producer.send(producerSession.createTextMessage("msg3"));
+        producer.send(producerSession.createTextMessage("msg4"));
+
+        con2.close();
+
+        _logger.info("Starting connection");
+        con.start();
+        TextMessage tm = (TextMessage) consumer.receive();
+        tm.acknowledge();
+        _logger.info("Received and acknowledged first message");
+        consumer.receive();
+        consumer.receive();
+        consumer.receive();
+        _logger.info("Received all four messages. About to disconnect and reconnect");
+
+        con.close();
+        con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "/test");
+        consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        consumer = consumerSession.createConsumer(queue);
+
+        _logger.info("Starting second consumer connection");
+        con.start();
+
+        tm = (TextMessage) consumer.receive(3000);
+        assertEquals("msg2", tm.getText());
+
+
+        tm = (TextMessage) consumer.receive(3000);
+        assertEquals("msg3", tm.getText());
+
+
+        tm = (TextMessage) consumer.receive(3000);
+        assertEquals("msg4", tm.getText());
+
+        _logger.info("Received redelivery of three messages. Acknowledging last message");
+        tm.acknowledge();
+
+        con.close();
+
+        con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "/test");
+        consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        consumer = consumerSession.createConsumer(queue);
+        _logger.info("Starting third consumer connection");
+        con.start();
+        tm = (TextMessage) consumer.receiveNoWait();
+        assertNull(tm);
+        _logger.info("No messages redelivered as is expected");
+        con.close();
+
+        con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "/test");
+        consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        consumer = consumerSession.createConsumer(queue);
+        _logger.info("Starting fourth consumer connection");
+        con.start();
+        tm = (TextMessage) consumer.receive(3000);
+        assertNull(tm);
+        _logger.info("No messages redelivered as is expected");
+        con.close();
+
+        _logger.info("Actually:" + store.getMessageMap().size());
+        //  assertTrue(store.getMessageMap().size() == 0);
+    }
+
+    /**
+     * Tests that unacknowledged messages are thrown away when the channel is closed and they cannot be
+     * requeued (due perhaps to the queue being deleted).
+     *
+     * @throws Exception
+     */
+    public void testDisconnectWithTransientQueueThrowsAwayMessages() throws Exception
+    {
+
+        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "/test");
+        TestableMemoryMessageStore store = (TestableMemoryMessageStore) ApplicationRegistry.getInstance().getMessageStore();
+        Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        Queue queue = new AMQQueue("someQ", "someQ", false, true);
+        MessageConsumer consumer = consumerSession.createConsumer(queue);
+        //force synch to ensure the consumer has resulted in a bound queue
+        ((AMQSession) consumerSession).declareExchangeSynch("amq.direct", "direct");
+
+        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "/test");
+        Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        MessageProducer producer = producerSession.createProducer(queue);
+
+        _logger.info("Sending four messages");
+        producer.send(producerSession.createTextMessage("msg1"));
+        producer.send(producerSession.createTextMessage("msg2"));
+        producer.send(producerSession.createTextMessage("msg3"));
+        producer.send(producerSession.createTextMessage("msg4"));
+
+        con2.close();
+
+        _logger.info("Starting connection");
+        con.start();
+        TextMessage tm = (TextMessage) consumer.receive();
+        tm.acknowledge();
+        _logger.info("Received and acknowledged first message");
+        consumer.receive();
+        consumer.receive();
+        consumer.receive();
+        _logger.info("Received all four messages. About to disconnect and reconnect");
+
+        con.close();
+        con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "/test");
+        consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        consumer = consumerSession.createConsumer(queue);
+
+        _logger.info("Starting second consumer connection");
+        con.start();
+
+        tm = (TextMessage) consumer.receiveNoWait();
+        assertNull(tm);
+        _logger.info("No messages redelivered as is expected");
+
+        _logger.info("Actually:" + store.getMessageMap().size());
+        assertTrue(store.getMessageMap().size() == 0);
+        con.close();
+    }
+
+    public static junit.framework.Test suite()
+    {
+        return new VMBrokerSetup(new junit.framework.TestSuite(DisconnectAndRedeliverTest.class));
+    }
+}

Propchange: incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
------------------------------------------------------------------------------
    svn:eol-style = native