237: Ported public.Method to new Option; updated corresponding unit tests

2 files changed, 14 insertions, 15 deletions

diff --git a/ipalib/public.py b/ipalib/public.py
index 7035d381..72a08d7a 100644
--- a/ipalib/public.py
+++ b/ipalib/public.py
@@ -312,7 +312,7 @@ class Method(Attribute, Command):
     __public__ = Attribute.__public__.union(Command.__public__)
 
     def get_options(self):
-        for option in Command.options:
+        for option in self.options:
             yield option
         if self.obj is not None and self.obj.Property is not None:
             for proxy in self.obj.Property():
diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py
index fe76a722..e7909a6b 100644
--- a/ipalib/tests/test_public.py
+++ b/ipalib/tests/test_public.py
@@ -561,7 +561,7 @@ class test_Attribute(ClassChecker):
         assert read_only(o, 'obj') is user_obj
 
 
-class dont_Method(ClassChecker):
+class test_Method(ClassChecker):
     """
     Tests the `public.Method` class.
     """
@@ -572,14 +572,10 @@ class dont_Method(ClassChecker):
         assert self.cls.implements(public.Command)
 
     def get_subcls(self):
-        class option0(public.Option):
-            pass
-        class option1(public.Option):
-            pass
         class example_prop0(public.Property):
-            pass
+            'Prop zero'
         class example_prop1(public.Property):
-            pass
+            'Prop one'
         class example_obj(object):
             __prop = None
             def __get_prop(self):
@@ -594,8 +590,12 @@ class dont_Method(ClassChecker):
                     ])
                 return self.__prop
             Property = property(__get_prop)
+        type_ = ipa_types.Unicode()
         class noun_verb(self.cls):
-            option_classes = (option0, option1)
+            options= (
+                public.Option('option0', 'Option zero', type_),
+                public.Option('option1', 'Option one', type_),
+            )
             obj = example_obj()
         return noun_verb
 
@@ -605,12 +605,11 @@ class dont_Method(ClassChecker):
         """
         sub = self.subcls()
         names = ('option0', 'option1', 'prop0', 'prop1')
-        proxies = tuple(sub.get_options())
-        assert len(proxies) == 4
-        for (i, proxy) in enumerate(proxies):
-            assert proxy.name == names[i]
-            assert isinstance(proxy, plugable.PluginProxy)
-            assert proxy.implements(public.Option)
+        options = tuple(sub.get_options())
+        assert len(options) == 4
+        for (i, option) in enumerate(options):
+            assert option.name == names[i]
+            assert isinstance(option, public.Option)
 
 
 class test_Property(ClassChecker):