[Telepathy-commits] [telepathy-spec/master] Tests using doctest

[Davyd Madeley]

Test spec doesn't cover everything we might need to parse
---
 test/test-specparser.py |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 tools/specparser.py     |   23 ++++++++---
 2 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100755 test/test-specparser.py

diff --git a/test/test-specparser.py b/test/test-specparser.py
new file mode 100755
index 0000000..d530a68
--- /dev/null
+++ b/test/test-specparser.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+import sys
+import os.path
+
+test_dir = os.path.dirname (sys.argv[0])
+sys.path.insert (0, os.path.join (test_dir, '../tools/'))
+
+import specparser
+
+spec_path = os.path.join (test_dir, 'input/all.xml')
+
+def test_specparser ():
+    """
+>>> spec = specparser.parse (spec_path)
+>>> spec
+Spec(telepathy-spec tools test case)
+
+>>> spec.interfaces
+[Interface(org.freedesktop.Telepathy.SpecAutoGenTest)]
+
+>>> spec.errors
+{u'org.freedesktop.Telepathy.SpecAutoGenTest.OtherError': Error(org.freedesktop.Telepathy.SpecAutoGenTest.OtherError), u'org.freedesktop.Telepathy.SpecAutoGenTest.MiscError': Error(org.freedesktop.Telepathy.SpecAutoGenTest.MiscError)}
+
+>>> spec.generic_types
+[]
+>>> spec.types
+{u'Adjective': Enum(org.freedesktop.Telepathy.SpecAutoGenTest.Adjective), u'Test_Flags': Flags(org.freedesktop.Telepathy.SpecAutoGenTest.Test_Flags)}
+
+>>> i = spec.interfaces[0]
+>>> i
+Interface(org.freedesktop.Telepathy.SpecAutoGenTest)
+
+>>> print i.causes_havoc
+None
+
+>>> i.methods
+[Method(org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff)]
+
+>>> i.methods[0].args
+Traceback (most recent call last):
+  File "<stdin>", line 1, in <module>
+AttributeError: 'Method' object has no attribute 'args'
+>>> i.methods[0].in_args
+[Arg(org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff.badger:b), Arg(org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff.mushroom:a{sv}), Arg(org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff.snake:s)]
+>>> i.methods[0].out_args
+[Arg(org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff:a(uv))]
+
+>>> i.methods[0].possible_errors
+[PossibleError(org.freedesktop.Telepathy.SpecAutoGenTest.MiscError), PossibleError(org.freedesktop.Telepathy.SpecAutoGenTest.OtherError)]
+>>> map (lambda e: e.get_error (), i.methods[0].possible_errors)
+[Error(org.freedesktop.Telepathy.SpecAutoGenTest.MiscError), Error(org.freedesktop.Telepathy.SpecAutoGenTest.OtherError)]
+
+>>> i.signals
+[Signal(org.freedesktop.Telepathy.SpecAutoGenTest.StuffHappened)]
+
+>>> i.signals[0].args
+[Arg(org.freedesktop.Telepathy.SpecAutoGenTest.StuffHappened.stoat:ay), Arg(org.freedesktop.Telepathy.SpecAutoGenTest.StuffHappened.ferret:s), Arg(org.freedesktop.Telepathy.SpecAutoGenTest.StuffHappened.weasel:b)]
+
+>>> i.properties
+[Property(org.freedesktop.Telepathy.SpecAutoGenTest.Introspective:b)]
+
+>>> i.properties[0].type
+''
+>>> i.properties[0].dbus_type
+u'b'
+>>> print i.properties[0].get_type ()
+None
+
+>>> i.types
+[Enum(org.freedesktop.Telepathy.SpecAutoGenTest.Adjective), Flags(org.freedesktop.Telepathy.SpecAutoGenTest.Test_Flags)]
+
+>>> i.types[0].values
+[EnumValue(org.freedesktop.Telepathy.SpecAutoGenTest.Adjective.Leveraging), EnumValue(org.freedesktop.Telepathy.SpecAutoGenTest.Adjective.Synergistic)]
+>>> map (lambda v: (v.short_name, v.value), i.types[0].values)
+[(u'Leveraging', u'0'), (u'Synergistic', u'1')]
+
+>>> i.types[1].values
+[EnumValue(org.freedesktop.Telepathy.SpecAutoGenTest.Test_Flags.LowBit), EnumValue(org.freedesktop.Telepathy.SpecAutoGenTest.Test_Flags.HighBit)]
+>>> map (lambda v: (v.short_name, v.value), i.types[1].values)
+[(u'LowBit', u'1'), (u'HighBit', u'128')]
+
+>>> spec.everything
+{u'org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff': Method(org.freedesktop.Telepathy.SpecAutoGenTest.DoStuff), u'org.freedesktop.Telepathy.SpecAutoGenTest': Interface(org.freedesktop.Telepathy.SpecAutoGenTest), u'org.freedesktop.Telepathy.SpecAutoGenTest.Introspective': Property(org.freedesktop.Telepathy.SpecAutoGenTest.Introspective:b), u'org.freedesktop.Telepathy.SpecAutoGenTest.StuffHappened': Signal(org.freedesktop.Telepathy.SpecAutoGenTest.StuffHappened)}
+
+>>> map (lambda o: i.added, spec.everything.values ())
+[None, None, None, None]
+>>> map (lambda o: i.deprecated, spec.everything.values ())
+[None, None, None, None]
+    """
+
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod ()
diff --git a/tools/specparser.py b/tools/specparser.py
index 469382b..a15c01b 100644
--- a/tools/specparser.py
+++ b/tools/specparser.py
@@ -468,9 +468,14 @@ class Spec (object):
         self.errors = build_dict (self, Error,
                         errorsnode.getAttribute ('namespace'),
                         errorsnode.getElementsByTagNameNS (XMLNS_TP, 'error'))
+
         # build a list of generic types
-        self.generic_types = parse_types (self,
+        try:
+            self.generic_types = parse_types (self,
                     dom.getElementsByTagNameNS (XMLNS_TP, 'generic-types')[0])
+        except IndexError:
+            self.generic_types = []
+
         # build a list of interfaces in this spec
         self.interfaces = build_list (self, Interface, None,
                                  dom.getElementsByTagName ('interface'))
@@ -502,11 +507,14 @@ class Spec (object):
         self.copyrights = map (getText,
                                getChildrenByName (node, XMLNS_TP, 'copyright'))
 
-        license = getChildrenByName (node, XMLNS_TP, 'license')[0]
-        license.tagName = 'div'
-        license.namespaceURI = None
-        license.setAttribute ('class', 'license')
-        self.license = license.toxml ()
+        try:
+            license = getChildrenByName (node, XMLNS_TP, 'license')[0]
+            license.tagName = 'div'
+            license.namespaceURI = None
+            license.setAttribute ('class', 'license')
+            self.license = license.toxml ()
+        except IndexError:
+            self.license = ''
 
     def get_spec (self):
         return self
@@ -527,6 +535,9 @@ class Spec (object):
         class UnknownType (Exception): pass
         raise UnknownType ("Type `%s' is unknown" % type_)
 
+    def __repr__ (self):
+        return '%s(%s)' % (self.__class__.__name__, self.title)
+
 def build_dict (parent, type_, namespace, nodes):
     """Build a dictionary of D-Bus names to Python objects representing that
        name using the XML node for that item in the spec.
-- 
1.5.6.5