Merge pull request #48 from ankitjavalkar/add-docs

Re apply docs directory in testapp directory and other changes

20 files changed, 224 insertions, 62 deletions

diff --git a/testapp/docs/sample.args b/testapp/docs/sample.args
new file mode 100644
index 0000000..4d9f00d
--- /dev/null
+++ b/testapp/docs/sample.args
@@ -0,0 +1,2 @@
+1 2
+2 1
diff --git a/testapp/docs/sample.sh b/testapp/docs/sample.sh
new file mode 100755
index 0000000..e935cb3
--- /dev/null
+++ b/testapp/docs/sample.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+[[ $# -eq 2 ]] && echo $(( $1 + $2 )) && exit $(( $1 + $2 ))
diff --git a/testapp/docs/sample_questions.py b/testapp/docs/sample_questions.py
new file mode 100644
index 0000000..60f32cb
--- /dev/null
+++ b/testapp/docs/sample_questions.py
@@ -0,0 +1,84 @@
+from datetime import date
+
+questions = [
+[Question(
+    summary='Factorial',
+    points=2,
+    language='python',
+    type='code',
+    description='''
+Write a function called <code>fact</code> which takes a single integer argument
+(say <code>n</code>) and returns the factorial of the number. 
+For example:<br/>
+<code>fact(3) -> 6</code>
+''',
+    test='''
+assert fact(0) == 1
+assert fact(5) == 120
+''',
+    snippet="def fact(num):"
+    ),
+#Add tags here as a list of string.
+['Python','function','factorial'],
+],
+
+[Question(
+    summary='Simple function',
+    points=1,
+    language='python',
+    type='code',
+    description='''Create a simple function called <code>sqr</code> which takes a single 
+argument and returns the square of the argument. For example: <br/>
+<code>sqr(3) -> 9</code>.''',
+    test='''
+import math
+assert sqr(3) == 9
+assert abs(sqr(math.sqrt(2)) - 2.0) < 1e-14 
+    ''',
+    snippet="def sqr(num):"
+    ),
+#Add tags here as a list of string.
+['Python','function'],
+],
+
+[Question(
+    summary='Bash addition',
+    points=2,
+    language='bash',
+    type='code',
+    description='''Write a shell script which takes two arguments on the
+    command line and prints the sum of the two on the output.''',
+    test='''\
+docs/sample.sh
+docs/sample.args
+''',
+    snippet="#!/bin/bash"
+    ),
+#Add tags here as a list of string.
+[''],
+],
+
+[Question(
+    summary='Size of integer in Python',
+    points=0.5,
+    language='python',
+    type='mcq',
+    description='''What is the largest integer value that can be represented
+in Python?''',
+    options='''No Limit
+2**32
+2**32 - 1
+None of the above
+''',
+    test = "No Limit"
+    ),
+#Add tags here as a list of string.
+['mcq'],
+],
+
+] #list of questions ends here
+
+quiz = Quiz(start_date=date.today(),
+            duration=10,
+            description='Basic Python Quiz 1'
+            )
diff --git a/testapp/docs/sample_questions.xml b/testapp/docs/sample_questions.xml
new file mode 100644
index 0000000..53c76f8
--- /dev/null
+++ b/testapp/docs/sample_questions.xml
@@ -0,0 +1,43 @@
+<question_bank>
+
+<question>
+<summary>
+Factorial
+</summary>
+<description>
+Write a function called "fact" which takes a single integer argument (say "n") 
+and returns the factorial of the number.
+For example fact(3) -> 6
+</description>
+<points>2</points>
+<type>python</type>
+<test>
+assert fact(0) == 1
+assert fact(5) == 120
+</test>
+<options>
+</options>
+</question>
+
+<question>
+<summary>
+Simple function
+</summary>
+<description>
+Create a simple function called "sqr" which takes a single argument and 
+returns the square of the argument
+For example sqr(3) -> 9.
+</description>
+<points>1</points>
+<type>python</type>
+<test>
+import math
+assert sqr(3) == 9
+assert abs(sqr(math.sqrt(2)) - 2.0) &lt; 1e-14 
+</test>
+<options>
+</options>
+</question>
+
+
+</question_bank>
diff --git a/testapp/exam/bash_code_evaluator.py b/testapp/exam/bash_code_evaluator.py
index 23c0ae5..a468fd7 100644
--- a/testapp/exam/bash_code_evaluator.py
+++ b/testapp/exam/bash_code_evaluator.py
@@ -16,13 +16,13 @@ class BashCodeEvaluator(CodeEvaluator):
                      ref_code_path=None, in_dir=None):
         super(BashCodeEvaluator, self).__init__(test_case_data, test, language, user_answer, 
                                                  ref_code_path, in_dir)
-        self.submit_path = self.create_submit_code_file('submit.sh')
         self.test_case_args = self._setup()
 
     # Private Protocol ##########
     def _setup(self):
         super(BashCodeEvaluator, self)._setup()
 
+        self.submit_path = self.create_submit_code_file('submit.sh')
         self._set_file_as_executable(self.submit_path)
         get_ref_path, get_test_case_path = self.ref_code_path.strip().split(',')
         get_ref_path = get_ref_path.strip()
@@ -73,11 +73,11 @@ class BashCodeEvaluator(CodeEvaluator):
         success = False
 
         if test_case_path is None or "":
-            ret = self.run_command(ref_path, stdin=None,
+            ret = self._run_command(ref_path, stdin=None,
                                     stdout=subprocess.PIPE,
                                     stderr=subprocess.PIPE)
             proc, inst_stdout, inst_stderr = ret
-            ret = self.run_command(submit_path, stdin=None,
+            ret = self._run_command(submit_path, stdin=None,
                                     stdout=subprocess.PIPE,
                                     stderr=subprocess.PIPE)
             proc, stdnt_stdout, stdnt_stderr = ret
@@ -103,12 +103,12 @@ class BashCodeEvaluator(CodeEvaluator):
                 loop_count += 1
                 if valid_answer:
                     args = [ref_path] + [x for x in test_case.split()]
-                    ret = self.run_command(args, stdin=None,
+                    ret = self._run_command(args, stdin=None,
                                             stdout=subprocess.PIPE,
                                             stderr=subprocess.PIPE)
                     proc, inst_stdout, inst_stderr = ret
                     args = [submit_path]+[x for x in test_case.split()]
-                    ret = self.run_command(args, stdin=None,
+                    ret = self._run_command(args, stdin=None,
                                             stdout=subprocess.PIPE,
                                             stderr=subprocess.PIPE)
                     proc, stdnt_stdout, stdnt_stderr = ret
diff --git a/testapp/exam/code_evaluator.py b/testapp/exam/code_evaluator.py
index 2a57257..381b2e8 100644
--- a/testapp/exam/code_evaluator.py
+++ b/testapp/exam/code_evaluator.py
@@ -10,7 +10,7 @@ import subprocess
 import re
 import json
 # Local imports.
-from settings import SERVER_PORTS, SERVER_TIMEOUT, SERVER_POOL_PORT
+from settings import SERVER_TIMEOUT
 
 
 MY_DIR = abspath(dirname(__file__))
diff --git a/testapp/exam/code_server.py b/testapp/exam/code_server.py
index 580379f..1411ded 100755
--- a/testapp/exam/code_server.py
+++ b/testapp/exam/code_server.py
@@ -30,8 +30,8 @@ import subprocess
 import re
 import json
 # Local imports.
-from settings import SERVER_PORTS, SERVER_TIMEOUT, SERVER_POOL_PORT
-from language_registry import set_registry
+from settings import SERVER_PORTS, SERVER_POOL_PORT
+from language_registry import get_registry, set_registry
 
 
 MY_DIR = abspath(dirname(__file__))
diff --git a/testapp/exam/cpp_code_evaluator.py b/testapp/exam/cpp_code_evaluator.py
index 15e2b13..7242884 100644
--- a/testapp/exam/cpp_code_evaluator.py
+++ b/testapp/exam/cpp_code_evaluator.py
@@ -17,7 +17,6 @@ class CppCodeEvaluator(CodeEvaluator):
         super(CppCodeEvaluator, self).__init__(test_case_data, test, language,
                                                  user_answer, ref_code_path,
                                                  in_dir)
-        self.submit_path = self.create_submit_code_file('submit.c')
         self.test_case_args = self._setup()
 
     # Private Protocol ##########
@@ -26,6 +25,7 @@ class CppCodeEvaluator(CodeEvaluator):
 
         get_ref_path = self.ref_code_path
         ref_path, test_case_path = self._set_test_code_file_path(get_ref_path)
+        self.submit_path = self.create_submit_code_file('submit.c')
 
         # Set file paths
         c_user_output_path = os.getcwd() + '/output'
diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py
index 93584a6..b56e545 100644
--- a/testapp/exam/forms.py
+++ b/testapp/exam/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from exam.models import Profile, Quiz, Question, TestCase
+from testapp.exam.models import Profile, Quiz, Question, TestCase
 
 from django.contrib.auth import authenticate
 from django.contrib.auth.models import User
@@ -187,7 +187,7 @@ class QuestionForm(forms.ModelForm):
     description = forms.CharField(widget=forms.Textarea\
                                             (attrs={'cols': 40, 'rows': 1}))
     points = forms.FloatField()
-    solution = forms.CharField(widget=forms.Textarea\
+    test = forms.CharField(widget=forms.Textarea\
                                     (attrs={'cols': 40, 'rows': 1}), required=False)
     options = forms.CharField(widget=forms.Textarea\
                               (attrs={'cols': 40, 'rows': 1}), required=False)
@@ -206,6 +206,7 @@ class QuestionForm(forms.ModelForm):
         summary = self.cleaned_data.get("summary")
         description = self.cleaned_data.get("description")
         points = self.cleaned_data.get("points")
+        test = self.cleaned_data.get("test")
         options = self.cleaned_data.get("options")
         language = self.cleaned_data.get("language")
         type = self.cleaned_data.get("type")
@@ -216,7 +217,7 @@ class QuestionForm(forms.ModelForm):
         new_question.summary = summary
         new_question.description = description
         new_question.points = points
-        # new_question.test = test
+        new_question.test = test
         new_question.options = options
         new_question.language = language
         new_question.type = type
diff --git a/testapp/exam/java_code_evaluator.py b/testapp/exam/java_code_evaluator.py
index 08ae208..4367259 100644
--- a/testapp/exam/java_code_evaluator.py
+++ b/testapp/exam/java_code_evaluator.py
@@ -17,7 +17,6 @@ class JavaCodeEvaluator(CodeEvaluator):
         super(JavaCodeEvaluator, self).__init__(test_case_data, test,
                                                  language, user_answer,
                                                  ref_code_path, in_dir)
-        self.submit_path = self.create_submit_code_file('Test.java')
         self.test_case_args = self._setup()
 
     # Private Protocol ##########
@@ -25,6 +24,7 @@ class JavaCodeEvaluator(CodeEvaluator):
         super(JavaCodeEvaluator, self)._setup()
 
         ref_path, test_case_path = self._set_test_code_file_path(self.ref_code_path)
+        self.submit_path = self.create_submit_code_file('Test.java')
 
         # Set file paths
         java_student_directory = os.getcwd() + '/'
@@ -91,9 +91,10 @@ class JavaCodeEvaluator(CodeEvaluator):
             main_err = self._remove_null_substitute_char(main_err)
 
             if main_err == '':
-                ret = self._run_command(run_command_args, stdin=None,
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE)
+                ret = self._run_command(run_command_args, shell=True,
+                                         stdin=None,
+                                         stdout=subprocess.PIPE,
+                                         stderr=subprocess.PIPE)
                 proc, stdout, stderr = ret
                 if proc.returncode == 0:
                     success, err = True, "Correct answer"
diff --git a/testapp/exam/scilab_code_evaluator.py b/testapp/exam/scilab_code_evaluator.py
index 53640cc..392cd45 100644
--- a/testapp/exam/scilab_code_evaluator.py
+++ b/testapp/exam/scilab_code_evaluator.py
@@ -17,7 +17,9 @@ class ScilabCodeEvaluator(CodeEvaluator):
         super(ScilabCodeEvaluator, self).__init__(test_case_data, test,
                                                  language, user_answer,
                                                  ref_code_path, in_dir)
-        self.submit_path = self.create_submit_code_file('function.sci')
+
+        # Removes all the commands that terminates scilab
+        self.user_answer, self.terminate_commands = self._remove_scilab_exit(user_answer.lstrip())
         self.test_case_args = self._setup()
 
     # Private Protocol ##########
@@ -25,6 +27,7 @@ class ScilabCodeEvaluator(CodeEvaluator):
         super(ScilabCodeEvaluator, self)._setup()
 
         ref_path, test_case_path = self._set_test_code_file_path(self.ref_code_path)
+        self.submit_path = self.create_submit_code_file('function.sci')
 
         return ref_path, # Return as a tuple
 
@@ -36,6 +39,13 @@ class ScilabCodeEvaluator(CodeEvaluator):
     def _check_code(self, ref_path):
         success = False
 
+        # Throw message if there are commmands that terminates scilab
+        add_err=""
+        if self.terminate_commands:
+            add_err = "Please do not use exit, quit and abort commands in your\
+                        code.\n Otherwise your code will not be evaluated\
+                        correctly.\n"
+
         cmd = 'printf "lines(0)\nexec(\'{0}\',2);\nquit();"'.format(ref_path)
         cmd += ' | timeout 8 scilab-cli -nb'
         ret = self._run_command(cmd,
@@ -63,15 +73,15 @@ class ScilabCodeEvaluator(CodeEvaluator):
             Removes exit, quit and abort from the scilab code
         """
         new_string = ""
-        i = 0
+        terminate_commands = False
         for line in string.splitlines():
             new_line = re.sub(r"exit.*$", "", line)
             new_line = re.sub(r"quit.*$", "", new_line)
             new_line = re.sub(r"abort.*$", "", new_line)
             if line != new_line:
-                i = i + 1
+                terminate_commands = True
             new_string = new_string + '\n' + new_line
-        return new_string, i
+        return new_string, terminate_commands
 
     def _get_error(self, string):
         """
diff --git a/testapp/exam/templates/exam/add_question.html b/testapp/exam/templates/exam/add_question.html
index 43f09e1..c744549 100644
--- a/testapp/exam/templates/exam/add_question.html
+++ b/testapp/exam/templates/exam/add_question.html
@@ -30,7 +30,7 @@
   <tr><td>Snippet: <td>{{ form.snippet }}{{ form.snippet.errors }}</td></tD></td></tr>
   <tr><td>Tags: <td>{{ form.tags }}
   <tr><td id='label_option'>Options: <td>{{ form.options }}  {{form.options.errors}}
-  <tr><td id='label_solution'>Test: <td>{{ form.solution }}  {{form.solution.errors}}
+  <tr><td id='label_solution'>Test: <td>{{ form.test }}  {{form.test.errors}}
   <tr><td id='label_ref_code_path'>Reference Code Path: <td>{{ form.ref_code_path }}  {{form.ref_code_path.errors}}
 
     <form method="post" action="">
diff --git a/testapp/exam/tests.py b/testapp/exam/tests.py
index ff48c25..7a8d30c 100644
--- a/testapp/exam/tests.py
+++ b/testapp/exam/tests.py
@@ -1,5 +1,5 @@
 from django.utils import unittest
-from exam.models import User, Profile, Question, Quiz, QuestionPaper,\
+from testapp.exam.models import User, Profile, Question, Quiz, QuestionPaper,\
     QuestionSet, AnswerPaper, Answer, TestCase
 import datetime, json
 
diff --git a/testapp/exam/views.py b/testapp/exam/views.py
index 5b7baac..0ca404d 100644
--- a/testapp/exam/views.py
+++ b/testapp/exam/views.py
@@ -20,7 +20,7 @@ from testapp.exam.models import Quiz, Question, QuestionPaper, QuestionSet
 from testapp.exam.models import Profile, Answer, AnswerPaper, User, TestCase
 from testapp.exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\
                 QuestionForm, RandomQuestionForm, TestCaseFormSet
-from exam.xmlrpc_clients import code_server
+from testapp.exam.xmlrpc_clients import code_server
 from settings import URL_ROOT
 from testapp.exam.models import AssignmentUpload
 
@@ -291,6 +291,7 @@ def edit_question(request):
     description = request.POST.getlist('description')
     points = request.POST.getlist('points')
     options = request.POST.getlist('options')
+    test = request.POST.getlist('test')
     type = request.POST.getlist('type')
     active = request.POST.getlist('active')
     language = request.POST.getlist('language')
@@ -913,9 +914,8 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
 
     if not user.is_authenticated() or paper.end_time < datetime.datetime.now():
         return my_redirect('/exam/login/')
+    
     question = get_object_or_404(Question, pk=q_id)
-    q_paper = QuestionPaper.objects.get(id=questionpaper_id)
-    paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper)
     test_cases = TestCase.objects.filter(question=question)
 
     snippet_code = request.POST.get('snippet')
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()