1 files changed, 0 insertions, 309 deletions
diff --git a/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
deleted file mode 100644
index a08e870873..0000000000
--- a/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ /dev/null
@@ -1,309 +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.exchange;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.jms.Connection;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.client.AMQHeadersExchange;
-import org.apache.qpid.client.AMQNoRouteException;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.configuration.ClientProperties;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.url.AMQBindingURL;
-import org.apache.qpid.url.BindingURL;
-
-public class ReturnUnroutableMandatoryMessageTest extends QpidTestCase implements ExceptionListener
-{
-    private static final Logger _logger = Logger.getLogger(ReturnUnroutableMandatoryMessageTest.class);
-
-    private final List<Message> _bouncedMessageList = Collections.synchronizedList(new ArrayList<Message>());
-
-    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);
-        }
-    }
-
-    /**
-     * Tests that mandatory message which are not routable are returned to the producer
-     *
-     * @throws Exception
-     */
-    public void testReturnUnroutableMandatoryMessage_HEADERS() throws Exception
-    {
-        _bouncedMessageList.clear();
-        MessageConsumer consumer = null;
-        AMQSession producerSession = null;
-        AMQHeadersExchange queue = null;
-        Connection con=null, con2 = null;
-        try
-        {
-            con = getConnection();
-
-            AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-            queue = new AMQHeadersExchange(new AMQBindingURL(ExchangeDefaults.HEADERS_EXCHANGE_CLASS + "://" + ExchangeDefaults.HEADERS_EXCHANGE_NAME + "/test/queue1?" + BindingURL.OPTION_ROUTING_KEY + "='F0000=1'"));
-            FieldTable ft = new FieldTable();
-            ft.setString("F1000", "1");
-            consumer = consumerSession.createConsumer(queue, Integer.parseInt(ClientProperties.MAX_PREFETCH_DEFAULT), Integer.parseInt(ClientProperties.MAX_PREFETCH_DEFAULT) /2 ,  false, false, (String) null, ft);
-
-            //force synch to ensure the consumer has resulted in a bound queue
-            //((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS);
-            // This is the default now
-
-            con2 = getConnection();
-
-            con2.setExceptionListener(this);
-            producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-            // Need to start the "producer" connection in order to receive bounced messages
-            _logger.info("Starting producer connection");
-            con2.start();
-        }
-        catch (JMSException jmse)
-        {
-            fail(jmse.getMessage());
-        }
-
-        try
-        {
-            MessageProducer nonMandatoryProducer = producerSession.createProducer(queue, false, false);
-            MessageProducer mandatoryProducer = producerSession.createProducer(queue);
-
-            // First test - should neither be bounced nor routed
-            _logger.info("Sending non-routable non-mandatory message");
-            TextMessage msg1 = producerSession.createTextMessage("msg1");
-            nonMandatoryProducer.send(msg1);
-
-            // Second test - should be bounced
-            _logger.info("Sending non-routable mandatory message");
-            TextMessage msg2 = producerSession.createTextMessage("msg2");
-            mandatoryProducer.send(msg2);
-
-            // Third test - should be routed
-            _logger.info("Sending routable message");
-            TextMessage msg3 = producerSession.createTextMessage("msg3");
-            msg3.setStringProperty("F1000", "1");
-            mandatoryProducer.send(msg3);
-
-            _logger.info("Starting consumer connection");
-            con.start();
-            TextMessage tm = (TextMessage) consumer.receive(1000L);
-
-            assertTrue("No message routed to receiver", tm != null);
-            assertTrue("Wrong message routed to receiver: " + tm.getText(), "msg3".equals(tm.getText()));
-
-            try
-            {
-                Thread.sleep(1000L);
-            }
-            catch (InterruptedException e)
-            {
-                ;
-            }
-
-            assertTrue("Wrong number of messages bounced (expect 1): " + _bouncedMessageList.size(), _bouncedMessageList.size() == 1);
-            Message m = _bouncedMessageList.get(0);
-            assertTrue("Wrong message bounced: " + m.toString(), m.toString().contains("msg2"));
-        }
-        catch (JMSException jmse)
-        {
-
-        }
-        con.close();
-        con2.close();
-
-    }
-
-    public void testReturnUnroutableMandatoryMessage_QUEUE() throws Exception
-    {
-        _bouncedMessageList.clear();
-        Connection con = getConnection();
-
-        AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-        AMQQueue valid_queue = new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, "testReturnUnroutableMandatoryMessage_QUEUE");
-        AMQQueue invalid_queue = new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, "testReturnUnroutableMandatoryMessage_QUEUE_INVALID");
-        MessageConsumer consumer = consumerSession.createConsumer(valid_queue);
-
-        //force synch to ensure the consumer has resulted in a bound queue
-        //((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS);
-        // This is the default now
-
-        Connection con2 = getConnection();
-
-        con2.setExceptionListener(this);
-        AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-        // Need to start the "producer" connection in order to receive bounced messages
-        _logger.info("Starting producer connection");
-        con2.start();
-
-        MessageProducer nonMandatoryProducer = producerSession.createProducer(valid_queue, false, false);
-        MessageProducer mandatoryProducer = producerSession.createProducer(invalid_queue);
-
-        // First test - should be routed
-        _logger.info("Sending non-mandatory message");
-        TextMessage msg1 = producerSession.createTextMessage("msg1");
-        nonMandatoryProducer.send(msg1);
-
-        // Second test - should be bounced
-        _logger.info("Sending non-routable mandatory message");
-        TextMessage msg2 = producerSession.createTextMessage("msg2");
-        mandatoryProducer.send(msg2);
-
-        _logger.info("Starting consumer connection");
-        con.start();
-        TextMessage tm = (TextMessage) consumer.receive(1000L);
-
-        assertTrue("No message routed to receiver", tm != null);
-        assertTrue("Wrong message routed to receiver: " + tm.getText(), "msg1".equals(tm.getText()));
-
-        try
-        {
-            Thread.sleep(1000L);
-        }
-        catch (InterruptedException e)
-        {
-            ;
-        }
-
-        assertTrue("Wrong number of messages bounced (expect 1): " + _bouncedMessageList.size(), _bouncedMessageList.size() == 1);
-        Message m = _bouncedMessageList.get(0);
-        assertTrue("Wrong message bounced: " + m.toString(), m.toString().contains("msg2"));
-
-        con.close();
-        con2.close();
-    }
-
-    public void testReturnUnroutableMandatoryMessage_TOPIC() throws Exception
-    {
-        _bouncedMessageList.clear();
-        Connection con = getConnection();
-
-        AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-        AMQTopic valid_topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_CLASS, "test.Return.Unroutable.Mandatory.Message.TOPIC");
-        AMQTopic invalid_topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_CLASS, "test.Return.Unroutable.Mandatory.Message.TOPIC.invalid");
-        MessageConsumer consumer = consumerSession.createConsumer(valid_topic);
-
-        //force synch to ensure the consumer has resulted in a bound queue
-        //((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS);
-        // This is the default now
-
-        Connection con2 = getConnection();
-
-        con2.setExceptionListener(this);
-        AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-        // Need to start the "producer" connection in order to receive bounced messages
-        _logger.info("Starting producer connection");
-        con2.start();
-
-        MessageProducer nonMandatoryProducer = producerSession.createProducer(valid_topic, false, false);
-        MessageProducer mandatoryProducer = producerSession.createProducer(invalid_topic);
-
-        // First test - should be routed
-        _logger.info("Sending non-mandatory message");
-        TextMessage msg1 = producerSession.createTextMessage("msg1");
-        nonMandatoryProducer.send(msg1);
-
-        // Second test - should be bounced
-        _logger.info("Sending non-routable mandatory message");
-        TextMessage msg2 = producerSession.createTextMessage("msg2");
-        mandatoryProducer.send(msg2);
-
-        _logger.info("Starting consumer connection");
-        con.start();
-        TextMessage tm = (TextMessage) consumer.receive(1000L);
-
-        assertTrue("No message routed to receiver", tm != null);
-        assertTrue("Wrong message routed to receiver: " + tm.getText(), "msg1".equals(tm.getText()));
-
-        try
-        {
-            Thread.sleep(1000L);
-        }
-        catch (InterruptedException e)
-        {
-            ;
-        }
-
-        assertEquals("Wrong number of messages bounced: ", 1, _bouncedMessageList.size());
-        Message m = _bouncedMessageList.get(0);
-        assertTrue("Wrong message bounced: " + m.toString(), m.toString().contains("msg2"));
-
-        con.close();
-        con2.close();
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(ReturnUnroutableMandatoryMessageTest.class);
-    }
-
-    public void onException(JMSException jmsException)
-    {
-
-        Exception linkedException = null;
-        try
-        {
-            linkedException = jmsException.getLinkedException();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        if (linkedException instanceof AMQNoRouteException)
-        {
-            AMQNoRouteException noRoute = (AMQNoRouteException) linkedException;
-            Message bounced = (Message) noRoute.getUndeliveredMessage();
-            _bouncedMessageList.add(bounced);
-            _logger.info("Caught expected NoRouteException");
-        }
-        else
-        {
-            _logger.warn("Caught exception on producer: ", jmsException);
-        }
-    }
-}