Merge pull request #96 from ankitjavalkar/code-eval-refactor-clean2

Code evaluator refactor

1 files changed, 156 insertions, 68 deletions

diff --git a/yaksh/evaluator_tests/test_python_evaluation.py b/yaksh/evaluator_tests/test_python_evaluation.py
index c55f04f..1e867a3 100644
--- a/yaksh/evaluator_tests/test_python_evaluation.py
+++ b/yaksh/evaluator_tests/test_python_evaluation.py
@@ -1,67 +1,71 @@
 import unittest
 import os
-from yaksh.python_code_evaluator import PythonCodeEvaluator
+from yaksh.python_assertion_evaluator import PythonAssertionEvaluator
+from yaksh.python_stdout_evaluator import PythonStdoutEvaluator
 from yaksh.settings import SERVER_TIMEOUT
 from textwrap import dedent
 
 
-class PythonEvaluationTestCases(unittest.TestCase):
+class PythonAssertionEvaluationTestCases(unittest.TestCase):
     def setUp(self):
-        self.language = "Python"
-        self.test = None
-        self.test_case_data = [{"func_name": "add",
-                                "expected_answer": "5",
-                                "test_id": u'null',
-                                "pos_args": ["3", "2"],
-                                "kw_args": {}
-                                }]
+        self.test_case_data = [{"test_case": 'assert(add(1,2)==3)'},
+            {"test_case": 'assert(add(-1,2)==1)'},
+            {"test_case":  'assert(add(-1,-2)==-3)'},
+        ]
+        self.timeout_msg = ("Code took more than {0} seconds to run. "
+            "You probably have an infinite loop in"
+            " your code.").format(SERVER_TIMEOUT)
 
     def test_correct_answer(self):
-        user_answer = dedent("""
-        def add(a, b):
-            return a + b
-        """)
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
+        user_answer = "def add(a,b):\n\treturn a + b"
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer, 
+                    'test_case_data': self.test_case_data
+                }
+        result = get_class.evaluate(**kwargs)
+        self.assertTrue(result.get('success'))
+        self.assertEqual(result.get('error'), "Correct answer")
 
     def test_incorrect_answer(self):
-        user_answer = dedent("""
-        def add(a, b):
-            return a - b
-        """)
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
-        self.assertFalse(result.get("success"))
-        self.assertEqual(result.get("error"), "AssertionError  in: assert add(3, 2) == 5")
+        user_answer = "def add(a,b):\n\treturn a - b"
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+                    'test_case_data': self.test_case_data
+                }
+        result = get_class.evaluate(**kwargs)
+        self.assertFalse(result.get('success'))
+        self.assertEqual(result.get('error'),
+            "AssertionError  in: assert(add(1,2)==3)"
+        )
 
     def test_infinite_loop(self):
-        user_answer = dedent("""
-        def add(a, b):
-            while True:
-                pass
-        """)
-        timeout_msg = ("Code took more than {0} seconds to run. "
-                       "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
-        self.assertFalse(result.get("success"))
-        self.assertEquals(result.get("error"), timeout_msg)
+        user_answer = "def add(a, b):\n\twhile True:\n\t\tpass"
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
+        self.assertFalse(result.get('success'))
+        self.assertEqual(result.get('error'), self.timeout_msg)
 
     def test_syntax_error(self):
         user_answer = dedent("""
         def add(a, b);
             return a + b
         """)
-        syntax_error_msg = ["Traceback", "call", "File", "line", "<string>",
-                            "SyntaxError", "invalid syntax"]
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
+        syntax_error_msg = ["Traceback", 
+            "call", 
+            "File", 
+            "line", 
+            "<string>",
+            "SyntaxError", 
+            "invalid syntax"
+        ]
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
         self.assertFalse(result.get("success"))
         self.assertEqual(5, len(err))
@@ -73,11 +77,18 @@ class PythonEvaluationTestCases(unittest.TestCase):
         def add(a, b):
         return a + b
         """)
-        indent_error_msg = ["Traceback", "call", "File", "line", "<string>",
-                            "IndentationError", "indented block"]
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
+        indent_error_msg = ["Traceback", "call", 
+            "File",
+            "line",
+            "<string>",
+            "IndentationError",
+            "indented block"
+        ]
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
         self.assertFalse(result.get("success"))
         self.assertEqual(5, len(err))
@@ -86,10 +97,17 @@ class PythonEvaluationTestCases(unittest.TestCase):
 
     def test_name_error(self):
         user_answer = ""
-        name_error_msg = ["Traceback", "call", "NameError", "name", "defined"]
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
+        name_error_msg = ["Traceback", 
+            "call",
+            "NameError",
+            "name",
+            "defined"
+        ]
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
         self.assertFalse(result.get("success"))
         self.assertEqual(2, len(err))
@@ -101,11 +119,16 @@ class PythonEvaluationTestCases(unittest.TestCase):
         def add(a, b):
             return add(3, 3)
         """)
-        recursion_error_msg = ["Traceback", "call", "RuntimeError",
-                                "maximum recursion depth exceeded"]
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
+        recursion_error_msg = ["Traceback",
+            "call", 
+            "RuntimeError",
+            "maximum recursion depth exceeded"
+        ]
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
         self.assertFalse(result.get("success"))
         self.assertEqual(2, len(err))
@@ -117,10 +140,17 @@ class PythonEvaluationTestCases(unittest.TestCase):
         def add(a):
             return a + b
         """)
-        type_error_msg = ["Traceback", "call", "TypeError", "exactly", "argument"]
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
+        type_error_msg = ["Traceback", 
+            "call", 
+            "TypeError",
+            "exactly",
+            "argument"
+        ]
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
         self.assertFalse(result.get("success"))
         self.assertEqual(2, len(err))
@@ -133,15 +163,73 @@ class PythonEvaluationTestCases(unittest.TestCase):
             c = 'a'
             return int(a) + int(b) + int(c)
         """)
-        value_error_msg = ["Traceback", "call", "ValueError", "invalid literal", "base"]
-        get_evaluator = PythonCodeEvaluator(self.test_case_data, self.test,
-                                            self.language, user_answer)
-        result = get_evaluator.evaluate()
+        value_error_msg = ["Traceback",
+            "call",
+            "ValueError",
+            "invalid literal",
+            "base"
+        ]
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+                    'test_case_data': self.test_case_data
+                }
+        result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
         self.assertFalse(result.get("success"))
         self.assertEqual(2, len(err))
         for msg in value_error_msg:
             self.assertIn(msg, result.get("error"))
 
+class PythonStdoutEvaluationTestCases(unittest.TestCase):
+    def setUp(self):
+        self.test_case_data = [{"expected_output": "0 1 1 2 3"}]
+        self.timeout_msg = ("Code took more than {0} seconds to run. "
+            "You probably have an infinite loop"
+            " in your code.").format(SERVER_TIMEOUT)
+
+    def test_correct_answer(self):
+        user_answer = "a,b=0,1\nfor i in range(5):\n\tprint a,\n\ta,b=b,a+b"
+        get_class = PythonStdoutEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
+        self.assertEqual(result.get('error'), "Correct answer")
+        self.assertTrue(result.get('success'))
+
+    def test_incorrect_answer(self):
+        user_answer = "a,b=0,1\nfor i in range(5):\n\tprint b,\n\ta,b=b,a+b"
+        get_class = PythonStdoutEvaluator()
+        kwargs = {'user_answer': user_answer, 
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
+        self.assertFalse(result.get('success'))
+        self.assertEqual(result.get('error'), "Incorrect Answer")
+
+    def test_direct_printed_answer(self):
+        user_answer = "print '0 1 1 2 3'"
+        error_msg = ("Incorrect Answer: Please avoid printing"
+            " the expected output directly"
+        )
+        get_class = PythonStdoutEvaluator()
+        kwargs = {'user_answer': user_answer, 
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
+        self.assertFalse(result.get('success'))
+        self.assertEqual(result.get('error'), error_msg)
+
+    def test_infinite_loop(self):
+        user_answer = "def add(a, b):\n\twhile True:\n\t\tpass"
+        get_class = PythonStdoutEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data
+        }
+        result = get_class.evaluate(**kwargs)
+        self.assertFalse(result.get('success'))
+        self.assertEqual(result.get('error'), 'Incorrect Answer')
+
+
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()