2 new revisions:
Revision: e826be166382
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 14 04:41:32 2011
Log: Split statistics into smaller modules
http://code.google.com/p/robotframework/source/detail?r=e826be166382
Revision: dd33576efbe5
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 14 04:42:45 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=dd33576efbe5
==============================================================================
Revision: e826be166382
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 14 04:41:32 2011
Log: Split statistics into smaller modules
http://code.google.com/p/robotframework/source/detail?r=e826be166382
Added:
/src/robot/model/stats.py
/src/robot/model/suitestatistics.py
/src/robot/model/tagstatistics.py
/src/robot/model/totalstatistics.py
Modified:
/src/robot/model/statistics.py
/utest/model/test_statistics.py
=======================================
--- /dev/null
+++ /src/robot/model/stats.py Mon Nov 14 04:41:32 2011
@@ -0,0 +1,138 @@
+# Copyright 2008-2011 Nokia Siemens Networks Oyj
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+class Stat(object):
+
+ def __init__(self, name=''):
+ self.name = name
+ self.passed = 0
+ self.failed = 0
+
+ @property
+ def _default_attrs(self):
+ return {'pass': str(self.passed),
+ 'fail': str(self.failed)}
+
+ @property
+ def total(self):
+ return self.passed + self.failed
+
+ def add_stat(self, other):
+ self.passed += other.passed
+ self.failed += other.failed
+
+ def add_test(self, test):
+ if test.status == 'PASS':
+ self.passed += 1
+ else:
+ self.failed += 1
+
+ def fail_all(self):
+ self.failed += self.passed
+ self.passed = 0
+
+ def add_suite(self, suite):
+ for test in suite.tests:
+ if self._is_included(test):
+ self.add_test(test)
+ for suite in suite.suites:
+ self.add_stat(self._subsuite_stats(suite))
+
+ def _is_included(self, test):
+ return True
+
+ def _subsuite_stats(self, suite):
+ return suite.all_stats
+
+ def __cmp__(self, other):
+ return cmp(self.name, other.name)
+
+ def __nonzero__(self):
+ return self.failed == 0
+
+ def visit(self, visitor):
+ visitor.visit_stat(self)
+
+
+class SuiteStat(Stat):
+ type = 'suite'
+
+ def __init__(self, suite):
+ Stat.__init__(self, suite.longname)
+ self.id = suite.id
+ self._attrs = {'name': suite.name, 'idx': suite.id}
+
+ @property
+ def attrs(self):
+ return dict(self._default_attrs, **self._attrs) # TODO: idx -> id
+
+
+class TagStat(Stat):
+ type = 'tag'
+
+ def __init__(self, name, doc='', links=[], critical=False,
+ non_critical=False, combined=''):
+ Stat.__init__(self, name)
+ self.doc = doc
+ self.links = links
+ self.critical = critical
+ self.non_critical = non_critical
+ self.combined = combined
+ self.tests = []
+
+ @property
+ def attrs(self):
+ return dict(self._default_attrs, info=self._info,
links=self._links,
+ doc=self.doc, combined=self.combined)
+
+ @property
+ def _info(self):
+ if self.critical:
+ return 'critical'
+ if self.non_critical:
+ return 'non-critical'
+ if self.combined:
+ return 'combined'
+ return ''
+
+ @property
+ def _links(self):
+ return ':::'.join(':'.join([title, url]) for url, title in
self.links)
+
+ def add_test(self, test):
+ Stat.add_test(self, test)
+ self.tests.append(test)
+
+ def __cmp__(self, other):
+ if self.critical != other.critical:
+ return cmp(other.critical, self.critical)
+ if self.non_critical != other.non_critical:
+ return cmp(other.non_critical, self.non_critical)
+ if bool(self.combined) != bool(other.combined):
+ return cmp(bool(other.combined), bool(self.combined))
+ return cmp(self.name, other.name)
+
+
+class TotalStat(Stat):
+ type = 'total'
+
+ def __init__(self, name, suite_stat):
+ Stat.__init__(self, name)
+ self.passed = suite_stat.passed
+ self.failed = suite_stat.failed
+
+ @property
+ def attrs(self):
+ return self._default_attrs
=======================================
--- /dev/null
+++ /src/robot/model/suitestatistics.py Mon Nov 14 04:41:32 2011
@@ -0,0 +1,37 @@
+# Copyright 2008-2011 Nokia Siemens Networks Oyj
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from robot.model.stats import SuiteStat
+
+
+class SuiteStatistics(object):
+
+ def __init__(self, suite):
+ self.all = SuiteStat(suite)
+ self.critical = SuiteStat(suite)
+ self.suites = []
+
+ def add_test(self, test):
+ self.all.add_test(test)
+ if test.critical == 'yes':
+ self.critical.add_test(test)
+
+ def visit(self, visitor):
+ visitor.visit_suite_statistics(self)
+
+ def __iter__(self):
+ yield self.all
+ for s in self.suites:
+ for stat in s:
+ yield stat
=======================================
--- /dev/null
+++ /src/robot/model/tagstatistics.py Mon Nov 14 04:41:32 2011
@@ -0,0 +1,159 @@
+# Copyright 2008-2011 Nokia Siemens Networks Oyj
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import re
+
+from robot.model.tags import TagPatterns
+from robot.model.stats import TagStat
+from robot import utils
+
+
+class TagStatistics(object):
+
+ def __init__(self, include=None, exclude=None, combine=None, docs=None,
+ links=None):
+ self.stats = utils.NormalizedDict(ignore=['_'])
+ self._include = TagPatterns(include)
+ self._exclude = TagPatterns(exclude)
+ self._info = TagStatInfo(docs or [], links or [])
+ self._combine = self._create_combined(combine or [])
+
+ def _create_combined(self, combines):
+ combines = [CombinedTag(pattern, name) for pattern, name in
combines]
+ for comb in combines:
+ self.stats[comb.name] = TagStat(comb.name,
+ self._info.get_doc(comb.name),
+
self._info.get_links(comb.name),
+ combined=comb.pattern)
+ return combines
+
+ def add_test(self, test, critical):
+ self._add_tags_statistics(test, critical)
+ self._add_combined_statistics(test)
+
+ def _add_tags_statistics(self, test, critical):
+ for tag in test.tags:
+ if not self._is_included(tag):
+ continue
+ if tag not in self.stats:
+ self.stats[tag] = TagStat(tag,
+ self._info.get_doc(tag),
+ self._info.get_links(tag),
+ critical.is_critical(tag),
+ critical.is_non_critical(tag))
+ self.stats[tag].add_test(test)
+
+ def _is_included(self, tag):
+ if self._include and not self._include.match(tag):
+ return False
+ return not self._exclude.match(tag)
+
+ def _add_combined_statistics(self, test):
+ for comb in self._combine:
+ if comb.match(test.tags):
+ self.stats[comb.name].add_test(test)
+
+ def visit(self, visitor):
+ visitor.visit_tag_statistics(self)
+
+ def __iter__(self):
+ return iter(sorted(self.stats.values()))
+
+ def sort(self):
+ # TODO: Is this needed?
+ for stat in self.stats.values():
+ stat.tests.sort()
+
+
+class CombinedTag(object):
+
+ def __init__(self, pattern, name):
+ self.pattern = pattern
+ self._matcher = TagPatterns(pattern)
+ self.name = name or pattern
+
+ def match(self, tags):
+ return self._matcher.match(tags)
+
+
+class TagStatInfo(object):
+
+ def __init__(self, docs, links):
+ self._docs = [TagStatDoc(*doc) for doc in docs]
+ self._links = [TagStatLink(*link) for link in links]
+
+ def get_doc(self, tag):
+ return ' & '.join(doc.text for doc in self._docs if
doc.matches(tag))
+
+ def get_links(self, tag):
+ return [link.get_link(tag) for link in self._links if
link.matches(tag)]
+
+
+class TagStatDoc(object):
+
+ def __init__(self, pattern, doc):
+ self.text = doc
+ self._pattern = TagPatterns(pattern)
+
+ def matches(self, tag):
+ return self._pattern.match(tag)
+
+
+class TagStatLink(object):
+ _match_pattern_tokenizer = re.compile('(\*|\?)')
+
+ def __init__(self, pattern, link, title):
+ self._regexp = self._get_match_regexp(pattern)
+ self._link = link
+ self._title = title.replace('_', ' ')
+
+ def matches(self, tag):
+ return self._regexp.match(tag) is not None
+
+ def get_link(self, tag):
+ match = self._regexp.match(tag)
+ if not match:
+ return None
+ link, title = self._replace_groups(self._link, self._title, match)
+ return link, title
+
+ def _replace_groups(self, link, title, match):
+ for index, group in enumerate(match.groups()):
+ placefolder = '%' + str(index+1)
+ link = link.replace(placefolder, group)
+ title = title.replace(placefolder, group)
+ return link, title
+
+ def _get_match_regexp(self, pattern):
+ regexp = []
+ open_parenthesis = False
+ for token in self._match_pattern_tokenizer.split(pattern):
+ if token == '':
+ continue
+ if token == '?':
+ if not open_parenthesis:
+ regexp.append('(')
+ open_parenthesis = True
+ regexp.append('.')
+ continue
+ if open_parenthesis:
+ regexp.append(')')
+ open_parenthesis = False
+ if token == '*':
+ regexp.append('(.*)')
+ continue
+ regexp.append(re.escape(token))
+ if open_parenthesis:
+ regexp.append(')')
+ return re.compile('^%s$' % ''.join(regexp), re.IGNORECASE)
=======================================
--- /dev/null
+++ /src/robot/model/totalstatistics.py Mon Nov 14 04:41:32 2011
@@ -0,0 +1,28 @@
+# Copyright 2008-2011 Nokia Siemens Networks Oyj
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from robot.model.stats import TotalStat
+
+
+class TotalStatistics(object):
+
+ def __init__(self, suite):
+ self.critical = TotalStat('Critical Tests', suite.critical)
+ self.all = TotalStat('All Tests', suite.all)
+
+ def visit(self, visitor):
+ visitor.visit_total_statistics(self)
+
+ def __iter__(self):
+ return iter([self.critical, self.all])
=======================================
--- /src/robot/model/statistics.py Mon Nov 14 03:46:38 2011
+++ /src/robot/model/statistics.py Mon Nov 14 04:41:32 2011
@@ -12,11 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import re
-
-from robot import utils
+from robot.model.tagstatistics import TagStatistics
+from robot.model.suitestatistics import SuiteStatistics
+from robot.model.totalstatistics import TotalStatistics
from robot.result.visitor import SuiteVisitor
-from robot.model.tags import TagPatterns
class Statistics(object):
@@ -63,303 +62,3 @@
def visit_test(self, test):
self._current_suite_stat.add_test(test)
self._tag_stats.add_test(test, self._current_suite.critical)
-
-
-class SuiteStatistics(object):
-
- def __init__(self, suite):
- self.all = SuiteStat(suite)
- self.critical = SuiteStat(suite)
- self.suites = []
-
- def add_test(self, test):
- self.all.add_test(test)
- if test.critical == 'yes':
- self.critical.add_test(test)
-
- def visit(self, visitor):
- visitor.visit_suite_statistics(self)
-
- def __iter__(self):
- yield self.all
- for s in self.suites:
- for stat in s:
- yield stat
-
-
-class Stat(object):
-
- def __init__(self, name=''):
- self.name = name
- self.passed = 0
- self.failed = 0
-
- @property
- def _default_attrs(self):
- return {'pass': str(self.passed),
- 'fail': str(self.failed)}
-
- @property
- def total(self):
- return self.passed + self.failed
-
- def add_stat(self, other):
- self.passed += other.passed
- self.failed += other.failed
-
- def add_test(self, test):
- if test.status == 'PASS':
- self.passed += 1
- else:
- self.failed += 1
-
- def fail_all(self):
- self.failed += self.passed
- self.passed = 0
-
- def add_suite(self, suite):
- for test in suite.tests:
- if self._is_included(test):
- self.add_test(test)
- for suite in suite.suites:
- self.add_stat(self._subsuite_stats(suite))
-
- def _is_included(self, test):
- return True
-
- def _subsuite_stats(self, suite):
- return suite.all_stats
-
- def __cmp__(self, other):
- return cmp(self.name, other.name)
-
- def __nonzero__(self):
- return self.failed == 0
-
- def visit(self, visitor):
- visitor.visit_stat(self)
-
-
-class SuiteStat(Stat):
- type = 'suite'
-
- def __init__(self, suite):
- Stat.__init__(self, suite.longname)
- self.id = suite.id
- self._attrs = {'name': suite.name, 'idx': suite.id}
-
- @property
- def attrs(self):
- return dict(self._default_attrs, **self._attrs) # TODO: idx -> id
-
-
-class TagStat(Stat):
- type = 'tag'
-
- def __init__(self, name, doc='', links=[], critical=False,
- non_critical=False, combined=''):
- Stat.__init__(self, name)
- self.doc = doc
- self.links = links
- self.critical = critical
- self.non_critical = non_critical
- self.combined = combined
- self.tests = []
-
- @property
- def attrs(self):
- return dict(self._default_attrs, info=self._info,
links=self._links,
- doc=self.doc, combined=self.combined)
-
- @property
- def _info(self):
- if self.critical:
- return 'critical'
- if self.non_critical:
- return 'non-critical'
- if self.combined:
- return 'combined'
- return ''
-
- @property
- def _links(self):
- return ':::'.join(':'.join([title, url]) for url, title in
self.links)
-
- def add_test(self, test):
- Stat.add_test(self, test)
- self.tests.append(test)
-
- def __cmp__(self, other):
- if self.critical != other.critical:
- return cmp(other.critical, self.critical)
- if self.non_critical != other.non_critical:
- return cmp(other.non_critical, self.non_critical)
- if bool(self.combined) != bool(other.combined):
- return cmp(bool(other.combined), bool(self.combined))
- return cmp(self.name, other.name)
-
-
-class TotalStat(Stat):
- type = 'total'
-
- def __init__(self, name, suite_stat):
- Stat.__init__(self, name)
- self.passed = suite_stat.passed
- self.failed = suite_stat.failed
-
- @property
- def attrs(self):
- return self._default_attrs
-
-
-class CombinedTag(object):
-
- def __init__(self, pattern, name):
- self.pattern = pattern
- self._matcher = TagPatterns(pattern)
- self.name = name or pattern
-
- def match(self, tags):
- return self._matcher.match(tags)
-
-
-class TagStatistics:
-
- def __init__(self, include=None, exclude=None, combine=None, docs=None,
- links=None):
- self.stats = utils.NormalizedDict(ignore=['_'])
- self._include = TagPatterns(include)
- self._exclude = TagPatterns(exclude)
- self._info = TagStatInfo(docs or [], links or [])
- self._combine = self._create_combined(combine or [])
-
- def _create_combined(self, combines):
- combines = [CombinedTag(pattern, name) for pattern, name in
combines]
- for comb in combines:
- self.stats[comb.name] = TagStat(comb.name,
- self._info.get_doc(comb.name),
-
self._info.get_links(comb.name),
- combined=comb.pattern)
- return combines
-
- def add_test(self, test, critical):
- self._add_tags_statistics(test, critical)
- self._add_combined_statistics(test)
-
- def _add_tags_statistics(self, test, critical):
- for tag in test.tags:
- if not self._is_included(tag):
- continue
- if tag not in self.stats:
- self.stats[tag] = TagStat(tag,
- self._info.get_doc(tag),
- self._info.get_links(tag),
- critical.is_critical(tag),
- critical.is_non_critical(tag))
- self.stats[tag].add_test(test)
-
- def _is_included(self, tag):
- if self._include and not self._include.match(tag):
- return False
- return not self._exclude.match(tag)
-
- def _add_combined_statistics(self, test):
- for comb in self._combine:
- if comb.match(test.tags):
- self.stats[comb.name].add_test(test)
-
- def visit(self, visitor):
- visitor.visit_tag_statistics(self)
-
- def __iter__(self):
- return iter(sorted(self.stats.values()))
-
- def sort(self):
- # TODO: Is this needed?
- for stat in self.stats.values():
- stat.tests.sort()
-
-
-class TotalStatistics:
-
- def __init__(self, suite):
- self.critical = TotalStat('Critical Tests', suite.critical)
- self.all = TotalStat('All Tests', suite.all)
-
- def visit(self, visitor):
- visitor.visit_total_statistics(self)
-
- def __iter__(self):
- return iter([self.critical, self.all])
-
-
-class TagStatInfo:
-
- def __init__(self, docs, links):
- self._docs = [TagStatDoc(*doc) for doc in docs]
- self._links = [TagStatLink(*link) for link in links]
-
- def get_doc(self, tag):
- return ' & '.join(doc.text for doc in self._docs if
doc.matches(tag))
-
- def get_links(self, tag):
- return [link.get_link(tag) for link in self._links if
link.matches(tag)]
-
-
-class TagStatDoc:
-
- def __init__(self, pattern, doc):
- self.text = doc
- self._pattern = TagPatterns(pattern)
-
- def matches(self, tag):
- return self._pattern.match(tag)
-
-
-class TagStatLink:
- _match_pattern_tokenizer = re.compile('(\*|\?)')
-
- def __init__(self, pattern, link, title):
- self._regexp = self._get_match_regexp(pattern)
- self._link = link
- self._title = title.replace('_', ' ')
-
- def matches(self, tag):
- return self._regexp.match(tag) is not None
-
- def get_link(self, tag):
- match = self._regexp.match(tag)
- if not match:
- return None
- link, title = self._replace_groups(self._link, self._title, match)
- return link, title
-
- def _replace_groups(self, link, title, match):
- for index, group in enumerate(match.groups()):
- placefolder = '%' + str(index+1)
- link = link.replace(placefolder, group)
- title = title.replace(placefolder, group)
- return link, title
-
- def _get_match_regexp(self, pattern):
- regexp = []
- open_parenthesis = False
- for token in self._match_pattern_tokenizer.split(pattern):
- if token == '':
- continue
- if token == '?':
- if not open_parenthesis:
- regexp.append('(')
- open_parenthesis = True
- regexp.append('.')
- continue
- if open_parenthesis:
- regexp.append(')')
- open_parenthesis = False
- if token == '*':
- regexp.append('(.*)')
- continue
- regexp.append(re.escape(token))
- if open_parenthesis:
- regexp.append(')')
- return re.compile('^%s$' % ''.join(regexp), re.IGNORECASE)
=======================================
--- /utest/model/test_statistics.py Mon Nov 14 03:46:38 2011
+++ /utest/model/test_statistics.py Mon Nov 14 04:41:32 2011
@@ -2,8 +2,8 @@
from robot.model.critical import Critical
from robot.utils.asserts import assert_equals, assert_none, fail
-from robot.model.statistics import (Statistics, TagStatistics, TagStatLink,
- TagStatInfo)
+from robot.model.statistics import Statistics
+from robot.model.tagstatistics import TagStatistics, TagStatLink,
TagStatInfo
from robot.result import TestSuite, TestCase
from robot import utils
==============================================================================
Revision: dd33576efbe5
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 14 04:42:45 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=dd33576efbe5
