expand has_equal_ast to see if student code contains solution, manual code

Author: machow

pythonwhat/check_funcs.py

@@ -397,19 +397,28 @@ def call(args,
 from pythonwhat.tasks import ReprFail, UndefinedValue
 from pythonwhat import utils
 
-def has_equal_ast(incorrect_msg="FMT: Your code does not seem to match the solution.", state=None):
+def has_equal_ast(incorrect_msg="FMT: Your code does not seem to match the solution.", code=None, exact=True, state=None):
     """Test whether abstract syntax trees match between the student and solution code.
 
     Args:
         incorrect_msg: message displayed when ASTs mismatch.
+        code: optional code to use instead of the solution AST
+        exact: whether the representations must match exactly. If false, the solution AST
+               only needs to be contained within the student AST (similar to using test student typed).
     """
     rep = Reporter.active_reporter
 
-    stu_rep = ast.dump(state.student_tree)
-    sol_rep = ast.dump(state.solution_tree)
+    parse_tree = lambda n: ast.dump(n.body[0] if isinstance(n, ast.Module) and len(n.body) == 1 else n)
+
+    stu_rep = parse_tree(state.student_tree)
+    sol_rep = parse_tree(state.solution_tree if not code else ast.parse(code))
 
     _msg = state.build_message(incorrect_msg)
-    rep.do_test(EqualTest(stu_rep, sol_rep, Feedback(_msg, state.highlight)))
+
+    if exact:
+        rep.do_test(EqualTest(stu_rep, sol_rep, Feedback(_msg, state.highlight)))
+    elif not sol_rep in stu_rep:
+        rep.do_test(Test(Feedback(_msg, state.highlight)))
 
     return state
 

tests/test_spec.py

@@ -172,6 +172,53 @@ def test_fail(self):
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
 
+class TestHasEqualAst(unittest.TestCase):
+    def setUp(self):
+        self.data = {
+                "DC_SOLUTION": """dict(a = "a").keys()""",
+                "DC_CODE":     """dict(a = 'a')    .keys()"""}
+
+    def failing_submission(self):
+        self.data["DC_CODE"] = "dict(A = 'a').keys(somearg = 2)"""
+        sct_payload = helper.run(self.data)
+        self.assertFalse(sct_payload['correct'])
+
+    def test_simple_pass(self):
+        self.data["DC_SCT"] = "Ex().has_equal_ast()"
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
+    def test_simple_fail(self):
+        self.data["DC_SCT"] = "Ex().has_equal_ast()"
+        self.failing_submission()
+
+    def test_function_pass(self):
+        self.data["DC_SCT"] = "Ex().check_function('dict', 0, signature=False).has_equal_ast()"
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
+    def test_function_fail(self):
+        self.data["DC_SCT"] = "Ex().check_function('dict', 0, signature=False).has_equal_ast()"
+        self.failing_submission()
+
+    def test_function_code_pass(self):
+        self.data["DC_SCT"] = """Ex().has_equal_ast(code = 'dict(a = "a").keys()')"""
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
+    def test_function_code_fail(self):
+        self.data["DC_SCT"] = """Ex().has_equal_ast(code = 'dict(a = "a").keys()')"""
+        self.failing_submission()
+
+    def test_exact_false_pass(self):
+        self.data["DC_CODE"] = """dict(a = 'a').keys()\nprint('extra')"""
+        self.data["DC_SCT"] = "Ex().has_equal_ast(exact=False)"
+        sct_payload = helper.run(self.data)
+        self.assertTrue(sct_payload['correct'])
+
+    def test_exact_false_fail(self):
+        self.data["DC_SCT"] = "Ex().has_equal_ast(exact=False)"
+        self.failing_submission()
 
 class TestOverride(unittest.TestCase):
     """