rebase changes with stdio evaluator

1 files changed, 65 insertions, 22 deletions

diff --git a/yaksh/evaluator_tests/test_python_evaluation.py b/yaksh/evaluator_tests/test_python_evaluation.py
index 40562db..eea9403 100644
--- a/yaksh/evaluator_tests/test_python_evaluation.py
+++ b/yaksh/evaluator_tests/test_python_evaluation.py
@@ -15,13 +15,15 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         self.timeout_msg = ("Code took more than {0} seconds to run. "
             "You probably have an infinite loop in"
             " your code.").format(SERVER_TIMEOUT)
+        self.file_paths = None
 
     def test_correct_answer(self):
         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
-                }
+        kwargs = {'user_answer': user_answer,
+                  'test_case_data': self.test_case_data,
+                  'file_paths': self.file_paths
+                  }
         result = get_class.evaluate(**kwargs)
         self.assertTrue(result.get('success'))
         self.assertEqual(result.get('error'), "Correct answer")
@@ -30,8 +32,9 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         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
-                }
+                  'test_case_data': self.test_case_data,
+                  'file_paths': self.file_paths
+                  }
         result = get_class.evaluate(**kwargs)
         self.assertFalse(result.get('success'))
         self.assertEqual(result.get('error'),
@@ -42,13 +45,14 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         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
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
         }
         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
@@ -63,7 +67,8 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         ]
         get_class = PythonAssertionEvaluator()
         kwargs = {'user_answer': user_answer,
-            'test_case_data': self.test_case_data
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
         }
         result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
@@ -86,7 +91,8 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         ]
         get_class = PythonAssertionEvaluator()
         kwargs = {'user_answer': user_answer,
-            'test_case_data': self.test_case_data
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
         }
         result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
@@ -105,7 +111,8 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         ]
         get_class = PythonAssertionEvaluator()
         kwargs = {'user_answer': user_answer,
-            'test_case_data': self.test_case_data
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
         }
         result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
@@ -126,7 +133,8 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         ]
         get_class = PythonAssertionEvaluator()
         kwargs = {'user_answer': user_answer,
-            'test_case_data': self.test_case_data
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
         }
         result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
@@ -148,7 +156,8 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         ]
         get_class = PythonAssertionEvaluator()
         kwargs = {'user_answer': user_answer,
-            'test_case_data': self.test_case_data
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
         }
         result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
@@ -171,7 +180,8 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
                            ]
         get_class = PythonAssertionEvaluator()
         kwargs = {'user_answer': user_answer,
-                  'test_case_data': self.test_case_data
+                  'test_case_data': self.test_case_data,
+                  'file_paths': self.file_paths
                   }
         result = get_class.evaluate(**kwargs)
         err = result.get("error").splitlines()
@@ -180,6 +190,22 @@ class PythonAssertionEvaluationTestCases(unittest.TestCase):
         for msg in value_error_msg:
             self.assertIn(msg, result.get("error"))
 
+    def test_file_based_assert(self):
+        self.test_case_data = [{"test_case": "assert(ans()=='2')"}]
+        self.file_paths = [(os.getcwd()+"/yaksh/test.txt", False)]
+        user_answer = dedent("""
+            def ans():
+                with open("test.txt") as f:
+                    return f.read()[0]
+            """)
+        get_class = PythonAssertionEvaluator()
+        kwargs = {'user_answer': user_answer,
+            'test_case_data': self.test_case_data,
+            'file_paths': self.file_paths
+        }
+        result = get_class.evaluate(**kwargs)
+        self.assertEqual(result.get('error'), "Correct answer")
+        self.assertTrue(result.get('success'))
 
 class PythonStdoutEvaluationTestCases(unittest.TestCase):
     def setUp(self):
@@ -190,12 +216,14 @@ class PythonStdoutEvaluationTestCases(unittest.TestCase):
         self.timeout_msg = ("Code took more than {0} seconds to run. "
                             "You probably have an infinite loop"
                             " in your code.").format(SERVER_TIMEOUT)
+        self.file_paths = None
 
     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 = PythonStdioEvaluator()
         kwargs = {'user_answer': user_answer,
-                  'test_case_data': self.test_case_data
+                  'test_case_data': self.test_case_data,
+                  'file_paths': self.file_paths
                   }
         result = get_class.evaluate(**kwargs)
         self.assertEqual(result.get('error'), "Correct Answer")
@@ -204,8 +232,9 @@ class PythonStdoutEvaluationTestCases(unittest.TestCase):
     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 = PythonStdioEvaluator()
-        kwargs = {'user_answer': user_answer,
-                  'test_case_data': self.test_case_data
+        kwargs = {'user_answer': user_answer, 
+                  'test_case_data': self.test_case_data,
+                  'file_paths': self.file_paths
                   }
         result = get_class.evaluate(**kwargs)
         self.assertFalse(result.get('success'))
@@ -217,11 +246,7 @@ class PythonStdoutEvaluationTestCases(unittest.TestCase):
         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)
-
-
+    
 class PythonStdIOEvaluator(unittest.TestCase):
 
     def setUp(self):
@@ -305,12 +330,30 @@ class PythonStdIOEvaluator(unittest.TestCase):
         get_class = PythonStdioEvaluator()
 
         kwargs = {'user_answer': user_answer,
-                  'test_case_data': self.test_case_data
+                  'test_case_data': self.test_case_data,
                   }
         result = get_class.evaluate(**kwargs)
         self.assertFalse(result.get('success'))
         self.assertIn("Incorrect Answer", result.get('error'))
 
+    def test_file_based_answer(self):
+        self.test_case_data = [{"expected_input": "", "expected_output": "2"}]
+        self.file_paths = [(os.getcwd()+"/yaksh/test.txt", False)]
+
+        user_answer = dedent("""
+                            with open("test.txt") as f:
+                                a = f.read()
+                                print a[0]
+                             """
+                             )
+        get_class = PythonStdioEvaluator()
+        kwargs = {'user_answer': user_answer,
+                  'test_case_data': self.test_case_data,
+                  'file_paths': self.file_paths
+                  }
+        result = get_class.evaluate(**kwargs)
+        self.assertEqual(result.get('error'), "Correct Answer")
+        self.assertTrue(result.get('success'))
 
 if __name__ == '__main__':
     unittest.main()