[Python-checkins] r53888 - sandbox/trunk/pep362/test_pep362.py

[brett.cannon]

Author: brett.cannon
Date: Sat Feb 24 18:04:22 2007
New Revision: 53888

Modified:
   sandbox/trunk/pep362/test_pep362.py
Log:
Tighten up Signature.bind tests and what exception is expected.


Modified: sandbox/trunk/pep362/test_pep362.py
==============================================================================
--- sandbox/trunk/pep362/test_pep362.py	(original)
+++ sandbox/trunk/pep362/test_pep362.py	Sat Feb 24 18:04:22 2007
@@ -216,8 +216,8 @@
         sig = pep362.Signature(pep362_fodder.no_args)
         binding = sig.bind()
         self.failUnlessEqual({}, binding)
-        self.failUnlessRaises(TypeError, sig.bind, 42)
-        self.failUnlessRaises(TypeError, sig.bind, a=0)
+        self.failUnlessRaises(pep362.BindError, sig.bind, 42)
+        self.failUnlessRaises(pep362.BindError, sig.bind, a=0)
 
     def test_var_parameters(self):
         sig = pep362.Signature(pep362_fodder.var_args)
@@ -225,7 +225,7 @@
         self.failUnlessEqual({'args':(0, 1, 2)}, binding)
         binding = sig.bind()
         self.failUnlessEqual({'args':tuple()}, binding)
-        self.failUnlessRaises(TypeError, sig.bind, a=0)
+        self.failUnlessRaises(pep362.BindError, sig.bind, a=0)
 
     def test_var_kw_parameters(self):
         sig = pep362.Signature(pep362_fodder.var_kw_args)
@@ -233,7 +233,7 @@
         self.failUnlessEqual({'kwargs':{'a':0}}, binding)
         binding = sig.bind()
         self.failUnlessEqual({'kwargs':{}}, binding)
-        self.failUnlessRaises(TypeError, sig.bind, 42)
+        self.failUnlessRaises(pep362.BindError, sig.bind, 42)
 
     def test_positional_parameters(self):
         sig = pep362.Signature(pep362_fodder.no_default_args)
@@ -241,9 +241,9 @@
         self.failUnlessEqual({'a':42}, binding)
         binding = sig.bind(a=42)
         self.failUnlessEqual({'a':42}, binding)
-        self.failUnlessRaises(TypeError, sig.bind)
-        self.failUnlessRaises(TypeError, sig.bind, 0, 1)
-        self.failUnlessRaises(TypeError, sig.bind, b=0)
+        self.failUnlessRaises(pep362.BindError, sig.bind)
+        self.failUnlessRaises(pep362.BindError, sig.bind, 0, 1)
+        self.failUnlessRaises(pep362.BindError, sig.bind, b=0)
 
     def test_keyword_parameters(self):
         sig = pep362.Signature(pep362_fodder.default_args)
@@ -253,9 +253,9 @@
         self.failUnlessEqual({'a':42}, binding)
         binding = sig.bind(a=0)
         self.failUnlessEqual({'a':0}, binding)
-        self.failUnlessRaises(TypeError, sig.bind, 0, 1)
-        self.failUnlessRaises(TypeError, sig.bind, a=0, b=1)
-        self.failUnlessRaises(TypeError, sig.bind, b=1)
+        self.failUnlessRaises(pep362.BindError, sig.bind, 0, 1)
+        self.failUnlessRaises(pep362.BindError, sig.bind, a=0, b=1)
+        self.failUnlessRaises(pep362.BindError, sig.bind, b=1)
 
     def XXX_test_tuple_parameter(self):
         sig = pep362.Signature(pep362_fodder.tuple_args)
@@ -264,8 +264,8 @@
         arg = (1, ((2,),))
         binding = sig.bind(arg)
         self.failUnlessEqual({('a', ('b',)):arg}, binding)
-        self.failUnlessRaises(TypeError, sig.bind, (1,2,3))
-        self.failUnlessRaises(TypeError, sig.bind, (1, 2))
+        self.failUnlessRaises(pep362.BindError, sig.bind, (1,2,3))
+        self.failUnlessRaises(pep362.BindError, sig.bind, (1, 2))
 
     def XXX_test_default_tuple_parameter(self):
         sig = pep362.Signature(pep362_fodder.default_tuple_args)