2 new revisions:
Revision: 9fc2b90ecdce
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:45:32 2011
Log: jsondatamodel: genMillis needs to be long to be serialized
properly
http://code.google.com/p/robotframework/source/detail?r=9fc2b90ecdce
Revision: d2cf1e350485
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:45:49 2011
Log: resultwriter: cleanup of method names
http://code.google.com/p/robotframework/source/detail?r=d2cf1e350485
==============================================================================
Revision: 9fc2b90ecdce
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:45:32 2011
Log: jsondatamodel: genMillis needs to be long to be serialized
properly
http://code.google.com/p/robotframework/source/detail?r=9fc2b90ecdce
Modified:
/src/robot/result/jsondatamodel.py
=======================================
--- /src/robot/result/jsondatamodel.py Wed Jun 15 22:34:30 2011
+++ /src/robot/result/jsondatamodel.py Wed Jun 15 22:45:32 2011
@@ -27,8 +27,9 @@
self._set_generated(time.localtime())
def _set_generated(self, timetuple):
- millis = time.mktime(timetuple) * 1000 -
self._robot_data['baseMillis']
- self._set_attr('generatedMillis', millis)
+ genMillis = long(time.mktime(timetuple) * 1000) -\
+ self._robot_data['baseMillis']
+ self._set_attr('generatedMillis', genMillis)
self._set_attr('generatedTimestamp',
utils.format_time(timetuple, gmtsep=' '))
==============================================================================
Revision: d2cf1e350485
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:45:49 2011
Log: resultwriter: cleanup of method names
http://code.google.com/p/robotframework/source/detail?r=d2cf1e350485
Modified:
/src/robot/result/resultwriter.py
=======================================
--- /src/robot/result/resultwriter.py Wed Jun 15 22:34:30 2011
+++ /src/robot/result/resultwriter.py Wed Jun 15 22:45:49 2011
@@ -34,11 +34,10 @@
def write_robot_results(self, data_source):
data_model = jsparser.create_datamodel_from(data_source)
- LogBuilder(data_model, self._settings).create()
- data_model.remove_keywords()
- ReportBuilder(data_model, self._settings).create()
+ LogBuilder(data_model, self._settings).build()
+ ReportBuilder(data_model, self._settings).build()
XUnitBuilder(self._result_from_xml([data_source]),
- self._settings).create()
+ self._settings).build()
def _result_from_xml(self, data_sources):
if not self._xml_result:
@@ -50,22 +49,22 @@
def write_rebot_results(self, *data_sources):
builder = OutputBuilder(self._result_from_xml(data_sources),
self._settings)
- self.write_robot_results(builder.create())
+ self.write_robot_results(builder.build())
builder.finalize()
return self._suite
class _Builder(object):
- def __init__(self, data_model, settings):
+ def __init__(self, data, settings):
self._settings = settings
+ self._data = data
self._path = self._parse_file(self._type)
- self._data_model = data_model
-
- def create(self):
+
+ def build(self):
if self._path:
- self._data_model.set_settings(self._get_settings())
- self._create()
+ self._data.set_settings(self._get_settings())
+ self._build()
LOGGER.output_file(self._type, self._path)
def _parse_file(self, name):
@@ -81,8 +80,8 @@
class LogBuilder(_Builder):
_type = 'Log'
- def _create(self):
- serialize_log(self._data_model, self._path)
+ def _build(self):
+ serialize_log(self._data, self._path)
def _get_settings(self):
return {
@@ -95,8 +94,9 @@
class ReportBuilder(_Builder):
_type = 'Report'
- def _create(self):
- serialize_report(self._data_model, self._path)
+ def _build(self):
+ self._data.remove_keywords()
+ serialize_report(self._data, self._path)
def _get_settings(self):
return {
@@ -123,9 +123,9 @@
_type = 'Output'
_temp_file = None
- def create(self):
+ def build(self):
output_file = self._output_file()
- self._data_model.serialize_output(output_file, log=not
self._temp_file)
+ self._data.serialize_output(output_file, log=not self._temp_file)
return output_file
def _output_file(self):
@@ -144,9 +144,9 @@
class XUnitBuilder(_Builder):
_type = 'XUnitFile'
- def create(self):
+ def build(self):
if self._path:
- self._data_model.serialize_xunit(self._path)
+ self._data.serialize_xunit(self._path)
class ResultFromXML(object):
