added address support for specifying node type and properties

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

2 files changed, 66 insertions, 2 deletions

diff --git a/python/qpid/tests/address.py b/python/qpid/tests/address.py
index 75ce7b8e92..065e2ca8de 100644
--- a/python/qpid/tests/address.py
+++ b/python/qpid/tests/address.py
@@ -18,10 +18,35 @@
 #
 
 from qpid.tests import Test
-from qpid.address import parse, ParseError
+from qpid.address import lex, parse, ParseError, EOF, ID, NUMBER, SYM, WSPACE
 
 class AddressTests(Test):
 
+  def lex(self, addr, *types):
+    toks = [t.type for t in lex(addr) if t.type not in (WSPACE, EOF)]
+    assert list(types) == toks, "expected %s, got %s" % (types, toks)
+
+  def testDashInId1(self):
+    self.lex("foo-bar", ID)
+
+  def testDashInId2(self):
+    self.lex("foo-3", ID)
+
+  def testDashAlone1(self):
+    self.lex("foo - bar", ID, SYM, ID)
+
+  def testDashAlone2(self):
+    self.lex("foo - 3", ID, SYM, NUMBER)
+
+  def testLeadingDash(self):
+    self.lex("-foo", SYM, ID)
+
+  def testTrailingDash(self):
+    self.lex("foo-", ID, SYM)
+
+  def testNegativeNum(self):
+    self.lex("-3", NUMBER)
+
   def valid(self, addr, name=None, subject=None, options=None):
     expected = (name, subject, options)
     got = parse(addr)
diff --git a/python/qpid/tests/messaging.py b/python/qpid/tests/messaging.py
index 474c9ab630..34ff57babe 100644
--- a/python/qpid/tests/messaging.py
+++ b/python/qpid/tests/messaging.py
@@ -201,7 +201,7 @@ class SessionTests(Base):
     self.ssn.acknowledge(msg)
 
   def testReceiver(self):
-    rcv = self.ssn.receiver('test-rcv-queue; {create: always, delete: always}')
+    rcv = self.ssn.receiver('test-rcv-queue; {create: always}')
     rcv2 = self.ssn.receiver(rcv.source)
     assert rcv is not rcv2
     rcv2.close()
@@ -212,6 +212,7 @@ class SessionTests(Base):
     msg = rcv.fetch(0)
     assert msg.content == content
     self.ssn.acknowledge(msg)
+    snd2 = self.ssn.receiver('test-rcv-queue; {delete: always}')
 
   def testNextReceiver(self):
     ADDR = 'test-next-rcv-queue; {create: always, delete: always}'
@@ -551,6 +552,44 @@ class AddressTests(Base):
   def setup_session(self):
     return self.conn.session()
 
+  def testBadOption(self):
+    snd = self.ssn.sender("test-bad-option; {create: always, node-properties: {this-property-does-not-exist: 3}}")
+    try:
+      snd.send("ping")
+    except SendError, e:
+      assert "unrecognized option" in str(e)
+
+  def testCreateQueue(self):
+    snd = self.ssn.sender("test-create-queue; {create: always, delete: always, "
+                          "node-properties: {type: queue, durable: False, "
+                          "x-properties: {auto_delete: true}}}")
+    content = self.content("testCreateQueue")
+    snd.send(content)
+    rcv = self.ssn.receiver("test-create-queue")
+    self.drain(rcv, expected=[content])
+
+  def testCreateExchange(self):
+    snd = self.ssn.sender("test-create-exchange; {create: always, "
+                          "delete: always, node-properties: {type: topic, "
+                          "durable: False, x-properties: {auto_delete: true}}}")
+    snd.send("ping")
+    rcv1 = self.ssn.receiver("test-create-exchange/first")
+    rcv2 = self.ssn.receiver("test-create-exchange/second")
+    rcv3 = self.ssn.receiver("test-create-exchange")
+    for r in (rcv1, rcv2, rcv3):
+      try:
+        r.fetch(0)
+        assert False
+      except Empty:
+        pass
+    msg1 = Message(self.content("testCreateExchange", 1), subject="first")
+    msg2 = Message(self.content("testCreateExchange", 1), subject="second")
+    snd.send(msg1)
+    snd.send(msg2)
+    self.drain(rcv1, expected=[msg1.content])
+    self.drain(rcv2, expected=[msg2.content])
+    self.drain(rcv3, expected=[msg1.content, msg2.content])
+
   def testDeleteBySender(self):
     snd = self.ssn.sender("test-delete; {create: always}")
     snd.send("ping")