Fixed issues where the currentcases fixture would not return the correct case function. Fixed #212

Author: Sylvain MARIE

pytest_cases/case_parametrizer_new.py

@@ -341,7 +341,7 @@ class _LazyValueCaseParamValue(LazyValue, CaseParamValue):
     """
 
     def get_case_function(self, request):
-        return self.valuegetter
+        return _get_original_case_func(self.valuegetter)[0]
 
     def as_lazy_tuple(self, nb_params):
         return _LazyTupleCaseParamValue(self, nb_params)
@@ -350,7 +350,7 @@ def as_lazy_tuple(self, nb_params):
 class _LazyTupleCaseParamValue(LazyTuple, CaseParamValue):
     """A case representing a tuple"""
     def get_case_function(self, request):
-        return self._lazyvalue.valuegetter
+        return _get_original_case_func(self._lazyvalue.valuegetter)[0]
 
 
 class _FixtureRefCaseParamValue(fixture_ref, CaseParamValue):
@@ -929,7 +929,11 @@ def _possibly_add_cases_to_results(request, results, mp_fix_to_args, argname_or_
                 case_func = current_param_value.argval.get_case_function(request)
             else:
                 # a single value. continue: this will be handled similar to what is below
-                current_param_value = current_param_value.argval
+                argnames = current_param_value.argnames
+                if len(argnames) == 1:
+                    current_param_value = current_param_value.argval[0]
+                else:
+                    current_param_value = current_param_value.argval
 
         # elif isinstance(current_param_value, ProductParamAlternative):
         #     # This should not happen with cases, this is a tuple where a *member* is a fixture_ref

pytest_cases/tests/cases/issues/test_issue_212.py

@@ -0,0 +1,65 @@
+import sys
+from pytest_cases import parametrize, parametrize_with_cases
+
+
+PY3 = sys.version_info >= (3,)
+
+
+class MyClassName:
+    def case_foo(self):
+        return "fooval"
+
+
+@parametrize_with_cases('val', cases=MyClassName)
+def test_function_basic_parametrize(val, current_cases):
+    assert val == "fooval"
+
+    case_id, case_func = current_cases['val']
+    assert case_id == "foo"
+    if PY3:
+        assert case_func is MyClassName.case_foo
+    else:
+        assert case_func == MyClassName.case_foo
+
+
+class MyClassNameTuple:
+    def case_foo(self):
+        return 1, 2
+
+
+@parametrize_with_cases('a,b', cases=MyClassNameTuple)
+def test_function_tuple_basic_parametrize(a, b, current_cases):
+    assert (a, b) == (1, 2)
+
+    case_id, case_func = current_cases['a']
+    assert case_id, case_func == current_cases['b']
+    assert case_id == "foo"
+    if PY3:
+        assert case_func is MyClassNameTuple.case_foo
+    else:
+        assert case_func == MyClassNameTuple.case_foo
+
+
+class MyClassName2:
+    def case_bar(self):
+        return "barval"
+
+    @parametrize(dummy=['a'])
+    def case_foo(self, dummy):
+        return "fooval"
+
+
+@parametrize_with_cases('val', cases=MyClassName2)
+def test_function_nested_parametrize(val, current_cases):
+    ref = {
+        "barval": MyClassName2.case_bar,
+        "fooval": MyClassName2.case_foo
+    }
+
+    case_id, case_func = current_cases['val']
+    assert case_id == val[:3]
+
+    if PY3:
+        assert case_func is ref[val]
+    else:
+        assert case_func == ref[val]