2 new revisions:
Revision: e4025248ca8a
Author: Pekka Klärck
Date: Thu Dec 1 03:51:03 2011
Log: dead code and todo
http://code.google.com/p/robotframework/source/detail?r=e4025248ca8a
Revision: cc1b4680c838
Author: Pekka Klärck
Date: Thu Dec 1 04:11:16 2011
Log: removed TestSuite's stat_messge, critical_stats, and all_stats in
favo...
http://code.google.com/p/robotframework/source/detail?r=cc1b4680c838
==============================================================================
Revision: e4025248ca8a
Author: Pekka Klärck
Date: Thu Dec 1 03:51:03 2011
Log: dead code and todo
http://code.google.com/p/robotframework/source/detail?r=e4025248ca8a
Modified:
/src/robot/common/statistics.py
=======================================
--- /src/robot/common/statistics.py Fri Nov 11 04:02:55 2011
+++ /src/robot/common/statistics.py Thu Dec 1 03:51:03 2011
@@ -29,7 +29,6 @@
self.total = TotalStatistics(self.suite)
self.tags.sort()
- #TODO: Replace with visit
def serialize(self, serializer):
serializer.start_statistics(self)
self.total.serialize(serializer)
@@ -37,9 +36,6 @@
self.suite.serialize(serializer)
serializer.end_statistics(self)
- def visit(self, visitor):
- self.serialize(visitor)
-
class Stat:
==============================================================================
Revision: cc1b4680c838
Author: Pekka Klärck
Date: Thu Dec 1 04:11:16 2011
Log: removed TestSuite's stat_messge, critical_stats, and all_stats in
favor of statistics.message, statistics.critical,and statistics.all.
http://code.google.com/p/robotframework/source/detail?r=cc1b4680c838
Modified:
/src/robot/model/totalstatistics.py
/src/robot/result/executionresult.py
/src/robot/result/testsuite.py
/utest/result/test_resultbuilder.py
/utest/result/test_resultmodel.py
=======================================
--- /src/robot/model/totalstatistics.py Fri Nov 18 14:38:12 2011
+++ /src/robot/model/totalstatistics.py Thu Dec 1 04:11:16 2011
@@ -28,10 +28,8 @@
def __iter__(self):
return iter([self.critical, self.all])
- def __unicode__(self):
- return unicode(str(self))
-
- def __str__(self):
+ @property
+ def message(self):
ctotal, cend, cpass, cfail = self._get_counts(self.critical)
atotal, aend, apass, afail = self._get_counts(self.all)
return ('%d critical test%s, %d passed, %d failed\n'
@@ -43,7 +41,6 @@
return stat.total, ending, stat.passed, stat.failed
-
class TotalStatisticsBuilder(SuiteVisitor):
def __init__(self, suite=None):
=======================================
--- /src/robot/result/executionresult.py Mon Nov 14 03:46:38 2011
+++ /src/robot/result/executionresult.py Thu Dec 1 04:11:16 2011
@@ -35,7 +35,7 @@
@property
def return_code(self):
if self.should_return_status_rc:
- return min(self.suite.critical_stats.failed, 250)
+ return min(self.suite.statistics.critical.failed, 250)
return 0
def configure(self, status_rc=True, **suite_opts):
=======================================
--- /src/robot/result/testsuite.py Fri Nov 18 14:38:12 2011
+++ /src/robot/result/testsuite.py Thu Dec 1 04:11:16 2011
@@ -34,34 +34,17 @@
@property
def status(self):
- return 'PASS' if not self.critical_stats.failed else 'FAIL'
+ return 'FAIL' if self.statistics.critical.failed else 'PASS'
@property
def statistics(self):
return TotalStatisticsBuilder(self).stats
- # TODO:
- # 1) Remove critical_stats and all_stats in favor of new
self.statistics.xxx
- # 2) Consider removing stat_message in favor of
unicode(self.statistics)
-
- @property
- def stat_message(self):
- return unicode(self.statistics)
-
@property
def full_message(self):
- stat_msg = unicode(self.statistics)
if not self.message:
- return stat_msg
- return '%s\n\n%s' % (self.message, stat_msg)
-
- @property
- def critical_stats(self):
- return self.statistics.critical
-
- @property
- def all_stats(self):
- return self.statistics.all
+ return self.statistics.message
+ return '%s\n\n%s' % (self.message, self.statistics.message)
@property
def elapsedtime(self):
=======================================
--- /utest/result/test_resultbuilder.py Fri Nov 18 00:40:53 2011
+++ /utest/result/test_resultbuilder.py Thu Dec 1 04:11:16 2011
@@ -37,10 +37,10 @@
assert_equals(self._suite.status, 'PASS')
assert_equals(self._suite.starttime, '20111024 13:41:20.873')
assert_equals(self._suite.endtime, '20111024 13:41:20.952')
- assert_equals(self._suite.critical_stats.passed, 1)
- assert_equals(self._suite.critical_stats.failed, 0)
- assert_equals(self._suite.all_stats.passed, 1)
- assert_equals(self._suite.all_stats.failed, 0)
+ assert_equals(self._suite.statistics.critical.passed, 1)
+ assert_equals(self._suite.statistics.critical.failed, 0)
+ assert_equals(self._suite.statistics.all.passed, 1)
+ assert_equals(self._suite.statistics.all.failed, 0)
def test_testcase_is_built(self):
assert_equals(self._test.name, 'First One')
=======================================
--- /utest/result/test_resultmodel.py Mon Nov 28 06:07:42 2011
+++ /utest/result/test_resultmodel.py Thu Dec 1 04:11:16 2011
@@ -8,17 +8,17 @@
def test_stats(self):
suite = self._create_suite_with_tests()
- assert_equal(suite.critical_stats.passed, 2)
- assert_equal(suite.critical_stats.failed, 1)
- assert_equal(suite.all_stats.passed, 3)
- assert_equal(suite.all_stats.failed, 2)
+ assert_equal(suite.statistics.critical.passed, 2)
+ assert_equal(suite.statistics.critical.failed, 1)
+ assert_equal(suite.statistics.all.passed, 3)
+ assert_equal(suite.statistics.all.failed, 2)
def test_nested_suite_stats(self):
suite = self._create_nested_suite_with_tests()
- assert_equal(suite.critical_stats.passed, 4)
- assert_equal(suite.critical_stats.failed, 2)
- assert_equal(suite.all_stats.passed, 6)
- assert_equal(suite.all_stats.failed, 4)
+ assert_equal(suite.statistics.critical.passed, 4)
+ assert_equal(suite.statistics.critical.failed, 2)
+ assert_equal(suite.statistics.all.passed, 6)
+ assert_equal(suite.statistics.all.failed, 4)
def test_test_count(self):
suite = self._create_nested_suite_with_tests()
