diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_collections.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_property.py | 98 |
2 files changed, 106 insertions, 8 deletions
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index 45b408223f..5a4029d356 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -28,11 +28,11 @@ class TestNamedTuple(unittest.TestCase): self.assertRaises(ValueError, namedtuple, 'abc', 'efg g%hi') # field with non-alpha char self.assertRaises(ValueError, namedtuple, 'abc', 'abc class') # field has keyword self.assertRaises(ValueError, namedtuple, 'abc', '8efg 9ghi') # field starts with digit - self.assertRaises(ValueError, namedtuple, 'abc', '__efg__ ghi') # field with double underscores + self.assertRaises(ValueError, namedtuple, 'abc', '_efg ghi') # field with leading underscore self.assertRaises(ValueError, namedtuple, 'abc', 'efg efg ghi') # duplicate field namedtuple('Point0', 'x1 y2') # Verify that numbers are allowed in names - namedtuple('_', '_ __ ___') # Verify that underscores are allowed + namedtuple('_', 'a b c') # Test leading underscores in a typename def test_instance(self): Point = namedtuple('Point', 'x y') @@ -49,17 +49,17 @@ class TestNamedTuple(unittest.TestCase): self.assertEqual(repr(p), 'Point(x=11, y=22)') self.assert_('__dict__' not in dir(p)) # verify instance has no dict self.assert_('__weakref__' not in dir(p)) - self.assertEqual(p.__fields__, ('x', 'y')) # test __fields__ attribute - self.assertEqual(p.__replace__(x=1), (1, 22)) # test __replace__ method - self.assertEqual(p.__asdict__(), dict(x=11, y=22)) # test __dict__ method + self.assertEqual(p._fields, ('x', 'y')) # test _fields attribute + self.assertEqual(p._replace(x=1), (1, 22)) # test _replace method + self.assertEqual(p._asdict(), dict(x=11, y=22)) # test _asdict method - # Verify that __fields__ is read-only + # Verify that _fields is read-only try: - p.__fields__ = ('F1' ,'F2') + p._fields = ('F1' ,'F2') except AttributeError: pass else: - self.fail('The __fields__ attribute needs to be read-only') + self.fail('The _fields attribute needs to be read-only') # verify that field string can have commas Point = namedtuple('Point', 'x, y') diff --git a/Lib/test/test_property.py b/Lib/test/test_property.py new file mode 100644 index 0000000000..4b6e20caa3 --- /dev/null +++ b/Lib/test/test_property.py @@ -0,0 +1,98 @@ +# Test case for property +# more tests are in test_descr + +import unittest +from test.test_support import run_unittest + +class PropertyBase(Exception): + pass + +class PropertyGet(PropertyBase): + pass + +class PropertySet(PropertyBase): + pass + +class PropertyDel(PropertyBase): + pass + +class BaseClass(object): + def __init__(self): + self._spam = 5 + + @property + def spam(self): + """BaseClass.getter""" + return self._spam + + @spam.setter + def spam(self, value): + self._spam = value + + @spam.deleter + def spam(self): + del self._spam + +class SubClass(BaseClass): + + @BaseClass.spam.getter + def spam(self): + """SubClass.getter""" + raise PropertyGet(self._spam) + + @spam.setter + def spam(self, value): + raise PropertySet(self._spam) + + @spam.deleter + def spam(self): + raise PropertyDel(self._spam) + +class PropertyDocBase(object): + _spam = 1 + def _get_spam(self): + return self._spam + spam = property(_get_spam, doc="spam spam spam") + +class PropertyDocSub(PropertyDocBase): + @PropertyDocBase.spam.getter + def spam(self): + """The decorator does not use this doc string""" + return self._spam + +class PropertyTests(unittest.TestCase): + def test_property_decorator_baseclass(self): + # see #1620 + base = BaseClass() + self.assertEqual(base.spam, 5) + self.assertEqual(base._spam, 5) + base.spam = 10 + self.assertEqual(base.spam, 10) + self.assertEqual(base._spam, 10) + delattr(base, "spam") + self.assert_(not hasattr(base, "spam")) + self.assert_(not hasattr(base, "_spam")) + base.spam = 20 + self.assertEqual(base.spam, 20) + self.assertEqual(base._spam, 20) + self.assertEqual(base.__class__.spam.__doc__, "BaseClass.getter") + + def test_property_decorator_subclass(self): + # see #1620 + sub = SubClass() + self.assertRaises(PropertyGet, getattr, sub, "spam") + self.assertRaises(PropertySet, setattr, sub, "spam", None) + self.assertRaises(PropertyDel, delattr, sub, "spam") + self.assertEqual(sub.__class__.spam.__doc__, "SubClass.getter") + + def test_property_decorator_doc(self): + base = PropertyDocBase() + sub = PropertyDocSub() + self.assertEqual(base.__class__.spam.__doc__, "spam spam spam") + self.assertEqual(sub.__class__.spam.__doc__, "spam spam spam") + +def test_main(): + run_unittest(PropertyTests) + +if __name__ == '__main__': + test_main() |