From ba8d32a110f3dc96b091df9a2520f60c99ac26ba Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Thu, 14 Aug 2008 05:46:20 +0000 Subject: 150: NameSpace.__iter__() now iterates through the names, not the members; added NameSpace.__call__() method which iterates through the members; NameSpace no longer requires members to be Proxy instances; updated unit tests and affected code; cleaned up NameSpace docstrings and switch to epydoc param docstrings --- ipalib/tests/test_plugable.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'ipalib/tests/test_plugable.py') diff --git a/ipalib/tests/test_plugable.py b/ipalib/tests/test_plugable.py index ba90c203..bf1ef91c 100644 --- a/ipalib/tests/test_plugable.py +++ b/ipalib/tests/test_plugable.py @@ -26,11 +26,11 @@ from tstutil import ClassChecker from ipalib import plugable, errors -def test_valid_identifier(): +def test_check_name(): """ - Test the `valid_identifier` function. + Tests the `check_name` function. """ - f = plugable.check_identifier + f = plugable.check_name okay = [ 'user_add', 'stuff2junk', @@ -426,13 +426,20 @@ class test_NameSpace(ClassChecker): # Test __iter__ i = None - for (i, proxy) in enumerate(ns): + for (i, key) in enumerate(ns): + assert type(key) is str + assert key == get_name(i) + assert i == cnt - 1 + + # Test __call__ + i = None + for (i, proxy) in enumerate(ns()): assert type(proxy) is plugable.Proxy assert proxy.name == get_name(i) assert i == cnt - 1 # Test __contains__, __getitem__, getattr(): - proxies = frozenset(ns) + proxies = frozenset(ns()) for i in xrange(cnt): name = get_name(i) assert name in ns -- cgit