Merge pull request #48 from ankitjavalkar/add-docs

Re apply docs directory in testapp directory and other changes

6 files changed, 56 insertions, 37 deletions

diff --git a/testapp/tests/test_bash_evaluation.py b/testapp/tests/test_bash_evaluation.py
index 3ae3b0b..fd906da 100644
--- a/testapp/tests/test_bash_evaluation.py
+++ b/testapp/tests/test_bash_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from exam.bash_code_evaluator import BashCodeEvaluator
-from exam.settings import SERVER_TIMEOUT
+from testapp.exam.bash_code_evaluator import BashCodeEvaluator
+from testapp.exam.settings import SERVER_TIMEOUT
 
 class BashEvaluationTestCases(unittest.TestCase):
     def setUp(self):
@@ -38,4 +38,4 @@ class BashEvaluationTestCases(unittest.TestCase):
         self.assertEquals(result.get("error"), self.timeout_msg)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/testapp/tests/test_c_cpp_evaluation.py b/testapp/tests/test_c_cpp_evaluation.py
index b820963..fbb8769 100644
--- a/testapp/tests/test_c_cpp_evaluation.py
+++ b/testapp/tests/test_c_cpp_evaluation.py
@@ -1,7 +1,7 @@
 import unittest
 import os
-from exam.cpp_code_evaluator import CppCodeEvaluator
-from exam.settings import SERVER_TIMEOUT
+from testapp.exam.cpp_code_evaluator import CppCodeEvaluator
+from testapp.exam.settings import SERVER_TIMEOUT
 
 class CEvaluationTestCases(unittest.TestCase):
     def setUp(self):
@@ -74,4 +74,4 @@ class CppEvaluationTestCases(unittest.TestCase):
         self.assertEquals(result.get("error"), self.timeout_msg)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/testapp/tests/test_code_evaluation.py b/testapp/tests/test_code_evaluation.py
index fa2b1fa..a13eccc 100644
--- a/testapp/tests/test_code_evaluation.py
+++ b/testapp/tests/test_code_evaluation.py
@@ -1,8 +1,8 @@
 import unittest
 import os
-from exam import python_code_evaluator
-from exam.language_registry import _LanguageRegistry, set_registry, get_registry
-from exam.settings import SERVER_TIMEOUT
+from testapp.exam import python_code_evaluator
+from testapp.exam.language_registry import _LanguageRegistry, set_registry, get_registry
+from testapp.exam.settings import SERVER_TIMEOUT
 
 
 class RegistryTestCase(unittest.TestCase):
@@ -13,7 +13,7 @@ class RegistryTestCase(unittest.TestCase):
 
     def test_set_register(self):
         class_name = getattr(python_code_evaluator, 'PythonCodeEvaluator')
-        self.registry_object.register("python", "exam.python_code_evaluator.PythonCodeEvaluator")
+        self.registry_object.register("python", "testapp.exam.python_code_evaluator.PythonCodeEvaluator")
         self.assertEquals(self.registry_object.get_class("python"), class_name)
 
     def tearDown(self):
@@ -21,4 +21,4 @@ class RegistryTestCase(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/testapp/tests/test_java_evaluation.py b/testapp/tests/test_java_evaluation.py
index d86d7b3..23d8bf4 100644
--- a/testapp/tests/test_java_evaluation.py
+++ b/testapp/tests/test_java_evaluation.py
@@ -1,7 +1,8 @@
 import unittest
 import os
-from exam.java_code_evaluator import JavaCodeEvaluator
-from exam.settings import SERVER_TIMEOUT
+from testapp.exam import code_evaluator as evaluator
+from testapp.exam.java_code_evaluator import JavaCodeEvaluator
+
 
 class JavaEvaluationTestCases(unittest.TestCase):
     def setUp(self):
@@ -9,13 +10,20 @@ class JavaEvaluationTestCases(unittest.TestCase):
         self.ref_code_path = "java_files/main_square.java"
         self.in_dir = "/tmp"
         self.test_case_data = []
+        evaluator.SERVER_TIMEOUT = 9
         self.timeout_msg = ("Code took more than {0} seconds to run. "
-                            "You probably have an infinite loop in your code.").format(SERVER_TIMEOUT)
+                            "You probably have an infinite loop in "
+                            "your code.").format(evaluator.SERVER_TIMEOUT)
         self.test = None
 
+    def tearDown(self):
+        evaluator.SERVER_TIMEOUT = 2
+
     def test_correct_answer(self):
         user_answer = "class Test {\n\tint square_num(int a) {\n\treturn a*a;\n\t}\n}"
-        get_class = JavaCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
+        get_class = JavaCodeEvaluator(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"))
@@ -23,7 +31,9 @@ class JavaEvaluationTestCases(unittest.TestCase):
 
     def test_error(self):
         user_answer = "class Test {\n\tint square_num(int a) {\n\treturn a*a"
-        get_class = JavaCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
+        get_class = JavaCodeEvaluator(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"))
@@ -31,11 +41,13 @@ class JavaEvaluationTestCases(unittest.TestCase):
 
     def test_infinite_loop(self):
         user_answer = "class Test {\n\tint square_num(int a) {\n\t\twhile(0==0){\n\t\t}\n\t}\n}"
-        get_class = JavaCodeEvaluator(self.test_case_data, self.test, self.language, user_answer, self.ref_code_path, self.in_dir)
+        get_class = JavaCodeEvaluator(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()
diff --git a/testapp/tests/test_python_evaluation.py b/testapp/tests/test_python_evaluation.py
index 57e111c..68435c5 100644
--- a/testapp/tests/test_python_evaluation.py
+++ b/testapp/tests/test_python_evaluation.py
@@ -1,8 +1,7 @@
-
 import unittest
 import os
-from exam.python_code_evaluator import PythonCodeEvaluator
-from exam.settings import SERVER_TIMEOUT
+from testapp.exam.python_code_evaluator import PythonCodeEvaluator
+from testapp.exam.settings import SERVER_TIMEOUT
 
 class PythonEvaluationTestCases(unittest.TestCase):
     def setUp(self):
@@ -51,4 +50,4 @@ class PythonEvaluationTestCases(unittest.TestCase):
         self.assertEquals(result.get("error"), self.timeout_msg)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
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()