This contains a test for QPID-1831 and import modifications as a result of the commit in rev 906135

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

4 files changed, 354 insertions, 3 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 209fe71b60..20c833fac5 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -34,13 +34,13 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.configuration.ClientProperties;
 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.configuration.ClientProperties;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.test.utils.QpidTestCase;
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
new file mode 100644
index 0000000000..5352bf2bf0
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -0,0 +1,351 @@
+package org.apache.qpid.test.client.destination;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.qpid.client.AMQAnyDestination;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession_0_10;
+import org.apache.qpid.messaging.Address;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AddressBasedDestinationTest extends QpidTestCase
+{
+    private static final Logger _logger = LoggerFactory.getLogger(AddressBasedDestinationTest.class);
+    private Connection _connection;
+    
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        _connection = getConnection();
+        _connection.start();
+    }
+    
+    @Override
+    public void tearDown() throws Exception
+    {
+        _connection.close();
+        super.tearDown();
+    }
+    
+    public void testCreateOptions() throws Exception
+    {
+        if (!isCppBroker())
+        {
+            _logger.info("Not C++ broker, exiting test");
+            return;
+        }
+        
+        Session jmsSession = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+        MessageProducer prod;
+        MessageConsumer cons;
+        
+        // default (create never, assert always) -------------------
+        // create never --------------------------------------------
+        String addr1 = "ADDR:testQueue1";
+        AMQDestination  dest = new AMQAnyDestination(addr1);
+        try
+        {
+            cons = jmsSession.createConsumer(dest); 
+        }
+        catch(JMSException e)
+        {
+            assertTrue(e.getMessage().contains("The name supplied in the address " +
+                    "doesn't resolve to an exchange or a queue"));
+        }
+        
+        try
+        {
+            prod = jmsSession.createProducer(dest);
+        }
+        catch(JMSException e)
+        {
+            assertTrue(e.getMessage().contains("The name supplied in the address " +
+                    "doesn't resolve to an exchange or a queue"));
+        }
+            
+        assertFalse("Queue should not be created",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
+        
+        
+        // create always -------------------------------------------
+        addr1 = "ADDR:testQueue1; { create: always }";
+        dest = new AMQAnyDestination(addr1);
+        cons = jmsSession.createConsumer(dest); 
+        
+        assertTrue("Queue not created as expected",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));              
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("", 
+                    dest.getName(),dest.getName(), dest.getQueueOptions()));
+        
+        // create receiver -----------------------------------------
+        addr1 = "ADDR:testQueue2; { create: receiver }";
+        dest = new AMQAnyDestination(addr1);
+        try
+        {
+            prod = jmsSession.createProducer(dest);
+        }
+        catch(JMSException e)
+        {
+            assertTrue(e.getMessage().contains("The name supplied in the address " +
+                    "doesn't resolve to an exchange or a queue"));
+        }
+            
+        assertFalse("Queue should not be created",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
+        
+        
+        cons = jmsSession.createConsumer(dest); 
+        
+        assertTrue("Queue not created as expected",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));              
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("", 
+                    dest.getName(),dest.getName(), dest.getQueueOptions()));
+        
+        // create never --------------------------------------------
+        addr1 = "ADDR:testQueue3; { create: never }";
+        dest = new AMQAnyDestination(addr1);
+        try
+        {
+            cons = jmsSession.createConsumer(dest); 
+        }
+        catch(JMSException e)
+        {
+            assertTrue(e.getMessage().contains("The name supplied in the address " +
+                    "doesn't resolve to an exchange or a queue"));
+        }
+        
+        try
+        {
+            prod = jmsSession.createProducer(dest);
+        }
+        catch(JMSException e)
+        {
+            assertTrue(e.getMessage().contains("The name supplied in the address " +
+                    "doesn't resolve to an exchange or a queue"));
+        }
+            
+        assertFalse("Queue should not be created",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
+        
+        // create sender ------------------------------------------
+        addr1 = "ADDR:testQueue3; { create: sender }";
+        dest = new AMQAnyDestination(addr1);
+                
+        try
+        {
+            cons = jmsSession.createConsumer(dest); 
+        }
+        catch(JMSException e)
+        {
+            assertTrue(e.getMessage().contains("The name supplied in the address " +
+                    "doesn't resolve to an exchange or a queue"));
+        }
+        assertFalse("Queue should not be created",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
+        
+        prod = jmsSession.createProducer(dest);
+        assertTrue("Queue not created as expected",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));              
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("", 
+                    dest.getName(),dest.getName(), dest.getQueueOptions()));
+        
+    }
+    
+    // todo add tests for delete options
+    
+    public void testCreateQueue() throws Exception
+    {
+        if (!isCppBroker())
+        {
+            _logger.info("Not C++ broker, exiting test");
+            return;
+        }
+        Session jmsSession = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+        
+        String addr = "ADDR:my-queue/hello; { " + 
+                        "create: always, " +
+                        "node-properties: {" + 
+                             "durable: true ," +
+                             "x-properties: { " + 
+                                 "auto-delete: true," +
+                                 "'qpid.max_size': 1000," +
+                                 "'qpid.max_count': 100," + 
+                                 " bindings: ['amq.direct/test', 'amq.fanout', 'amq.topic/a.#']" +
+                                 
+                             "}" +
+                        "}" +
+                      "}";
+        AMQDestination dest = new AMQAnyDestination(addr);
+        MessageConsumer cons = jmsSession.createConsumer(dest); 
+        
+        assertTrue("Queue not created as expected",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));              
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("", 
+                    dest.getName(),dest.getName(), null));
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.direct", 
+                    dest.getName(),"test", null));
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.fanout", 
+                    dest.getName(),null, null));
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.topic", 
+                    dest.getName(),"a.#", null));        
+        
+    }
+    
+    public void testCreateExchange() throws Exception
+    {
+        if (!isCppBroker())
+        {
+            _logger.info("Not C++ broker, exiting test");
+            return;
+        }
+        Session jmsSession = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+        
+        String addr = "ADDR:my-exchange/hello; { " + 
+                        "create: always, " +                        
+                        "node-properties: {" +
+                             "type: topic, " +
+                             "x-properties: { " + 
+                                 "auto-delete: true," +
+                                 "'qpid.msg_sequence': 1," +
+                                 "'qpid.ive': 1," + 
+                             "}" +
+                        "}" +
+                      "}";
+        
+        AMQDestination dest = new AMQAnyDestination(addr);
+        MessageConsumer cons = jmsSession.createConsumer(dest); 
+        
+        assertTrue("Exchange not created as expected",(
+                (AMQSession_0_10)jmsSession).isExchangeExist(dest, true));
+       
+        // The existence of the queue is implicitly tested here
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("my-exchange", 
+                    dest.getQueueName(),"hello", dest.getQueueOptions()));        
+        
+    }
+    
+    public void testBindQueueWithArgs() throws Exception
+    {
+        if (!isCppBroker())
+        {
+            _logger.info("Not C++ broker, exiting test");
+            return;
+        }
+        
+        Session jmsSession = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+        
+        String headersBinding = "'amq.match; {x-match: any, dep: sales, loc: CA}'";
+        
+        String addr = "ADDR:my-queue/hello; { " + 
+                        "create: always, " +
+                        "node-properties: {" + 
+                             "durable: true ," +
+                             "x-properties: { " + 
+                                 "auto-delete: true," +
+                                 "'qpid.max_count': 100," + 
+                                 " bindings: ['amq.direct/test', 'amq.topic/a.#'," + headersBinding + "]" +
+                                 
+                             "}" +
+                        "}" +
+                      "}";
+
+        AMQDestination dest = new AMQAnyDestination(addr);
+        MessageConsumer cons = jmsSession.createConsumer(dest); 
+        
+        assertTrue("Queue not created as expected",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));              
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("", 
+                    dest.getName(),dest.getName(), null));
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.direct", 
+                    dest.getName(),"test", null));  
+      
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.topic", 
+                    dest.getName(),"a.#", null));
+        
+        Address a = Address.parse(headersBinding);
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.match", 
+                    dest.getName(),null, a.getOptions()));
+    }
+    
+    /*public void testBindQueueForXMLExchange() throws Exception
+    {
+        if (!isCppBroker())
+        {
+            return;
+        }
+        
+        Session jmsSession = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+        ((AMQSession_0_10)jmsSession).sendExchangeDeclare("xml", "xml",null,null,false);
+        
+        String xQuery = "let $w := ./weather \n" +
+                        "return $w/station = \'Raleigh-Durham International Airport (KRDU)\' \n" +
+                            "and $w/temperature_f > 50 \n" + 
+                            "and $w/temperature_f - $w/dewpoint > 5 \n" + 
+                            "and $w/wind_speed_mph > 7 \n" +
+                            "and $w/wind_speed_mph < 20";
+        
+        String xmlExchangeBinding = "'xml; {xquery: " + xQuery + "} '";
+        
+        String addr = "ADDR:my-queue/hello; { " + 
+                        "create: always, " +
+                        "node-properties: {" + 
+                             "durable: true ," +
+                             "x-properties: { " + 
+                                 "auto-delete: true," +
+                                 "'qpid.max_count': 100," + 
+                                 " bindings: ['amq.direct/test', 'amq.topic/a.#'," + xmlExchangeBinding + "]" +
+                                 
+                             "}" +
+                        "}" +
+                      "}";
+        
+        AMQDestination dest = new AMQAnyDestination(addr);
+        MessageConsumer cons = jmsSession.createConsumer(dest); 
+        
+        assertTrue("Queue not created as expected",(
+                (AMQSession_0_10)jmsSession).isQueueExist(dest, true));              
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("", 
+                    dest.getName(),dest.getName(), null));
+        
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.direct", 
+                    dest.getName(),"test", null));  
+      
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("amq.topic", 
+                    dest.getName(),"a.#", null));
+        
+        Address a = Address.parse(xmlExchangeBinding);
+        assertTrue("Queue not bound as expected",(
+                (AMQSession_0_10)jmsSession).isQueueBound("xml", 
+                    dest.getName(),null, a.getOptions()));
+        
+    }*/
+}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 0e6c590659..0ab4e33f30 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
@@ -29,12 +29,12 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.TopicSession;
 
-import org.apache.configuration.ClientProperties;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionDelegate_0_10;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidTestCase;
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index b860a47090..2f613f6df4 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
@@ -20,11 +20,11 @@
  */
 package org.apache.qpid.test.unit.message;
 
-import org.apache.configuration.ClientProperties;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQHeadersExchange;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;