2 new revisions: Revision: ec227a9cf7b3 Author: Robot Framework Developers <[email protected]> Date: Wed Dec 14 05:29:24 2011 Log: model: added default headersfor tables http://code.google.com/p/robotframework/source/detail?r=ec227a9cf7b3
Revision: 6c57d9fa91d9 Author: Robot Framework Developers <[email protected]> Date: Wed Dec 14 05:37:09 2011 Log: Automated merge with https://code.google.com/p/robotframework/ http://code.google.com/p/robotframework/source/detail?r=6c57d9fa91d9 ============================================================================== Revision: ec227a9cf7b3 Author: Robot Framework Developers <[email protected]> Date: Wed Dec 14 05:29:24 2011 Log: model: added default headersfor tables http://code.google.com/p/robotframework/source/detail?r=ec227a9cf7b3 Modified: /src/robot/parsing/model.py /src/robot/parsing/populators.py /src/robot/writer/writer.py ======================================= --- /src/robot/parsing/model.py Mon Dec 5 07:39:23 2011 +++ /src/robot/parsing/model.py Wed Dec 14 05:29:24 2011 @@ -219,10 +219,14 @@ def __init__(self, parent): self.parent = parent - self.header = None + self._header = None def set_header(self, header): - self.header = header + self._header = header + + @property + def header(self): + return self._header or [self.type.title() + 's'] @property def name(self): @@ -384,7 +388,7 @@ class TestCaseTable(_Table): - type = 'testcase' + type = 'test case' def __init__(self, parent): _Table.__init__(self, parent) @@ -401,7 +405,7 @@ return bool(self.tests) def is_started(self): - return bool(self.header) + return bool(self._header) class KeywordTable(_Table): ======================================= --- /src/robot/parsing/populators.py Sat Nov 5 17:29:09 2011 +++ /src/robot/parsing/populators.py Wed Dec 14 05:29:24 2011 @@ -44,9 +44,9 @@ class FromFilePopulator(object): _populators = {'setting': SettingTablePopulator, - 'variable': VariableTablePopulator, - 'testcase': TestTablePopulator, - 'keyword': KeywordTablePopulator} + 'variable': VariableTablePopulator, + 'test case': TestTablePopulator, + 'keyword': KeywordTablePopulator} def __init__(self, datafile): self._datafile = datafile ======================================= --- /src/robot/writer/writer.py Tue Dec 13 14:15:18 2011 +++ /src/robot/writer/writer.py Wed Dec 14 05:29:24 2011 @@ -32,11 +32,9 @@ Is also passed along to created writer for further configuration. :type serialization_context: :py:class:`SerializationContext` """ - Writer = { - 'tsv': TsvFileWriter, - 'txt': TxtFileWriter, - 'html': HtmlFileWriter - }[serialization_context.format] + Writer = {'tsv': TsvFileWriter, + 'txt': TxtFileWriter, + 'html': HtmlFileWriter}[serialization_context.format] return Writer(serialization_context) @@ -65,9 +63,8 @@ def _formatted_table(self, table): formatter = {'setting': self._formatter.setting_rows, 'variable': self._formatter.variable_rows, - 'testcase': self._formatter.test_rows, - 'keyword': self._formatter.keyword_rows - }[table.type] + 'test case': self._formatter.test_rows, + 'keyword': self._formatter.keyword_rows}[table.type] return formatter(table) def _write_header(self, table): ============================================================================== Revision: 6c57d9fa91d9 Author: Robot Framework Developers <[email protected]> Date: Wed Dec 14 05:37:09 2011 Log: Automated merge with https://code.google.com/p/robotframework/ http://code.google.com/p/robotframework/source/detail?r=6c57d9fa91d9
