Merge pull request #177 from datacamp/fix-spec-logic

allow test_or and test_correct to use check funcs #176

Author: Filip Schouwenaars

pythonwhat/check_syntax.py

@@ -96,6 +96,11 @@ def Ex():
 # allow test_* functions as chained attributes
 for k in TEST_NAMES:
     ATTR_SCTS[k] = Probe(tree = None, f = getattr(test_funcs, k), eval_on_call=True)
+# original logical test_* functions behave like multi, test_not
+# this is necessary to allow them to take check_* funcs as args
+# since probe behavior will try to call all SCTs passed (assuming they're also probes)
+for k in ['test_or', 'test_correct']:
+    ATTR_SCTS[k] = multi_dec(getattr(test_funcs, k))
 
 # Prepare check_funcs to be used alone (e.g. test = check_with().check_body())
 spec_2_context = {k : state_dec(v) for k, v in scts.items()}

tests/test_test_correct.py

@@ -51,6 +51,17 @@ def test_Pass2_no_lam(self):
         self.data["DC_SCT"] = helper.remove_lambdas(self.data["DC_SCT"])
         self.test_Pass2()
 
+    def test_Pass2_spec2(self):
+        self.data["DC_SCT"] = "Ex().test_correct(check_object('test').has_equal_value(), test_function('numpy.sum'))"
+        self.test_Pass2()
+
+    def test_Pass2_spec2_F(self):
+        self.data["DC_SCT"] = """
+test = F().test_correct(check_object('test').has_equal_value(), test_function('numpy.sum'))
+Ex().multi(test)
+"""
+        self.test_Pass2()
+
     def test_Fail2_mix_lam(self):
         self.data["DC_SCT"] = helper.remove_lambdas(self.data["DC_SCT"], count=1)
         self.test_Fail2()

tests/test_test_or.py

@@ -44,6 +44,10 @@ def test_Pass4_no_lam(self):
         self.data["DC_SCT"] = helper.remove_lambdas(self.data["DC_SCT"])
         self.test_Pass4()
 
+    def test_Pass4_spec2(self):
+        self.data["DC_SCT"] = "Ex().test_or(test_function('print'), check_object('test'))"
+        self.test_Pass4()
+
     def test_Fail1_no_lam(self):
         self.data["DC_SCT"] = helper.remove_lambdas(self.data["DC_SCT"])
         self.test_Fail1()