|
6 | 6 | import unittest |
7 | 7 | import datadriven |
8 | 8 |
|
| 9 | +def mkGetArgTest(ns, key, expected=None): |
| 10 | + def test(self): |
| 11 | + a_default = object() |
| 12 | + self.failUnlessEqual(self.msg.getArg(ns, key), expected) |
| 13 | + if expected is None: |
| 14 | + self.failUnlessEqual( |
| 15 | + self.msg.getArg(ns, key, a_default), a_default) |
| 16 | + self.failUnlessRaises( |
| 17 | + KeyError, self.msg.getArg, ns, key, message.no_default) |
| 18 | + else: |
| 19 | + self.failUnlessEqual( |
| 20 | + self.msg.getArg(ns, key, a_default), expected) |
| 21 | + self.failUnlessEqual( |
| 22 | + self.msg.getArg(ns, key, message.no_default), expected) |
| 23 | + |
| 24 | + return test |
| 25 | + |
9 | 26 | class EmptyMessageTest(unittest.TestCase): |
10 | 27 | def setUp(self): |
11 | 28 | self.msg = message.Message() |
@@ -79,18 +96,10 @@ def test_getArg(self): |
79 | 96 | self.failUnlessRaises(message.UndefinedOpenIDNamespace, |
80 | 97 | self.msg.getArg, message.OPENID_NS, 'foo') |
81 | 98 |
|
82 | | - def test_getArgBARE(self): |
83 | | - self.failUnlessEqual(self.msg.getArg(message.BARE_NS, 'foo'), None) |
84 | | - |
85 | | - def test_getArgNS1(self): |
86 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID1_NS, 'foo'), None) |
87 | | - |
88 | | - def test_getArgNS2(self): |
89 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID2_NS, 'foo'), None) |
90 | | - |
91 | | - def test_getArgNS3(self): |
92 | | - self.failUnlessEqual(self.msg.getArg('urn:nothing-significant', 'foo'), |
93 | | - None) |
| 99 | + test_getArgBARE = mkGetArgTest(message.BARE_NS, 'foo') |
| 100 | + test_getArgNS1 = mkGetArgTest(message.OPENID1_NS, 'foo') |
| 101 | + test_getArgNS2 = mkGetArgTest(message.OPENID2_NS, 'foo') |
| 102 | + test_getArgNS3 = mkGetArgTest('urn:nothing-significant', 'foo') |
94 | 103 |
|
95 | 104 | def test_getArgs(self): |
96 | 105 | # Could reasonably return {} instead of raising an |
@@ -266,23 +275,11 @@ def test_hasKeyNS3(self): |
266 | 275 | self.failUnlessEqual( |
267 | 276 | self.msg.hasKey('urn:nothing-significant', 'mode'), False) |
268 | 277 |
|
269 | | - def test_getArg(self): |
270 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID_NS, 'mode'), |
271 | | - 'error') |
272 | | - |
273 | | - def test_getArgBARE(self): |
274 | | - self.failUnlessEqual(self.msg.getArg(message.BARE_NS, 'mode'), None) |
275 | | - |
276 | | - def test_getArgNS1(self): |
277 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID1_NS, 'mode'), |
278 | | - 'error') |
279 | | - |
280 | | - def test_getArgNS2(self): |
281 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID2_NS, 'mode'), None) |
282 | | - |
283 | | - def test_getArgNS3(self): |
284 | | - self.failUnlessEqual( |
285 | | - self.msg.getArg('urn:nothing-significant', 'mode'), None) |
| 278 | + test_getArgBARE = mkGetArgTest(message.BARE_NS, 'mode') |
| 279 | + test_getArgNS = mkGetArgTest(message.OPENID_NS, 'mode', 'error') |
| 280 | + test_getArgNS1 = mkGetArgTest(message.OPENID1_NS, 'mode', 'error') |
| 281 | + test_getArgNS2 = mkGetArgTest(message.OPENID2_NS, 'mode') |
| 282 | + test_getArgNS3 = mkGetArgTest('urn:nothing-significant', 'mode') |
286 | 283 |
|
287 | 284 | def test_getArgs(self): |
288 | 285 | self.failUnlessEqual(self.msg.getArgs(message.OPENID_NS), |
@@ -488,23 +485,11 @@ def test_hasKeyNS3(self): |
488 | 485 | self.failUnlessEqual( |
489 | 486 | self.msg.hasKey('urn:nothing-significant', 'mode'), False) |
490 | 487 |
|
491 | | - def test_getArgOpenID(self): |
492 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID_NS, 'mode'), |
493 | | - 'error') |
494 | | - |
495 | | - def test_getArgBARE(self): |
496 | | - self.failUnlessEqual(self.msg.getArg(message.BARE_NS, 'mode'), None) |
497 | | - |
498 | | - def test_getArgNS1(self): |
499 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID1_NS, 'mode'), None) |
500 | | - |
501 | | - def test_getArgNS2(self): |
502 | | - self.failUnlessEqual(self.msg.getArg(message.OPENID2_NS, 'mode'), |
503 | | - 'error') |
504 | | - |
505 | | - def test_getArgNS3(self): |
506 | | - self.failUnlessEqual( |
507 | | - self.msg.getArg('urn:nothing-significant', 'mode'), None) |
| 488 | + test_getArgBARE = mkGetArgTest(message.BARE_NS, 'mode') |
| 489 | + test_getArgNS = mkGetArgTest(message.OPENID_NS, 'mode', 'error') |
| 490 | + test_getArgNS1 = mkGetArgTest(message.OPENID1_NS, 'mode') |
| 491 | + test_getArgNS2 = mkGetArgTest(message.OPENID2_NS, 'mode', 'error') |
| 492 | + test_getArgNS3 = mkGetArgTest('urn:nothing-significant', 'mode') |
508 | 493 |
|
509 | 494 | def test_getArgsOpenID(self): |
510 | 495 | self.failUnlessEqual(self.msg.getArgs(message.OPENID_NS), |
|
0 commit comments