Fixed filters so that they use the public API, and extended the tests so that they take into account the non-custom id. Added new filter has_tags

Author: Sylvain MARIE

pytest_cases/filters.py

@@ -1,6 +1,6 @@
 import re
 
-from .case_info import CaseInfo
+from .case_funcs import get_case_id, get_case_tags
 
 
 class CaseFilter(object):
@@ -41,36 +41,78 @@ def __invert__(self):
         )
 
 
-def has_tag(tag_name):
-    """Select cases that have the tag `tag_name`. See `@case(tags=...)` to add tags to a case."""
-    return CaseFilter(lambda case: tag_name in CaseInfo.get_from(case).tags)
+def has_tags(*tag_names  # type: str
+             ):
+    """
+    Selects cases that have all tags in `tag_names`. See `@case(tags=...)` to add tags to a case.
+
+    :param tag_names:
+    :return:
+    """
+
+    def _filter(case):
+        return len(
+            set(tag_names) - set(get_case_tags(case))
+        ) == 0
+
+    return CaseFilter(_filter)
+
+
+def has_tag(tag_name  # type: str
+            ):
+    """
+    Selects cases that have the tag `tag_name`. See `@case(tags=...)` to add tags to a case.
+
+    :param tag_name:
+    :return:
+    """
+
+    def _filter(case):
+        return tag_name in get_case_tags(case)
+
+    return CaseFilter(_filter)
 
 
-def id_has_prefix(prefix):
+def id_has_prefix(prefix  # type: str
+                  ):
     """
-    Select cases that have a case id prefix `prefix`.
+    Selects cases that have a case id prefix `prefix`.
 
     Note that this is not the prefix of the whole case function name, but the case id,
     possibly overridden with `@case(id=)`
     """
-    return CaseFilter(lambda case: CaseInfo.get_from(case).id.startswith(prefix))
+
+    def _filter(case):
+        return get_case_id(case).startswith(prefix)
+
+    return CaseFilter(_filter)
 
 
-def id_has_suffix(suffix):
+def id_has_suffix(suffix  # type: str
+                  ):
     """
-    Select cases that have a case id suffix `suffix`.
+    Selects cases that have a case id suffix `suffix`.
 
     Note that this is not the suffix of the whole case function name, but the case id,
     possibly overridden with `@case(id=)`
     """
-    return CaseFilter(lambda case: CaseInfo.get_from(case).id.endswith(suffix))
 
+    def _filter(case):
+        return get_case_id(case).endswith(suffix)
 
-def id_match_regex(regex):
+    return CaseFilter(_filter)
+
+
+def id_match_regex(regex  # type: str
+                   ):
     """
     Select cases that have a case id matching `regex`.
 
     Note that this is not a match of the whole case function name, but the case id,
     possibly overridden with `@case(id=)`
     """
-    return CaseFilter(lambda case: re.match(regex, CaseInfo.get_from(case).id))
+
+    def _filter(case):
+        return re.match(regex, get_case_id(case))
+
+    return CaseFilter(_filter)

pytest_cases/tests/pytest_extension/parametrize_plus/test_filter.py

@@ -20,8 +20,8 @@ def case_three():
     return 3
 
 
-@case(tags=[A, C], id="dom")
-def case_four():
+@case(tags=[A, C])
+def case_dom():
     return 4
 
 
@@ -46,6 +46,13 @@ def test_filter_with_and_relation(value):
     pass
 
 
+@parametrize_with_cases(
+    argnames="value", cases=".", filter=filters.has_tags(B, C)
+)
+def test_filter_with_two_tags(value):
+    pass
+
+
 @parametrize_with_cases(
     argnames="value", cases=".", filter=filters.has_tag(B) | filters.has_tag(C)
 )
@@ -74,6 +81,7 @@ def test_filter(module_results_dct):
         'test_filter_without_tag[tom]',
         'test_filter_without_tag[dom]',
         'test_filter_with_and_relation[toni]',
+        'test_filter_with_two_tags[toni]',
         'test_filter_with_or_relation[tim]',
         'test_filter_with_or_relation[toni]',
         'test_filter_with_or_relation[dom]',