Merge pull request #184 from datacamp/test-check-function

set check_function to get signature by default, fix a highlight, tests

Author: Filip Schouwenaars

pythonwhat/check_function.py

@@ -24,7 +24,7 @@ def check_function(name, index,
                    params_not_matched_msg = "FMT:Something went wrong in figuring out how you specified the "
                                             "arguments for `{name}`; have another look at your code and its output.",
                    expand_msg  = MSG_PREPEND, 
-                   signature=None,
+                   signature=True,
                    typestr = "{ordinal} function call",
                    state=None):
     rep = Reporter.active_reporter
@@ -64,7 +64,7 @@ def check_function(name, index,
             stu_parts['args'], _ = bind_args(stu_sig, stu_parts['args'])
         except Exception as e:
             _msg = state.build_message(params_not_matched_msg, fmt_kwargs)
-            rep.do_test(Test(Feedback(_msg, state.highlight)))
+            rep.do_test(Test(Feedback(_msg, stu_parts['node'])))
 
     # three types of parts: pos_args, keywords, args (e.g. these are bound to sig)
     append_message = {'msg': expand_msg, 'kwargs': fmt_kwargs}

tests/test_signatures.py

@@ -243,6 +243,15 @@ def test_array(self):
         sct_payload = helper.run(self.data)
         self.assertTrue(sct_payload['correct'])
 
+    def test_array_spec2(self):
+        self.data = {
+            "DC_PEC": "import numpy as np",
+            "DC_SOLUTION": "x = np.array([1,2,3,4])",
+            "DC_CODE": "x = np.array([1,2,3,4])",
+            "DC_SCT": "Ex().check_function('numpy.array', 0).check_args('object')"}
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
     def test_random_seed(self):
         self.data = {
             "DC_PEC": "import numpy as np",

tests/test_test_function_v2.py

@@ -670,8 +670,10 @@ def setUp(self):
         }
 
         self.SPEC2_SCT = """
-Ex().check_function('pandas.DataFrame', 0, missing_msg = "notcalledmsg", expand_msg="")\
-        .check_args('data', missing_msg='paramsnotmatchedmsg')
+Ex().check_function('pandas.DataFrame', 0, missing_msg = "notcalledmsg", expand_msg="", params_not_matched_msg='paramsnotmatchedmsg')\
+        .multi(
+            check_args('data', missing_msg='paramsnotspecifiedmsg'),
+            check_args('columns', missing_msg='paramsnotspecifiedmsg'))
 """
 
     def test_step1(self):
@@ -696,14 +698,17 @@ def test_step2_spec2(self):
         self.data["DC_SCT"] = self.SPEC2_SCT
         self.test_step2()
 
-
     def test_step3(self):
         self.data["DC_CODE"] = "df = pd.DataFrame(data=[1, 2, 3])"
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
         self.assertEqual('paramsnotspecifiedmsg', sct_payload['message'])
         helper.test_lines(self, sct_payload, 1, 1, 6, 33)
 
+    def test_step3_spec2(self):
+        self.data["DC_SCT"] = self.SPEC2_SCT
+        self.test_step3()
+
     def test_step4(self):
         self.data["DC_CODE"] = "df = pd.DataFrame(data=[1, 2, 3], columns=['b'])"
         sct_payload = helper.run(self.data)