Implement force_diagnose in test_exercise and check_correct

hermansje · hermansje · commit cd56b8c545dd · 2018-11-06T14:14:53.000+01:00
diff --git a/pythonwhat/State.py b/pythonwhat/State.py
@@ -49,6 +49,7 @@ def __init__(self,
                  student_parts=None, solution_parts=None, 
                  highlight = None,
                  highlighting_disabled = None, messages=None,
+                 force_diagnose = False,
                  **kwargs):
 
         # Set basic fields from kwargs
@@ -57,6 +58,7 @@ def __init__(self,
         self.student_parts = student_parts
         self.solution_parts = solution_parts
         self.messages = messages if messages else []
+        self.force_diagnose = force_diagnose
 
         # parse code if didn't happen yet
         if not hasattr(self, 'student_tree'):
@@ -194,7 +196,8 @@ def to_child_state(self, student_subtree=None, solution_subtree=None,
                       highlight = highlight,
                       highlighting_disabled = highlighting_disabled,
                       messages = messages,
-                      parent_state = self)
+                      parent_state = self,
+                      force_diagnose=self.force_diagnose)
         return(child)
 
     def update(self, **kwargs):
diff --git a/pythonwhat/check_logic.py b/pythonwhat/check_logic.py
@@ -137,12 +137,21 @@ def check_correct(check, diagnose, state=None):
             )
 
     """
-    def diagnose_and_check(state=None):
-        # use multi twice, since diagnose and check may be lists of tests
-        multi(diagnose, state=state)
+    feedback = None
+    try:
         multi(check, state=state)
+    except TestFail as e:
+        feedback = e.feedback
+
+    try:
+        multi(diagnose, state=state)
+    except TestFail as e:
+        if feedback is not None or state.force_diagnose:
+            feedback = e.feedback
 
-    check_or(diagnose_and_check, check, state=state)
+    if feedback is not None:
+        rep = Reporter.active_reporter
+        rep.do_test(Test(feedback))
 
 # utility functions -----------------------------------------------------------
 
diff --git a/pythonwhat/test_exercise.py b/pythonwhat/test_exercise.py
@@ -14,7 +14,8 @@ def test_exercise(sct,
                   solution_process,
                   raw_student_output,
                   ex_type,
-                  error):
+                  error,
+                  force_diagnose=False):
     """
     Point of interaction with the Python backend.
     Args:
@@ -42,7 +43,8 @@ def test_exercise(sct,
             pre_exercise_code = check_str(pre_exercise_code),
             student_process = check_process(student_process),
             solution_process = check_process(solution_process),
-            raw_student_output = check_str(raw_student_output)
+            raw_student_output = check_str(raw_student_output),
+            force_diagnose = force_diagnose
         )
 
         State.root_state = state
diff --git a/tests/helper.py b/tests/helper.py
@@ -16,6 +16,7 @@ def run(data, run_code = True):
     stu_code = data.get("DC_CODE", "")
     sol_code = data.get("DC_SOLUTION", "")
     sct = data.get("DC_SCT", "")
+    force_diagnose = data.get("DC_FORCE_DIAGNOSE", False)
 
     class ChDir(object):
         """
@@ -61,6 +62,7 @@ def __exit__(self, *args):
                                 solution_process=sol_process,
                                 raw_student_output = raw_stu_output,
                                 ex_type = "NormalExercise",
+                                force_diagnose = force_diagnose,
                                 error = error)
 
     return res
diff --git a/tests/test_check_logic.py b/tests/test_check_logic.py
@@ -94,6 +94,22 @@ def test_check_correct(sct, passes, msg):
     assert output['correct'] == passes
     if msg: assert output['message'] == msg
 
+@pytest.mark.parametrize('sct, passes, msg', [
+    ("Ex().check_correct(has_code('a'), has_code('b'))", False, None),
+    ("Ex().check_correct(has_code('a'), has_code('c'))", False, None),
+    ("Ex().check_correct(has_code('b'), has_code('c', not_typed_msg='x'))", False, 'x'),
+    ("Ex().check_correct(has_code('b', not_typed_msg='x'), has_code('a'))", False, 'x')
+])
+def test_check_correct_force_diagnose(sct, passes, msg):
+    data = {
+        'DC_CODE': "'a'",
+        'DC_SCT': sct,
+        'DC_FORCE_DIAGNOSE': True
+    }
+    output = helper.run(data)
+    assert output['correct'] == passes
+    if msg: assert output['message'] == msg
+
 @pytest.mark.parametrize('sct, passes, msg', [
     ("test_correct(lambda: test_student_typed('a'), lambda: test_student_typed('b'))", True, None),
     ("test_correct(test_student_typed('a'), test_student_typed('b'))", True, None),
