summaryrefslogtreecommitdiff
path: root/python/qpid/tests
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2010-01-05 18:19:37 +0000
committerRafael H. Schloming <rhs@apache.org>2010-01-05 18:19:37 +0000
commit788a347b4316169ff1f7b74ffb9f01986fd8d34e (patch)
treea90c444b530af4d3f5aa5ed331f081dcda36761f /python/qpid/tests
parent15dd7bb94b09cc7abbffda2d92a3d93d82764171 (diff)
downloadqpid-python-788a347b4316169ff1f7b74ffb9f01986fd8d34e.tar.gz
merged documentation and address changes from rnr branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@896159 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/tests')
-rw-r--r--python/qpid/tests/address.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/python/qpid/tests/address.py b/python/qpid/tests/address.py
index 7c101eee5e..8a1a8dcc63 100644
--- a/python/qpid/tests/address.py
+++ b/python/qpid/tests/address.py
@@ -136,12 +136,13 @@ class AddressTests(ParserBase, Test):
def testBadOptions1(self):
self.invalid("name/subject; {",
- "expecting (ID, RBRACE), got EOF line:1,15:name/subject; {")
+ "expecting (NUMBER, STRING, ID, LBRACE, LBRACK, RBRACE), "
+ "got EOF line:1,15:name/subject; {")
def testBadOptions2(self):
self.invalid("name/subject; { 3",
- "expecting (ID, RBRACE), got NUMBER('3') "
- "line:1,16:name/subject; { 3")
+ "expecting COLON, got EOF "
+ "line:1,17:name/subject; { 3")
def testBadOptions3(self):
self.invalid("name/subject; { key:",
@@ -160,7 +161,7 @@ class AddressTests(ParserBase, Test):
def testBadOptions6(self):
self.invalid("name/subject; { key: value,",
- "expecting (ID, RBRACE), got EOF "
+ "expecting (NUMBER, STRING, ID, LBRACE, LBRACK, RBRACE), got EOF "
"line:1,27:name/subject; { key: value,")
def testBadOptions7(self):
@@ -197,3 +198,14 @@ class AddressTests(ParserBase, Test):
def testBadList4(self):
self.invalid("name/subject; { key: [ 1 2 ] }", "expecting (COMMA, RBRACK), "
"got NUMBER('2') line:1,25:name/subject; { key: [ 1 2 ] }")
+
+ def testMap1(self):
+ self.valid("name/subject; { 'key': value }",
+ "name", "subject", {"key": "value"})
+
+ def testMap2(self):
+ self.valid("name/subject; { 1: value }", "name", "subject", {1: "value"})
+
+ def testMap3(self):
+ self.valid('name/subject; { "foo.bar": value }',
+ "name", "subject", {"foo.bar": "value"})