Fix import paths, formatting, views and minor errors

- Submitted file path should be set after changing directory
- Change timeout duration in java test case
- Set shell=True in _compile_command
- Fix errors in code as per tests

1 files changed, 23 insertions, 15 deletions

diff --git a/testapp/tests/test_scilab_evaluation.py b/testapp/tests/test_scilab_evaluation.py
index 072fff6..4c3704d 100644
--- a/testapp/tests/test_scilab_evaluation.py
+++ b/testapp/tests/test_scilab_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from exam.scilab_code_evaluator import ScilabCodeEvaluator
-from exam.settings import SERVER_TIMEOUT
+from testapp.exam.scilab_code_evaluator import ScilabCodeEvaluator
+from testapp.exam.settings import SERVER_TIMEOUT
 
 class ScilabEvaluationTestCases(unittest.TestCase):
     def setUp(self):
@@ -9,31 +9,39 @@ class ScilabEvaluationTestCases(unittest.TestCase):
         self.ref_code_path = "scilab_files/test_add.sce"
         self.in_dir = "/tmp"
         self.test_case_data = []
+        self.timeout_msg = ("Code took more than {0} seconds to run. "
+                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
         self.test = None
 
     def test_correct_answer(self):
         user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a+b;\nendfunction"
-        get_class = ScilabCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
-        result = get_class.evaluate()
-
-        self.assertTrue(result.get("success"))
-        self.assertEqual(result.get("error"), "Correct answer")
-
-    def test_correct_answer_2(self):
-        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a-b;\nendfunction"
-        get_class = ScilabCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
+        get_class = ScilabCodeEvaluator(self.test_case_data, self.test,
+                                             self.language, user_answer,
+                                             self.ref_code_path, self.in_dir)
         result = get_class.evaluate()
 
         self.assertTrue(result.get("success"))
         self.assertEqual(result.get("error"), "Correct answer")
 
     def test_error(self):
-        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\t   c=a+b;\ndis(\tendfunction"
-        get_class = ScilabCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
+        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a+b;\ndis(\tendfunction"
+        get_class = ScilabCodeEvaluator(self.test_case_data, self.test,
+                                             self.language, user_answer,
+                                             self.ref_code_path, self.in_dir)
         result = get_class.evaluate()
  
         self.assertFalse(result.get("success"))
-        self.assertTrue("Error" in result.get("error"))
+        self.assertTrue("error" in result.get("error"))
+
+    def test_infinite_loop(self):
+        user_answer = "funcprot(0)\nfunction[c]=add(a,b)\n\tc=a;\nwhile(1==1)\nend\nendfunction"
+        get_class = ScilabCodeEvaluator(self.test_case_data, self.test,
+                                         self.language, user_answer,
+                                         self.ref_code_path, self.in_dir)
+        result = get_class.evaluate()
+
+        self.assertFalse(result.get("success"))
+        self.assertEquals(result.get("error"), self.timeout_msg)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()