Use test_or_task util in new places and refactor it.

pekkaklarck · pekkaklarck · commit 9d640194fc00 · 2021-03-03T15:40:33.000+02:00
diff --git a/src/robot/model/totalstatistics.py b/src/robot/model/totalstatistics.py
@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+from robot.utils import test_or_task
+
 from .stats import TotalStat
 from .visitor import SuiteVisitor
 
@@ -21,9 +23,8 @@ class TotalStatistics(object):
     """Container for total statistics."""
 
     def __init__(self, rpa=False):
-        test_or_task = 'Tests' if not rpa else 'Tasks'
         #: Instance of :class:`~robot.model.stats.TotalStat` for all the tests.
-        self._stat = TotalStat('All ' + test_or_task)
+        self._stat = TotalStat(test_or_task('All {Test}s', rpa))
         self._rpa = rpa
 
     def visit(self, visitor):
diff --git a/src/robot/result/merger.py b/src/robot/result/merger.py
@@ -15,7 +15,7 @@
 
 from robot.errors import DataError
 from robot.model import SuiteVisitor
-from robot.utils import html_escape
+from robot.utils import html_escape, test_or_task
 
 
 class Merger(SuiteVisitor):
@@ -75,12 +75,7 @@ def visit_test(self, test):
             self.current.tests[index] = test
 
     def _create_add_message(self, item, suite=False):
-        if suite:
-            item_type = 'Suite'
-        elif self.rpa:
-            item_type = 'Task'
-        else:
-            item_type = 'Test'
+        item_type = 'Suite' if suite else test_or_task('{Test}', self.rpa)
         prefix = '*HTML* %s added from merged output.' % item_type
         if not item.message:
             return prefix
@@ -93,9 +88,9 @@ def _html_escape(self, message):
             return html_escape(message)
 
     def _create_merge_message(self, new, old):
-        header = ('*HTML* <span class="merge">'
-                  '%s has been re-executed and results merged.'
-                  '</span>' % ('Test' if not self.rpa else 'Task'))
+        header = test_or_task('*HTML* <span class="merge">'
+                              '{Test} has been re-executed and results merged.'
+                              '</span>', self.rpa)
         return ''.join([
             header,
             '<hr>',
diff --git a/src/robot/utils/misc.py b/src/robot/utils/misc.py
@@ -127,15 +127,12 @@ def seq2str2(sequence):
     return '[ %s ]' % ' | '.join(unic(item) for item in sequence)
 
 
-def test_or_task(text, rpa):
-    """If `rpa` is True, replaces occurrences of `{test}` in `text` with `task`."""
-    def t(match):
+def test_or_task(text, rpa=False):
+    """Replaces `{test}` in `text` with `test` or `task` depending on `rpa`."""
+    def replace(match):
+        test = match.group(1)
         if not rpa:
-            return match.group(1)
-        try:
-            return {
-                'TEST': 'TASK', 'Test': 'Task', 'test': 'task'
-            }[match.group(1)]
-        except KeyError:
-            raise ValueError("Invalid input string '%s'." % text)
-    return re.sub('{(.*)}', t, text)
+            return test
+        upper = [c.isupper() for c in test]
+        return ''.join(c.upper() if up else c for c, up in zip('task', upper))
+    return re.sub('{(test)}', replace, text, flags=re.IGNORECASE)
diff --git a/utest/utils/test_misc.py b/utest/utils/test_misc.py
@@ -160,24 +160,25 @@ def test_plural_or_not(self):
 
 class TestTestOrTask(unittest.TestCase):
 
-    def test_test_or_task(self):
-        for inp, rpa, exp in [
-            ('{Test}', False, 'Test'),
-            ('{test}', False, 'test'),
-            ('{TEST}', False, 'TEST'),
-            ('{Test}', True, 'Task'),
-            ('{test}', True, 'task'),
-            ('{TEST}', True, 'TASK'),
-            ('Contains {test}', False, 'Contains test'),
-            ('Contains {TEST}', True, 'Contains TASK'),
-            ('Does not contain match', False, 'Does not contain match')
-        ]:
-            assert_equal(test_or_task(inp, rpa), exp)
-
-    def test_test_or_task_fails_with_invalid_pattern_in_braces(self):
-        assert_raises_with_msg(
-            ValueError, "Invalid input string '{TeSt}'.",
-            test_or_task, '{TeSt}', True)
+    def test_no_match(self):
+        for inp in ['', 'No match', 'No {match}', '{No} {task} {match}']:
+            assert_equal(test_or_task(inp), inp)
+            assert_equal(test_or_task(inp, rpa=True), inp)
+
+    def test_match(self):
+        for test, task in [('test', 'task'),
+                           ('Test', 'Task'),
+                           ('TEST', 'TASK'),
+                           ('tESt', 'tASk')]:
+            inp = '{%s}' % test
+            assert_equal(test_or_task(inp, rpa=False), test)
+            assert_equal(test_or_task(inp, rpa=True), task)
+
+    def test_multiple_matches(self):
+        assert_equal(test_or_task('Contains {test}, {TEST} and {TesT}', False),
+                     'Contains test, TEST and TesT')
+        assert_equal(test_or_task('Contains {test}, {TEST} and {TesT}', True),
+                     'Contains task, TASK and TasK')
 
 
 if __name__ == "__main__":
