Author: jprantan
Date: Mon Apr 6 05:28:47 2009
New Revision: 1689
Modified:
trunk/src/robot/common/model.py
trunk/src/robot/common/statistics.py
trunk/src/robot/output/xmllogger.py
trunk/src/robot/serializing/logserializers.py
trunk/src/robot/serializing/reportserializers.py
trunk/src/robot/serializing/statserializers.py
trunk/utest/common/test_baseobjects.py
Log:
changed attribute order in get_long_name and removed medium_name
Modified: trunk/src/robot/common/model.py
==============================================================================
--- trunk/src/robot/common/model.py (original)
+++ trunk/src/robot/common/model.py Mon Apr 6 05:28:47 2009
@@ -36,14 +36,12 @@
return utils.html_escape(self.doc, formatting=True)
if name == 'longname':
return self.get_long_name()
- if name == 'mediumname':
- return self.get_medium_name()
raise AttributeError("%s does not have attribute '%s'"
% (self.__class__.__name__, name))
- def get_long_name(self, separator='.', split_level=-1):
+ def get_long_name(self, split_level=-1, separator='.'):
"""Returns long name. If separator is None, list of names is
returned."""
- names = self.parent is not None and
self.parent.get_long_name(None) or []
+ names = self.parent and self.parent.get_long_name(separator=None)
or []
names.append(self.name)
slice_level = self._get_name_slice_index(len(names), split_level)
if split_level >= 0 and len(names) > slice_level:
@@ -54,11 +52,6 @@
def _get_name_slice_index(self, name_parts_count, split_level):
return split_level
-
- def get_medium_name(self, separator='.', split_level=-1):
- tokens = self.get_long_name(separator=None,
split_level=split_level)
- tokens[:-1] = [ t[0].lower() for t in tokens[:-1] ]
- return separator.join(tokens)
def _set_teardown_fail_msg(self, message):
if self.message == '':
Modified: trunk/src/robot/common/statistics.py
==============================================================================
--- trunk/src/robot/common/statistics.py (original)
+++ trunk/src/robot/common/statistics.py Mon Apr 6 05:28:47 2009
@@ -79,10 +79,10 @@
self.get_long_name = suite.get_long_name
def get_doc(self, split_level=-1):
- return self.get_long_name(split_level=split_level)
+ return self.get_long_name(split_level)
def get_link(self, split_level=-1):
- return self.get_long_name(split_level=split_level)
+ return self.get_long_name(split_level)
def serialize(self, serializer):
serializer.suite_stat(self)
Modified: trunk/src/robot/output/xmllogger.py
==============================================================================
--- trunk/src/robot/output/xmllogger.py (original)
+++ trunk/src/robot/output/xmllogger.py Mon Apr 6 05:28:47 2009
@@ -173,7 +173,7 @@
self._stat(stat)
def suite_stat(self, stat):
- self._stat(stat, stat.get_long_name(split_level=self._split_level))
+ self._stat(stat, stat.get_long_name(self._split_level))
def tag_stat(self, stat):
self._stat(stat, attrs={'info': self._get_tag_stat_info(stat)})
Modified: trunk/src/robot/serializing/logserializers.py
==============================================================================
--- trunk/src/robot/serializing/logserializers.py (original)
+++ trunk/src/robot/serializing/logserializers.py Mon Apr 6 05:28:47 2009
@@ -87,7 +87,7 @@
label = type_ == 'suite' and 'TEST SUITE: '
or 'TEST CASE: '
self._writer.element('span', label, {'class': item.status.lower()},
escape=False)
- name = item.get_long_name(split_level=self._split_level)
+ name = item.get_long_name(self._split_level)
self._writer.element('a', item.name, {'name': '%s_%s' % (type_,
name),
'class': 'name', 'title':
name})
self._writer.end_many(['td', 'tr'])
Modified: trunk/src/robot/serializing/reportserializers.py
==============================================================================
--- trunk/src/robot/serializing/reportserializers.py (original)
+++ trunk/src/robot/serializing/reportserializers.py Mon Apr 6 05:28:47
2009
@@ -170,7 +170,7 @@
def _set_split_link(self, item):
item.linkpath = self._split_loglink
- item.linkname = item.get_long_name(split_level=self._split_level)
+ item.linkname = item.get_long_name(self._split_level)
class TagDetailsSerializer(_TableHelper):
Modified: trunk/src/robot/serializing/statserializers.py
==============================================================================
--- trunk/src/robot/serializing/statserializers.py (original)
+++ trunk/src/robot/serializing/statserializers.py Mon Apr 6 05:28:47 2009
@@ -77,7 +77,7 @@
self._writer.content(stat.name)
def _write_suite_stat_name(self, stat):
- tokens = stat.get_long_name(separator=None,
split_level=self._split_level)
+ tokens = stat.get_long_name(self._split_level, separator=None)
if len(tokens) > 1:
self._writer.element('span', ' . '.join(tokens[:-1]+['']),
{'class': 'parent_name'}, newline=False)
Modified: trunk/utest/common/test_baseobjects.py
==============================================================================
--- trunk/utest/common/test_baseobjects.py (original)
+++ trunk/utest/common/test_baseobjects.py Mon Apr 6 05:28:47 2009
@@ -43,15 +43,15 @@
'Root.Sub1.Sub11.T11')
def test_get_long_name_for_test_with_non_default_separator(self):
-
assert_equals(self.suite.suites[0].suites[0].tests[0].get_long_name('|'),
+
assert_equals(self.suite.suites[0].suites[0].tests[0].get_long_name(separator='|'),
'Root|Sub1|Sub11|T11')
def test_get_long_name_for_sub_suite_with_parts(self):
- assert_equals(self.suite.suites[0].get_long_name(None),
+ assert_equals(self.suite.suites[0].get_long_name(separator=None),
['Root', 'Sub1'])
def test_get_long_name_for_test_with_parts(self):
-
assert_equals(self.suite.suites[0].suites[0].tests[0].get_long_name(None),
+
assert_equals(self.suite.suites[0].suites[0].tests[0].get_long_name(separator=None),
['Root', 'Sub1', 'Sub11', 'T11'])
def test_get_long_name_for_sub_suite_with_split_level_smaller(self):
