[robotframework] push by janne.t.harkonen - ResultWriter: public methods are now write_(robot/rebot)_results on 2011-06-15 17:34 GMT

[robotframework]

Revision: a01b08d0265c
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Wed Jun 15 10:33:59 2011
Log:      ResultWriter: public methods are now write_(robot/rebot)_results
http://code.google.com/p/robotframework/source/detail?r=a01b08d0265c
Modified:
 /src/robot/__init__.py
 /src/robot/result/resultwriter.py
 /utest/result/test_reporting.py

=======================================
--- /src/robot/__init__.py      Wed Jun 15 10:16:31 2011
+++ /src/robot/__init__.py      Wed Jun 15 10:33:59 2011
@@ -128,7 +128,7 @@
     output.close(suite)
     if settings.is_rebot_needed():
         output, settings = settings.get_rebot_datasource_and_settings()
-        ResultWriter(settings).execute(output)
+        ResultWriter(settings).write_robot_results(output)
     LOGGER.close()
     return suite

@@ -151,7 +151,7 @@
     settings = RebotSettings(options)
     LOGGER.register_console_logger(colors=settings['MonitorColors'])
     LOGGER.disable_message_cache()
-    suite = ResultWriter(settings).execute_rebot(*datasources)
+    suite = ResultWriter(settings).write_rebot_results(*datasources)
     LOGGER.close()
     return suite

=======================================
--- /src/robot/result/resultwriter.py   Wed Jun 15 10:25:36 2011
+++ /src/robot/result/resultwriter.py   Wed Jun 15 10:33:59 2011
@@ -34,7 +34,7 @@
         self._suite = None
         self._settings = settings

-    def execute(self, data_source):
+    def write_robot_results(self, data_source):
         data_model = jsparser.create_datamodel_from(data_source)
         data_model.set_generated(time.localtime())
         LogBuilder(data_model, self._settings).create()
@@ -54,9 +54,9 @@
             self._robot_test_output_cached = RobotTestOutput(self._suite,  
exec_errors, self._settings)
         return self._robot_test_output_cached

-    def execute_rebot(self, *data_sources):
+    def write_rebot_results(self, *data_sources):
         combined = self._combine_outputs(data_sources)
-        self.execute(combined)
+        self.write_robot_results(combined)
         if self._temp_file:
             os.remove(self._temp_file)
         return self._suite
=======================================
--- /utest/result/test_reporting.py     Wed Jun 15 10:16:31 2011
+++ /utest/result/test_reporting.py     Wed Jun 15 10:33:59 2011
@@ -82,31 +82,31 @@
     def test_generate_report_and_log(self):
         self._settings['Log'] = 'log.html'
         self._settings['Report'] = 'report.html'
-        self._reporter.execute(resources.GOLDEN_OUTPUT)
+        self._reporter.write_robot_results(resources.GOLDEN_OUTPUT)
         self._assert_expected_log('log.html')
         self._assert_expected_report('report.html')

     def test_no_generation(self):
-        self._reporter.execute(resources.GOLDEN_OUTPUT)
+        self._reporter.write_robot_results(resources.GOLDEN_OUTPUT)
         self._assert_no_log()
         self._assert_no_report()

     def test_only_log(self):
         self._settings['Log'] = 'only-log.html'
-        self._reporter.execute(resources.GOLDEN_OUTPUT)
+        self._reporter.write_robot_results(resources.GOLDEN_OUTPUT)
         self._assert_expected_log('only-log.html')
         self._assert_no_report()

     def test_only_report(self):
         self._settings['Report'] = 'reports-only.html'
-        self._reporter.execute(resources.GOLDEN_OUTPUT)
+        self._reporter.write_robot_results(resources.GOLDEN_OUTPUT)
         self._assert_no_log()
         self._assert_expected_report('reports-only.html')

     def test_multiple_outputs(self):
         self._settings['Log'] = 'log.html'
         self._settings['Report'] = 'report.html'
-        self._reporter.execute_rebot(*[resources.GOLDEN_OUTPUT,  
resources.GOLDEN_OUTPUT2])
+        self._reporter.write_rebot_results(*[resources.GOLDEN_OUTPUT,  
resources.GOLDEN_OUTPUT2])
         self._assert_expected_log('log.html')
         self._assert_expected_report('report.html')