Added/updated tests corresponding to all latest changes

Author: Sylvain MARIE

pytest_cases/tests/cases/doc/cases_doc.py

@@ -19,7 +19,7 @@ def case_foo():
         return
 
     @case(id="hello")
-    def blah(self):
+    def case_blah(self):
         """a blah"""
         return 0, 0
 

pytest_cases/tests/cases/doc/test_doc.py

@@ -32,24 +32,24 @@ def test_foo_default_cases_file_synthesis(request):
 
 
 @parametrize_with_cases("a,b", cases=AUTO2)
-def test_foo_alternate_cases_file_and_one_marked_skip(a, b):
+def test_foo_alternate_cases_file_and_two_marked_skip(a, b):
     assert isinstance(foo(a, b), tuple)
 
 
-def test_foo_alternate_cases_file_and_one_marked_skip_synthesis(request):
-    results_dct = get_session_synthesis_dct(request, filter=test_foo_alternate_cases_file_and_one_marked_skip,
+def test_foo_alternate_cases_file_and_two_marked_skip_synthesis(request):
+    results_dct = get_session_synthesis_dct(request, filter=test_foo_alternate_cases_file_and_two_marked_skip,
                                             test_id_format='function')
     if has_pytest_param:
         assert list(results_dct) == [
-            'test_foo_alternate_cases_file_and_one_marked_skip[hello]',
-            'test_foo_alternate_cases_file_and_one_marked_skip[two_negative_ints0]',
-            'test_foo_alternate_cases_file_and_one_marked_skip[two_negative_ints1]'
+            'test_foo_alternate_cases_file_and_two_marked_skip[hello]',
+            'test_foo_alternate_cases_file_and_two_marked_skip[two_negative_ints0]',
+            'test_foo_alternate_cases_file_and_two_marked_skip[two_negative_ints1]'
         ]
     else:
         assert list(results_dct) == [
-            'test_foo_alternate_cases_file_and_one_marked_skip[1hello[0]-hello[1]]',
-            'test_foo_alternate_cases_file_and_one_marked_skip[3two_negative_ints[0]-two_negative_ints[1]]',
-            'test_foo_alternate_cases_file_and_one_marked_skip[5two_negative_ints[0]-two_negative_ints[1]]'
+            'test_foo_alternate_cases_file_and_two_marked_skip[0hello[0]-hello[1]]',
+            'test_foo_alternate_cases_file_and_two_marked_skip[2two_negative_ints[0]-two_negative_ints[1]]',
+            'test_foo_alternate_cases_file_and_two_marked_skip[4two_negative_ints[0]-two_negative_ints[1]]'
         ]
 
 
@@ -101,7 +101,7 @@ def case_foo():
 
     @pytest.mark.skipif(False, reason="no")
     @case(id="hello world")
-    def blah(self):
+    def case_blah(self):
         """a blah"""
         return 0, 0
 
@@ -155,7 +155,7 @@ def test_foo_cls_list_synthesis(request):
         'test_foo_cls_list[hello world1]',
         'test_foo_cls_list[two_negative_ints3]',
         # test_doc_cases.py
-        'test_foo_cls_list[two_positive_ints1]',
+        'test_foo_cls_list[two_positive_ints]',
         'test_foo_cls_list[two_negative_ints4]'
     ]
     if has_pytest_param:

pytest_cases/tests/cases/doc/test_doc_cache.py

@@ -0,0 +1,35 @@
+from pytest_cases import parametrize, parametrize_with_cases, fixture
+
+
+already_read = set()
+
+
+@parametrize(a=range(2))
+def case_dummy(a):
+    global already_read
+    if a in already_read:
+        raise ValueError()
+    else:
+        already_read.add(a)
+        return a
+
+
+@fixture(scope='session')
+@parametrize_with_cases("a", cases='.')
+def cached_a(a):
+    return a
+
+
+@parametrize(d=range(2))
+def test_caching(cached_a, d):
+    assert d < 2
+    assert 0 <= cached_a <= 1
+
+
+def test_synthesis(module_results_dct):
+    assert list(module_results_dct) == [
+        'test_caching[dummy-a=0-d=0]',
+        'test_caching[dummy-a=0-d=1]',
+        'test_caching[dummy-a=1-d=0]',
+        'test_caching[dummy-a=1-d=1]'
+    ]

pytest_cases/tests/cases/doc/test_doc_filters_n_tags.py

@@ -1,5 +1,6 @@
 from pytest_harvest import get_session_synthesis_dct
 
+from pytest_cases.common_pytest_marks import has_pytest_param
 from pytest_cases import parametrize_with_cases, case, parametrize
 
 
@@ -16,27 +17,40 @@ def case_c():
     return dict(name="hi i'm not used")
 
 
-class Foo:
-    def case_two_positive_ints(self):
-        return 1, 2
-
-    @case(tags='foo')
-    def case_one_positive_int(self):
-        return 1
+def user_bob():
+    return "bob"
 
 
 @parametrize_with_cases("data", cases='.', prefix="data_")
-def test_with_data(data):
+@parametrize_with_cases("user", cases='.', prefix="user_")
+def test_with_data(data, user):
     assert data in ('a', "hello", "world")
+    assert user == 'bob'
 
 
 def test_with_data_synthesis(request):
     results_dct = get_session_synthesis_dct(request, filter=test_with_data, test_id_format='function')
-    assert list(results_dct) == [
-        'test_with_data[a]',
-        'test_with_data[b-True]',
-        'test_with_data[b-False]'
-    ]
+    if has_pytest_param:
+        assert list(results_dct) == [
+            'test_with_data[bob-a]',
+            'test_with_data[bob-b-True]',
+            'test_with_data[bob-b-False]'
+        ]
+    else:
+        assert list(results_dct) == [
+            'test_with_data[a-bob]',
+            'test_with_data[b-True-bob]',
+            'test_with_data[b-False-bob]'
+        ]
+
+
+class Foo:
+    def case_two_positive_ints(self):
+        return 1, 2
+
+    @case(tags='foo')
+    def case_one_positive_int(self):
+        return 1
 
 
 @parametrize_with_cases("a", cases=Foo, has_tag='foo')

pytest_cases/tests/cases/doc/test_doc_filters_n_tags2.py

@@ -0,0 +1,74 @@
+from math import sqrt
+import pytest
+
+from pytest_cases.common_pytest_marks import has_pytest_param
+from pytest_cases import parametrize_with_cases
+
+
+def case_int_success():
+    return 1
+
+
+def case_negative_int_failure():
+    # note that we decide to return the expected type of failure to check it
+    return -1, ValueError, "math domain error"
+
+
+@parametrize_with_cases("data", cases='.', glob="*success")
+def test_good_datasets(data):
+    assert sqrt(data) > 0
+
+
+@parametrize_with_cases("data, err_type, err_msg", cases='.', glob="*failure")
+def test_bad_datasets(data, err_type, err_msg):
+    with pytest.raises(err_type, match=err_msg):
+        sqrt(data)
+
+
+def test_synthesis(module_results_dct):
+    if has_pytest_param:
+        assert list(module_results_dct) == [
+            'test_good_datasets[int_success]',
+            'test_bad_datasets[negative_int_failure]'
+        ]
+    else:
+        assert list(module_results_dct) == [
+            'test_good_datasets[int_success]',
+            'test_bad_datasets[negative_int_failure[0]-negative_int_failure[1]-negative_int_failure[2]]'
+        ]
+
+
+def create_filter(sub_str):
+    def my_filter(case_func):
+        return sub_str in case_func._pytestcase.id
+    return my_filter
+
+
+@parametrize_with_cases("data", cases='.', filter=lambda case_func: "success" in case_func._pytestcase.id)
+def test_good_datasets2(data):
+    assert sqrt(data) > 0
+
+
+@parametrize_with_cases("data, err_type, err_msg", cases='.', filter=create_filter("failure"))
+def test_bad_datasets2(data, err_type, err_msg):
+    with pytest.raises(err_type, match=err_msg):
+        sqrt(data)
+
+
+def test_synthesis2(module_results_dct):
+    if has_pytest_param:
+        assert list(module_results_dct) == [
+            'test_good_datasets[int_success]',
+            'test_bad_datasets[negative_int_failure]',
+            'test_synthesis',
+            'test_good_datasets2[int_success]',
+            'test_bad_datasets2[negative_int_failure]'
+        ]
+    else:
+        assert list(module_results_dct) == [
+            'test_good_datasets[int_success]',
+            'test_bad_datasets[negative_int_failure[0]-negative_int_failure[1]-negative_int_failure[2]]',
+            'test_synthesis',
+            'test_good_datasets2[int_success]',
+            'test_bad_datasets2[negative_int_failure[0]-negative_int_failure[1]-negative_int_failure[2]]'
+        ]

pytest_cases/tests/cases/doc/test_fixtures.py

@@ -26,7 +26,7 @@ def test_users(a, db, request):
 def test_users_synthesis(request, db):
     results_dct = get_session_synthesis_dct(request, filter=test_users, test_id_format='function')
     assert list(results_dct) == [
-        'test_foo_fixtures[a_is_bob]',
-        'test_foo_fixtures[a_is_from_db-id=0]',
-        'test_foo_fixtures[a_is_from_db-id=1]'
+        'test_users[a_is_bob]',
+        'test_users[a_is_from_db-id=0]',
+        'test_users[a_is_from_db-id=1]'
     ]

pytest_cases/tests/cases/legacy/intermediate/test_filtering.py

@@ -23,7 +23,12 @@ def case_a():
     return ins, outs, None
 
 
-@cases_data(module=THIS_MODULE, filter=lambda tags: 'a' in tags or 'b' in tags)
+def my_tag_filter(case_func):
+    tags = case_func._pytestcase.tags
+    return 'a' in tags or 'b' in tags
+
+
+@cases_data(module=THIS_MODULE, filter=my_tag_filter)
 def test_with_cases_a_or_b(case_data  # type: CaseDataGetter
                            ):
 
@@ -36,7 +41,7 @@ def test_with_cases_a_or_b(case_data  # type: CaseDataGetter
     assert outs == expected_o
 
 
-@cases_data(module=THIS_MODULE, filter=lambda tags: 'a' in tags and 'b' in tags)
+@cases_data(module=THIS_MODULE, filter=my_tag_filter)
 def test_with_cases_a_and_b(case_data  # type: CaseDataGetter
                             ):