* added top-level systests directory for non-unit tests

* moved some tests into systests to eliminate dependencies between
  test subdirectories (required for maven)


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473889 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 1 insertions, 238 deletions

diff --git a/java/client/test/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java b/java/client/test/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
deleted file mode 100644
index 53d83fb6a3..0000000000
--- a/java/client/test/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
+++ /dev/null
@@ -1,237 +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.test.unit.ack;
-
-import junit.framework.JUnit4TestAdapter;
-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.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.jms.*;
-
-public class DisconnectAndRedeliverTest
-{
-    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("../etc/log4j.xml");
-        DOMConfigurator.configure("broker/etc/log4j.xml");
-    }
-
-    @Before
-    public void resetAppliactionRegistry() throws Exception
-    {
-        createVMBroker();
-        ApplicationRegistry.initialise(new TestApplicationRegistry(), 1);
-    }
-
-
-    public void createVMBroker()
-    {
-        try
-        {
-            TransportConnection.createVMBroker(1);
-        }
-        catch (AMQVMBrokerCreationException e)
-        {
-            Assert.fail("Unable to create broker: " + e);
-        }
-    }
-
-    @After
-    public void stopVmBroker()
-    {
-        TransportConnection.killVMBroker(1);
-    }
-
-    /**
-     * This tests that when there are unacknowledged messages on a channel they are requeued for delivery when
-     * the channel is closed.
-     *
-     * @throws Exception
-     */
-    @Test
-    public void disconnectRedeliversMessages() 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);
-        Assert.assertEquals("msg2", tm.getText());
-
-
-        tm = (TextMessage) consumer.receive(3000);
-        Assert.assertEquals("msg3", tm.getText());
-
-
-        tm = (TextMessage) consumer.receive(3000);
-        Assert.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();
-        Assert.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);
-        Assert.assertNull(tm);
-        _logger.info("No messages redelivered as is expected");
-        con.close();
-
-        _logger.info("Actually:" + store.getMessageMap().size());
-        //  Assert.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
-     */
-    @Test
-    public void disconnectWithTransientQueueThrowsAwayMessages() 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();
-        Assert.assertNull(tm);
-        _logger.info("No messages redelivered as is expected");
-
-        _logger.info("Actually:" + store.getMessageMap().size());
-        Assert.assertTrue(store.getMessageMap().size() == 0);
-        con.close();
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new JUnit4TestAdapter(DisconnectAndRedeliverTest.class);
-    }
-}
diff --git a/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java b/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java
index 97e0e44ebe..a0eec941d5 100644
--- a/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java
+++ b/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({DisconnectAndRedeliverTest.class, RecoverTest.class})
+@Suite.SuiteClasses({RecoverTest.class})
 public class UnitTests
 {
     public static junit.framework.Test suite()