Merge pull request #220 from datacamp/feature-expr-kwargs

Let old scts pass kwargs for has_equal_value

Author: machow

pythonwhat/test_funcs/test_expression_output.py

@@ -7,7 +7,8 @@ def test_expression_output(extra_env=None,
                            expr_code=None,
                            pre_code=None,
                            keep_objs_in_env=None,
-                           state=None):
+                           state=None,
+                           **kwargs):
     """Test output of expression.
 
     The code of the student is ran in the active state and the output it generates is
@@ -37,6 +38,7 @@ def test_expression_output(extra_env=None,
         keep_obj_in_env (list()): a list of variable names that should be hold in the copied environment where
           the expression is evaluated. All primitive types are copied automatically, other objects have to
           be passed explicitely.
+        kwargs: named arguments which are the same as those used by ``has_equal_value``.
 
     :Example:
         Student code::
@@ -83,4 +85,5 @@ def test_expression_output(extra_env=None,
                      expr_code=expr_code,
                      pre_code=pre_code,
                      keep_objs_in_env=keep_objs_in_env,
-                     state = state)
+                     state = state,
+                     **kwargs)

pythonwhat/test_funcs/test_expression_result.py

@@ -15,7 +15,8 @@ def test_expression_result(extra_env=None,
                            pre_code=None,
                            keep_objs_in_env=None,
                            error_msg=None,
-                           state=None):
+                           state=None,
+                           **kwargs):
     """Test result of expression.
 
     The code of the student is ran in the active state and the result of the evaluation is
@@ -46,6 +47,7 @@ def test_expression_result(extra_env=None,
           the expression is evaluated. All primitive types are copied automatically, other objects have to
           be passed explicitely.
         error_msg (str): Message to override the default error message that is thrown if the expression resulted in an error.
+        kwargs: named arguments which are the same as those used by ``has_equal_value``.
 
     :Example:
         Student code::
@@ -90,4 +92,4 @@ def test_expression_result(extra_env=None,
                     expr_code=expr_code,
                     pre_code=pre_code,
                     keep_objs_in_env=keep_objs_in_env,
-                    state = state)
+                    state = state, **kwargs)

pythonwhat/test_funcs/test_function.py

@@ -20,7 +20,8 @@ def test_function(name,
                   incorrect_msg=None,
                   add_more=False,
                   highlight=True,
-                  state=None):
+                  state=None,
+                  **kwargs):
     """Test if function calls match.
 
     This function compares a function call in the student's code with the corresponding one in the solution
@@ -42,6 +43,7 @@ def test_function(name,
         args_not_specified_msg (str): feedback message if the function is called but not all required arguments are specified
         incorrect_msg (str): feedback message if the arguments of the function in the solution doesn't match
           the one of the student.
+        kwargs: named arguments which are the same as those used by ``has_equal_value``.
 
     :Example:
 
@@ -149,7 +151,8 @@ def test_function(name,
                 test = build_test(arg_student, arg_solution,
                                   state,
                                   do_eval, eq_fun, msg, add_more=add_more,
-                                  highlight=arg_student if highlight else None)
+                                  highlight=arg_student if highlight else None,
+                                  **kwargs)
                 test.test()
 
                 if not test.result:
@@ -172,7 +175,7 @@ def test_function(name,
                     test = build_test(key_student, key_solution,
                                       state,
                                       do_eval, eq_fun, msg, add_more=add_more,
-                                      highlight=key_student if highlight else None)
+                                      highlight=key_student if highlight else None, **kwargs)
                     test.test()
 
                     if not test.result:
@@ -229,7 +232,8 @@ def test_function_v2(name,
                      incorrect_msg=None,
                      add_more=False,
                      highlight=True,
-                     state=None):
+                     state=None,
+                     **kwargs):
     """Test if function calls match (v2).
 
     This function compares a function call in the student's code with the corresponding one in the solution
@@ -255,6 +259,7 @@ def test_function_v2(name,
             parameters listed in params are specified by the student.
         incorrect_msg (list(str)): string or list of strings (parameter-specific). Custom feedback messages if the arguments
             don't correspond between student and solution code.
+        kwargs: named arguments which are the same as those used by ``has_equal_value``.
     """
 
     rep = Reporter.active_reporter
@@ -346,7 +351,7 @@ def test_function_v2(name,
         sub_tests = [partial(test_call, name, call_ind, signature, params, do_eval, solution_args, 
                              eq_fun, add_more, index,
                              params_not_specified_msg, params_not_matched_msg, incorrect_msg, 
-                             keywords, state=state, highlight = highlight)
+                             keywords, state=state, highlight = highlight, **kwargs)
                      for call_ind in call_indices]
         test_or(*sub_tests, state=state)
 
@@ -360,7 +365,7 @@ def test_call(name, call_ind, signature, params, do_eval, solution_args,
               eq_fun, add_more, index,
               params_not_specified_msg, params_not_matched_msg, incorrect_msg, 
               keywords,  # pulled from solution process
-              state, highlight):
+              state, highlight, **kwargs):
     #stud_name = get_mapped_name(name, state.student_mappings)
 
     rep = Reporter.active_reporter
@@ -409,15 +414,16 @@ def test_call(name, call_ind, signature, params, do_eval, solution_args,
         test_arg(param, do_eval[ind],
                  arg_student, arg_solution, param_kind, stud_name,
                  eq_fun, add_more,
-                 incorrect_msg[ind], state=state, highlight = arg_student if highlight else None)
+                 incorrect_msg[ind], state=state, highlight = arg_student if highlight else None,
+                 **kwargs)
 
     # If all is still good, we have a winner!
     state.set_used(name, call_ind, index)
 
 def test_arg(param, do_eval, 
              arg_student, arg_solution, param_kind, stud_name,
              eq_fun, add_more,
-             incorrect_msg, state=None, highlight = None):
+             incorrect_msg, state=None, highlight = None, **kwargs):
     rep = Reporter.active_reporter
 
     if incorrect_msg is None:
@@ -430,7 +436,8 @@ def test_arg(param, do_eval,
 
     test = build_test(arg_student, arg_solution,
                         state,
-                        do_eval, eq_fun, msg, add_more = add_more, highlight=highlight)
+                        do_eval, eq_fun, msg, add_more = add_more, highlight=highlight,
+                        **kwargs)
     # TODO
     rep.do_test(test)
 
@@ -447,17 +454,17 @@ def bind_args(signature, arguments, keyws):
     bound_args = signature.bind(*arguments, **keyws)
     return(bound_args.arguments, signature.parameters)
 
-def build_test(stud, sol, state, do_eval, eq_fun, feedback_msg, add_more, highlight = False):
+def build_test(stud, sol, state, do_eval, eq_fun, feedback_msg, add_more, highlight = False, **kwargs):
     got_error = False
     if do_eval:
 
-        eval_solution, str_solution = getResultInProcess(tree = sol, process = state.solution_process)
+        eval_solution, str_solution = getResultInProcess(tree = sol, process = state.solution_process, **kwargs)
         if isinstance(str_solution, Exception):
             raise ValueError("Running an argument in the solution environment raised an error")
         if isinstance(eval_solution, ReprFail):
             raise ValueError("Couldn't figure out the argument: " + eval_solution.info)
 
-        eval_student, str_student = getResultInProcess(tree = stud, process = state.student_process)
+        eval_student, str_student = getResultInProcess(tree = stud, process = state.student_process, **kwargs)
         if isinstance(str_student, Exception):
             got_error = True
 

pythonwhat/test_funcs/test_object_after_expression.py

@@ -9,7 +9,8 @@ def test_object_after_expression(name,
                                  expr_code=None,
                                  pre_code=None,
                                  keep_objs_in_env=None,
-                                 state=None):
+                                 state=None,
+                                 **kwargs):
     """Test object after expression.
 
     The code of the student is ran in the active state and the the value of the given object is
@@ -41,6 +42,7 @@ def test_object_after_expression(name,
         keep_obj_in_env (list()): a list of variable names that should be hold in the copied environment where
           the expression is evaluated. All primitive types are copied automatically, other objects have to
           be passed explicitely.
+        kwargs: named arguments which are the same as those used by ``has_equal_value``.
 
     :Example:
 
@@ -86,4 +88,5 @@ def test_object_after_expression(name,
             name = name,
             highlight = ass_node,
             expr_code = expr_code,
-            state=state)
+            state=state,
+            **kwargs)

tests/test_test_expression_result.py

@@ -35,5 +35,11 @@ def test_copy_sct_fails(self):
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
 
+    def test_test_expression_result_copy_pass(self):
+        self.data["DC_CODE"] = self.data["DC_SOLUTION"]
+        self.data["DC_SCT"] = "test_expression_result(expr_code = 'a', error_msg = 'cough', copy = False)"
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
 if __name__ == "__main__":
     unittest.main()

tests/test_test_function.py

@@ -742,6 +742,13 @@ def test_fail_pos_0_inline_if_body(self):
         self.data["DC_SOLUTION"] = "np.array([1,2] if False else [1])"
         self.run_fail(".check_args(0).check_if_exp(0).check_body().has_equal_ast()")
 
+    def test_test_function_kwargs(self):
+        self.data["DC_SCT"] = "test_function('np.array', copy = False)"
+
+    def test_test_function2_kwargs(self):
+        self.data["DC_SCT"] = "test_function2('np.array', params = ['object'], copy = False)"
+
+
 class TestCheckFunctionCases(unittest.TestCase):
     def setup_color(self):
         self.data = {