From 0e47948695680047490ebdc55ca3fa4f7347640f Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Tue, 26 Aug 2008 19:02:24 +0000 Subject: 197: Added new public.Option.get_default() method that calls Option.default_from() if it's a DefaultFrom instance, and otherwise returns Option.default (the static default value) --- ipalib/tests/test_public.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'ipalib/tests/test_public.py') diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py index d809b074..609ac33e 100644 --- a/ipalib/tests/test_public.py +++ b/ipalib/tests/test_public.py @@ -190,12 +190,25 @@ class test_Option(ClassChecker): rules = tuple(get_rule(i) for i in xrange(3)) assert o.rules == rules - def test_default(self): + def test_get_default(self): """ - Tests the `public.Option.default` method. + Tests the `public.Option.get_default` method. """ + assert 'get_default' in self.cls.__public__ assert 'default' in self.cls.__public__ - assert self.cls().default() is None + assert 'default_from' in self.cls.__public__ + assert self.cls().get_default() is None + class subclass(self.cls): + default = 3 + default_from = public.DefaultFrom( + lambda a,b: a * b, + 'key0', 'key1' + ) + o = subclass() + assert o.get_default() == 3 + assert o.get_default(key0=2, key1=5) == 10 + assert o.get_default(key0=7) == 3 + class test_Command(ClassChecker): -- cgit