Updated has_expr feedback logic and added test

Author: JamesDanielOReilly

pythonwhat/checks/has_funcs.py

@@ -349,19 +349,18 @@ def has_expr(
         if isinstance(eval_sol, str):
             fmt_kwargs["sol_eval"] = '\'{}\''.format(fmt_kwargs["sol_eval"])
 
-    # reformat student evaluation string if it is too long or contains newlines
-    if incorrect_msg == DEFAULT_INCORRECT_MSG:
-        fmt_kwargs["stu_eval"] = utils.shorten_string(fmt_kwargs["stu_eval"])
+    # reformat student evaluation string if it is too long
+    fmt_kwargs["stu_eval"] = utils.shorten_string(fmt_kwargs["stu_eval"])
 
     # check if student or solution evaluations are too long or contain newlines
     if incorrect_msg == DEFAULT_INCORRECT_MSG and (
         len(fmt_kwargs["sol_eval"]) > 50 or
         utils.has_newline(fmt_kwargs["stu_eval"]) or
         utils.has_newline(fmt_kwargs["sol_eval"]) or
         fmt_kwargs["stu_eval"] == fmt_kwargs["sol_eval"]):
-            fmt_kwargs["stu_eval"] = None
-            fmt_kwargs["sol_eval"] = None
-            incorrect_msg = "Expected something different."
+        fmt_kwargs["stu_eval"] = None
+        fmt_kwargs["sol_eval"] = None
+        incorrect_msg = "Expected something different."
 
     # tests ---
     # error in process

tests/test_messaging.py

@@ -728,7 +728,7 @@ def test_has_equal_value_dont_wrap_newline():
     assert output["message"] == "Check your call of <code>print()</code>. Did you correctly specify the first argument? Expected something different."  # nopep8
 
 
-def test_has_equal_value_shorten_too_long():
+def test_has_equal_value_shorten_submission():
     sol = """print('short text')"""
     stu = """print('This text is longer than 50 characters if I copy it 3 times. This text is longer than 50 characters if I copy it 3 times. This text is longer than 50 characters if I copy it 3 times.')"""  # nopep8
     sct = """Ex().check_function('print', index=0, signature=False).check_args(0).has_equal_value()"""
@@ -742,6 +742,21 @@ def test_has_equal_value_shorten_too_long():
     assert not output["correct"]
     assert output["message"] == "Check your call of <code>print()</code>. Did you correctly specify the first argument? Expected <code>'short text'</code>, but got <code>'This text is longer than 50 characters if I ...</code>."  # nopep8
 
+
+def test_has_equal_value_dont_shorten_solution():
+    sol = """print('This solution is really really really really really really really really long!')"""
+    stu = """print('short text')"""  # nopep8
+    sct = """Ex().check_function('print', index=0, signature=False).check_args(0).has_equal_value()"""
+    output = helper.run(
+        {
+            "DC_CODE": stu,
+            "DC_SOLUTION": sol,
+            "DC_SCT": sct,
+        }
+    )
+    assert not output["correct"]
+    assert output["message"] == "Check your call of <code>print()</code>. Did you correctly specify the first argument? Expected something different."  # nopep8
+
 ## Check has no error ---------------------------------------------------------