3 new revisions: Revision: 03ca94097771 Author: Mikko Korpela <[email protected]> Date: Wed Nov 16 21:36:42 2011 Log: jsondatamodelhandlers:cleanup http://code.google.com/p/robotframework/source/detail?r=03ca94097771
Revision: 420095fedc83 Author: Mikko Korpela <[email protected]> Date: Wed Nov 16 21:39:50 2011 Log: jsondatamodelhandlers: _id_html http://code.google.com/p/robotframework/source/detail?r=420095fedc83 Revision: 9327d1def085 Author: Mikko Korpela <[email protected]> Date: Mon Nov 21 01:45:29 2011 Log: Automated merge with https://code.google.com/p/robotframework/ http://code.google.com/p/robotframework/source/detail?r=9327d1def085 ============================================================================== Revision: 03ca94097771 Author: Mikko Korpela <[email protected]> Date: Wed Nov 16 21:36:42 2011 Log: jsondatamodelhandlers:cleanup http://code.google.com/p/robotframework/source/detail?r=03ca94097771 Modified: /src/robot/result/jsondatamodelhandlers.py ======================================= --- /src/robot/result/jsondatamodelhandlers.py Wed Nov 16 12:04:48 2011 +++ /src/robot/result/jsondatamodelhandlers.py Wed Nov 16 21:36:42 2011 @@ -63,18 +63,12 @@ def _status(self, item): return StatusHandler(self._context).build(item) - def end_element(self, text): - return self._data_from_children - def _id(self, item): return self._context.get_id(item) def _timestamp(self, time_string): return self._context.timestamp(time_string) - def _get_ids(self, *items): - return [self._get_id(i) for i in items] - class ExecutionResultHandler(_Handler): @@ -255,8 +249,10 @@ LEVELS[message.level], self._format_message_text(message)] self._handle_warning_linking(msg, message) - # FIXME: WTF? linking doesn't work without this late _id thing in - # test_reporting . test_split_tests + # linking doesn't work without this late _id thing + # because the text id:s are different in errors + # than in the target test + # when texts have been split with splitlog option msg[2] = self._id(msg[2]) return msg ============================================================================== Revision: 420095fedc83 Author: Mikko Korpela <[email protected]> Date: Wed Nov 16 21:39:50 2011 Log: jsondatamodelhandlers: _id_html http://code.google.com/p/robotframework/source/detail?r=420095fedc83 Modified: /src/robot/result/jsondatamodelhandlers.py ======================================= --- /src/robot/result/jsondatamodelhandlers.py Wed Nov 16 21:36:42 2011 +++ /src/robot/result/jsondatamodelhandlers.py Wed Nov 16 21:39:50 2011 @@ -63,8 +63,11 @@ def _status(self, item): return StatusHandler(self._context).build(item) - def _id(self, item): - return self._context.get_id(item) + def _id(self, text): + return self._context.get_id(text) + + def _id_html(self, text): + return self._id(utils.html_format(text)) def _timestamp(self, time_string): return self._context.timestamp(time_string) @@ -154,7 +157,7 @@ return [self._id(suite.name), self._id(suite.source), self._id(self._context.get_rel_log_path(suite.source)), - self._id(utils.html_format(suite.doc)), + self._id_html(suite.doc), self._metadata(suite), self._status(suite), self._suites, @@ -186,7 +189,7 @@ return [self._id(test.name), self._id(test.timeout), critical, - self._id(utils.html_format(test.doc)), + self._id_html(test.doc), [self._id(tag) for tag in test.tags], self._status(test), self._keywords] @@ -204,7 +207,7 @@ return [self._types[keyword.type], self._id(keyword.name), self._id(keyword.timeout), - self._id(utils.html_format(keyword.doc)), + self._id_html(keyword.doc), self._id(', '.join(keyword.args)), self._status(keyword), self._keywords, @@ -222,7 +225,7 @@ return [KeywordHandler._types[keyword.type], self._id(keyword.name), self._id(keyword.timeout), - self._id(utils.html_format(keyword.doc)), + self._id_html(keyword.doc), self._id(', '.join(keyword.args)), self._status(keyword), self._keywords, ============================================================================== Revision: 9327d1def085 Author: Mikko Korpela <[email protected]> Date: Mon Nov 21 01:45:29 2011 Log: Automated merge with https://code.google.com/p/robotframework/ http://code.google.com/p/robotframework/source/detail?r=9327d1def085
