Changeset 80:742f4386e51c

Timestamp:

11/13/08 07:31:16 (21 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Branch:

default

Message:

Fix tests and examples for the latests changes

Files:

• examples/demo_chart.py (modified) (1 diff)
• examples/demo_context.py (modified) (1 diff)
• examples/demo_odf.py (modified) (1 diff)
• relatorio/templates/__init__.py (modified) (1 diff)
• relatorio/tests/test_api.py (modified) (4 diffs)
• relatorio/tests/test_odt.py (modified) (1 diff)

examples/demo_chart.py

@@ -8 +8 @@
 
 if __name__ == '__main__':
-    pie_report, _ = repos.reports[Invoice]['pie']
+    pie_report, _ = repos.classes[Invoice].ids['pie']
     file('pie.png', 'wb').write(pie_report(o=inv).render().getvalue())
-    hbar_report, _ = repos.reports[Invoice]['hbar']
+    hbar_report, _ = repos.classes[Invoice].ids['hbar']
     file('hbar.svg', 'wb').write(hbar_report(o=inv).render().getvalue())
-    vbar_report, _ = repos.reports[Invoice]['vbar']
+    vbar_report, _ = repos.classes[Invoice].ids['vbar']
     file('vbar.svg', 'wb').write(vbar_report(o=inv).render().getvalue())
-    line_report, _ = repos.reports[Invoice]['line']
+    line_report, _ = repos.classes[Invoice].ids['line']
     file('line.png', 'wb').write(line_report(o=inv).render().getvalue())

examples/demo_context.py

@@ -6 +6 @@
 #PDF
 if __name__ == '__main__':
-    pdf_report, _ = repos.reports[Invoice]['ConTeXt']
+    pdf_report, _ = repos.classes[Invoice].ids['ConTeXt']
     file('bonham_basic.pdf', 'wb').write(pdf_report(o=inv).render().getvalue())
 

examples/demo_odf.py

@@ -14 +14 @@
 if __name__ == '__main__':
     # Add a chart to the invoice
-    inv['chart'] = repos.reports[Invoice]['pie']
+    inv['chart'] = repos.classes[Invoice].ids['pie']
 
     # ODT
-    basic_report, _ = repos.reports[Invoice]['basic']
+    basic_report, _ = repos.classes[Invoice].ids['basic']
     file('bonham_basic.odt', 'wb').write(basic_report(o=inv).render().getvalue())
-    report, _ = repos.reports[Invoice]['complicated']
+    report, _ = repos.classes[Invoice].ids['complicated']
     file('bonham_complicated.odt', 'wb').write(report(o=inv).render().getvalue())
 
     # ODS
-    ods_report, _ = repos.reports[Invoice]['pivot']
+    ods_report, _ = repos.classes[Invoice].ids['pivot']
     file('bonham_pivot.ods', 'wb').write(ods_report(o=inv).render().getvalue())
 
     # ODP
-    odp_report, _ = repos.reports[Invoice]['presentation']
+    odp_report, _ = repos.classes[Invoice].ids['presentation']
     file('bonham_presentation.odp', 'wb').write(odp_report(o=inv).render().getvalue())

relatorio/templates/__init__.py

@@ -21 +21 @@
 import warnings
 
-plugins = ['opendocument', 'pdf', 'chart']
+plugins = ['base', 'opendocument', 'pdf', 'chart']
 
 for name in plugins:

relatorio/tests/test_api.py

@@ -23 +23 @@
 from nose.tools import *
 
-from reporting import (ReportRepository, Report, MIMETemplateLoader,
-                       DefaultFactory, _absolute, _guess_type)
+from relatorio.reporting import (ReportRepository, Report, MIMETemplateLoader,
+                                 DefaultFactory, _absolute, _guess_type)
 
 
@@ -33 +33 @@
             setattr(self, key, val)
 
-def setup():
-    MIMETemplateLoader.load_template_engines()
 
 class TestRepository(object):
@@ -44 +42 @@
                              os.path.join('templates', 'test.tmpl'))
 
-        assert_true(StubObject in reporting.reports)
-        assert_true('default' in reporting.reports[StubObject])
-        assert_true('text/plain' in reporting.reports[StubObject])
+        assert_true(StubObject in reporting.classes)
+        assert_true('default' in reporting.classes[StubObject].ids)
+        assert_true('text/plain' in reporting.classes[StubObject].mimetypes)
 
-        report, mime = reporting.reports[StubObject]['default']
+        report, mime = reporting.classes[StubObject].ids['default']
         eq_(mime, 'text/plain')
         eq_(report.mimetype, 'text/plain')
@@ -54 +52 @@
                                                        'test.tmpl')))
 
-        report2, name = reporting.reports[StubObject]['text/plain'][0]
+        report2, name = reporting.classes[StubObject].mimetypes['text/plain'][0]
         eq_(name, 'default')
         eq_(report, report2)

relatorio/tests/test_odt.py

@@ -81 +81 @@
         <text:a xlink:href="relatorio://foo">foo</text:a>
         </b:a>''' % 'urn:text'
-        parsed = self.oot.add_directives(xml) 
+        parsed = self.oot.insert_directives(xml) 
         root = lxml.etree.parse(StringIO(xml)).getroot()
         root_parsed = lxml.etree.parse(parsed).getroot()