From 6667efae7acb86f60b0ebd4dabb959bed759bc16 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Mon, 6 May 2013 11:56:16 +0530 Subject: Function to check C-C++ code Added a function which compiles C and C++ code submitted by the student. 1) If compilation is successful, then the submitted code is tested using test-cases. 2) To test the function written by the student, a C++ file calls the function and passes the argument to the function. Then the function checks for the expected return value. 3) If the return value is as expected, then a different set of arguments are passed, and the output is checked. 4) If for all set of arguments the output is as expected then the student code is graded correct else the error is displayed to the student. Changed the way the code is graded. Previously, the algorithm checked the student code for all test-cases. If all the test-cases were satisfied, the last-line of the program was reached and printed "All Correct". So at any point if a test-case fails, the last line is not reached as the program was terminate. When the string "All Correct" was found in the output, the code was graded as RIGHT else WRONG. This is not a proper way for code checking, as the student code *may* contain a print statement with the string('All Correct'), and thus can get program RIGHT even though it is WRONG. So now the student code is tested as follows: 1) The code checks for all test-cases. 2) If all test-cases are satisfied then it returns 0. 3) If any one of the test-case fails, the program is terminated and will return 1. 4) Now depending on the return status(0 or 1), it will grade the code. a) if 0 then RIGHT b) if 1 then WRONG This ensures, no manipulation from student side. --- testapp/code_server.py | 376 ++++++++++++++++++++++++++++------- testapp/docs/add.c | 4 + testapp/docs/add.cpp | 6 + testapp/docs/array_sum.c | 10 + testapp/docs/array_sum.cpp | 10 + testapp/docs/fact.c | 10 + testapp/docs/fact.cpp | 16 ++ testapp/docs/greatest.c | 15 ++ testapp/docs/greatest.cpp | 15 ++ testapp/docs/hello_name.c | 16 ++ testapp/docs/main.cpp | 30 +++ testapp/docs/main2.c | 28 +++ testapp/docs/main_array_sum.cpp | 32 +++ testapp/docs/main_fact.cpp | 30 +++ testapp/docs/main_greatest.cpp | 32 +++ testapp/docs/main_hello_name.c | 29 +++ testapp/docs/main_palindrome.cpp | 30 +++ testapp/docs/palindrome.c | 20 ++ testapp/docs/palindrome.cpp | 19 ++ testapp/docs/sample.c | 20 ++ testapp/docs/sample.cpp | 7 + testapp/exam/forms.py | 33 +-- testapp/exam/models.py | 5 +- testapp/exam/views.py | 2 +- testapp/exam/xmlrpc_clients.py | 20 +- testapp/templates/exam/question.html | 9 +- testapp/test_server.py | 179 ++++++++++++++--- 27 files changed, 875 insertions(+), 128 deletions(-) create mode 100644 testapp/docs/add.c create mode 100644 testapp/docs/add.cpp create mode 100644 testapp/docs/array_sum.c create mode 100644 testapp/docs/array_sum.cpp create mode 100644 testapp/docs/fact.c create mode 100644 testapp/docs/fact.cpp create mode 100644 testapp/docs/greatest.c create mode 100644 testapp/docs/greatest.cpp create mode 100644 testapp/docs/hello_name.c create mode 100755 testapp/docs/main.cpp create mode 100755 testapp/docs/main2.c create mode 100755 testapp/docs/main_array_sum.cpp create mode 100755 testapp/docs/main_fact.cpp create mode 100755 testapp/docs/main_greatest.cpp create mode 100755 testapp/docs/main_hello_name.c create mode 100755 testapp/docs/main_palindrome.cpp create mode 100644 testapp/docs/palindrome.c create mode 100644 testapp/docs/palindrome.cpp create mode 100755 testapp/docs/sample.c create mode 100755 testapp/docs/sample.cpp diff --git a/testapp/code_server.py b/testapp/code_server.py index 1276c76..ad15501 100755 --- a/testapp/code_server.py +++ b/testapp/code_server.py @@ -1,13 +1,13 @@ #!/usr/bin/env python """This server runs an XMLRPC server that can be submitted code and tests -and returns the output. It *should* be run as root and will run as the user -'nobody' so as to minimize any damange by errant code. This can be configured +and returns the output. It *should* be run as root and will run as the user +'nobody' so as to minimize any damange by errant code. This can be configured by editing settings.py to run as many servers as desired. One can also specify the ports on the command line. Here are examples:: $ sudo ./code_server.py # Runs servers based on settings.py:SERVER_PORTS one server per port given. - + or:: $ sudo ./code_server.py 8001 8002 8003 8004 8005 @@ -34,6 +34,7 @@ from settings import SERVER_PORTS, SERVER_TIMEOUT, SERVER_POOL_PORT MY_DIR = abspath(dirname(__file__)) + def run_as_nobody(): """Runs the current process as nobody.""" # Set the effective uid and to that of nobody. @@ -46,15 +47,16 @@ def run_as_nobody(): # c.f. http://pguides.net/python/timeout-a-function class TimeoutException(Exception): pass - + + def timeout_handler(signum, frame): """A handler for the ALARM signal.""" raise TimeoutException('Code took too long to run.') -################################################################################ +############################################################################### # `CodeServer` class. -################################################################################ +############################################################################### class CodeServer(object): """A code server that executes user submitted test code, tests it and reports if the code was correct or not. @@ -63,29 +65,29 @@ class CodeServer(object): self.port = port self.queue = queue msg = 'Code took more than %s seconds to run. You probably '\ - 'have an infinite loop in your code.'%SERVER_TIMEOUT + 'have an infinite loop in your code.' % SERVER_TIMEOUT self.timeout_msg = msg def run_python_code(self, answer, test_code, in_dir=None): - """Tests given Python function (`answer`) with the `test_code` supplied. - If the optional `in_dir` keyword argument is supplied it changes the - directory to that directory (it does not change it back to the original when - done). This function also timesout when the function takes more than - SERVER_TIMEOUT seconds to run to prevent runaway code. - + """Tests given Python function (`answer`) with the `test_code` + supplied. If the optional `in_dir` keyword argument is supplied + it changes the directory to that directory (it does not change + it back to the original when done). This function also timesout + when the function takes more than SERVER_TIMEOUT seconds to run + to prevent runaway code. Returns ------- - + A tuple: (success, error message). - + """ if in_dir is not None and isdir(in_dir): os.chdir(in_dir) - + # Add a new signal handler for the execution of this code. old_handler = signal.signal(signal.SIGALRM, timeout_handler) signal.alarm(SERVER_TIMEOUT) - + success = False tb = None try: @@ -111,8 +113,8 @@ class CodeServer(object): finally: del tb # Set back any original signal handler. - signal.signal(signal.SIGALRM, old_handler) - + signal.signal(signal.SIGALRM, old_handler) + # Cancel the signal if any, see signal.alarm documentation. signal.alarm(0) @@ -133,25 +135,26 @@ class CodeServer(object): If not, we assume they are relative paths w.r.t. the location of this code_server script. - If the optional `in_dir` keyword argument is supplied it changes the - directory to that directory (it does not change it back to the original when - done). + If the optional `in_dir` keyword argument is supplied it changes the + directory to that directory (it does not change it back to the original + when done). Returns ------- - + A tuple: (success, error message). - + """ if in_dir is not None and isdir(in_dir): os.chdir(in_dir) def _set_exec(fname): - os.chmod(fname, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR - |stat.S_IRGRP|stat.S_IWGRP|stat.S_IXGRP - |stat.S_IROTH|stat.S_IWOTH|stat.S_IXOTH) + os.chmod(fname, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR + | stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP + | stat.S_IROTH | stat.S_IWOTH | stat.S_IXOTH) submit_f = open('submit.sh', 'w') - submit_f.write(answer.lstrip()); submit_f.close() + submit_f.write(answer.lstrip()) + submit_f.close() submit_path = abspath(submit_f.name) _set_exec(submit_path) @@ -168,7 +171,8 @@ class CodeServer(object): # Do whatever testing needed. success = False try: - success, err = self.check_bash_script(ref_path, submit_path, test_case_path) + success, err = self.check_bash_script(ref_path, submit_path, + test_case_path) except TimeoutException: err = self.timeout_msg except: @@ -176,7 +180,7 @@ class CodeServer(object): err = "Error: {0}".format(repr(value)) finally: # Set back any original signal handler. - signal.signal(signal.SIGALRM, old_handler) + signal.signal(signal.SIGALRM, old_handler) # Delete the created file. os.remove(submit_path) @@ -201,10 +205,12 @@ class CodeServer(object): # Runaway code, so kill it. proc.kill() # Re-raise exception. - raise + #raise + stderr = self.timeout_msg + stdout = '' return proc, stdout, stderr - def check_bash_script(self, ref_script_path, submit_script_path, + def check_bash_script(self, ref_script_path, submit_script_path, test_case_path=None): """ Function validates student script using instructor script as reference. Test cases can optionally be provided. The first argument @@ -214,72 +220,297 @@ class CodeServer(object): permission. The Third optional argument is the path to test the scripts. Each line in this file is a test case and each test case is passed to the script as standard arguments. - + Returns -------- - returns (True, "Correct answer") : If the student script passes all test - cases/have same output, when compared to the instructor script - - returns (False, error_msg): If - the student script fails a single test/have dissimilar output, when - compared to the instructor script. - - Returns (False, error_msg): If mandatory arguments are not files or if the - required permissions are not given to the file(s). - + returns (True, "Correct answer") : If the student script passes all + test cases/have same output, when compared to the instructor script + + returns (False, error_msg): If the student script fails a single + test/have dissimilar output, when compared to the instructor script. + + Returns (False, error_msg): If mandatory arguments are not files or if + the required permissions are not given to the file(s). + """ if not isfile(ref_script_path): - return False, "No file at %s"%ref_script_path + return False, "No file at %s" % ref_script_path if not isfile(submit_script_path): - return False, 'No file at %s'%submit_script_path + return False, 'No file at %s' % submit_script_path if not os.access(ref_script_path, os.X_OK): - return False, 'Script %s is not executable'%ref_script_path + return False, 'Script %s is not executable' % ref_script_path if not os.access(submit_script_path, os.X_OK): - return False, 'Script %s is not executable'%submit_script_path - + return False, 'Script %s is not executable' % submit_script_path + if test_case_path is None: ret = self._run_command(ref_script_path, stdin=None, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) proc, inst_stdout, inst_stderr = ret - ret = self._run_command(submit_script_path, stdin=None, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + ret = self._run_command(submit_script_path, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) proc, stdnt_stdout, stdnt_stderr = ret - if inst_stdout == stdnt_stdout: + if inst_stdout in stdnt_stdout: return True, 'Correct answer' else: - err = "Error: expected %s, got %s"%(inst_stderr, stdnt_stderr) + err = "Error: expected %s, got %s" % (inst_stderr, + stdnt_stderr) return False, err else: if not isfile(test_case_path): - return False, "No test case at %s"%test_case_path + return False, "No test case at %s" % test_case_path if not os.access(ref_script_path, os.R_OK): - return False, "Test script %s, not readable"%test_case_path - valid_answer = True # We initially make it one, so that we can stop - # once a test case fails - loop_count = 0 # Loop count has to be greater than or equal to one. - # Useful for caching things like empty test files,etc. + return False, "Test script %s, not readable" % test_case_path + valid_answer = True # We initially make it one, so that we can + # stop once a test case fails + loop_count = 0 # Loop count has to be greater than or + # equal to one. + # Useful for caching things like empty + # test files,etc. test_cases = open(test_case_path).readlines() num_lines = len(test_cases) for test_case in test_cases: loop_count += 1 if valid_answer: - args = [ ref_script_path ] + [x for x in test_case.split()] - ret = self._run_command(args, stdin=None, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + args = [ref_script_path] + [x for x in test_case.split()] + ret = self._run_command(args, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) proc, inst_stdout, inst_stderr = ret - args = [ submit_script_path ] + [x for x in test_case.split()] - ret = self._run_command(args, stdin=None, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + args = [submit_script_path]+[x for x in test_case.split()] + ret = self._run_command(args, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) proc, stdnt_stdout, stdnt_stderr = ret - valid_answer = inst_stdout == stdnt_stdout + valid_answer = inst_stdout in stdnt_stdout if valid_answer and (num_lines == loop_count): return True, "Correct answer" else: - err = "Error: expected %s, got %s"%(inst_stdout+inst_stderr, - stdnt_stdout+stdnt_stderr) + err = "Error:expected %s, got %s" % (inst_stdout+inst_stderr, + stdnt_stdout+stdnt_stderr) return False, err + def run_c_code(self, answer, test_code, in_dir=None): + """Tests given C code (`answer`) with the `test_code` supplied. + + The testcode is a path to the reference code. + The reference code will call the function submitted by the student. + The reference code will check for the expected output. + + If the path's start with a "/" then we assume they are absolute paths. + If not, we assume they are relative paths w.r.t. the location of this + code_server script. + + If the optional `in_dir` keyword argument is supplied it changes the + directory to that directory (it does not change it back to the original + when done). + + Returns + ------- + + A tuple: (success, error message). + + """ + if in_dir is not None and isdir(in_dir): + os.chdir(in_dir) + + # File extension must be .c + submit_f = open('submit.c', 'w') + submit_f.write(answer.lstrip()) + submit_f.close() + submit_path = abspath(submit_f.name) + + ref_path = test_code.strip() + if not ref_path.startswith('/'): + ref_path = join(MY_DIR, ref_path) + + # Add a new signal handler for the execution of this code. + old_handler = signal.signal(signal.SIGALRM, timeout_handler) + signal.alarm(SERVER_TIMEOUT) + + # Do whatever testing needed. + success = False + try: + success, err = self._check_c_cpp_code(ref_path, submit_path) + except TimeoutException: + err = self.timeout_msg + except: + type, value = sys.exc_info()[:2] + err = "Error: {0}".format(repr(value)) + finally: + # Set back any original signal handler. + signal.signal(signal.SIGALRM, old_handler) + + # Delete the created file. + os.remove(submit_path) + + # Cancel the signal if any, see signal.alarm documentation. + signal.alarm(0) + + # Put us back into the server pool queue since we are free now. + self.queue.put(self.port) + + return success, err + + def _compile_command(self, cmd, *args, **kw): + """Compiles C/C++ code and returns errors if any. + Run a command in a subprocess while blocking, the process is killed + if it takes more than 2 seconds to run. Return the Popen object, the + stderr. + """ + try: + proc_compile = subprocess.Popen(cmd, shell=True, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + out, err = proc_compile.communicate() + except TimeoutException: + # Runaway code, so kill it. + proc_compile.kill() + # Re-raise exception. + raise + return proc_compile, err + + def _check_c_cpp_code(self, ref_code_path, submit_code_path): + """ Function validates student code using instructor code as + reference.The first argument ref_code_path, is the path to + instructor code, it is assumed to have executable permission. + The second argument submit_code_path, is the path to the student + code, it is assumed to have executable permission. + + Returns + -------- + + returns (True, "Correct answer") : If the student function returns + expected output when called by reference code. + + returns (False, error_msg): If the student function fails to return + expected output when called by reference code. + + Returns (False, error_msg): If mandatory arguments are not files or + if the required permissions are not given to the file(s). + + """ + if not isfile(ref_code_path): + return False, "No file at %s" % ref_code_path + if not isfile(submit_code_path): + return False, 'No file at %s' % submit_code_path + + success = False + output_path = os.getcwd() + '/output' + compile_command = "g++ %s -c -o %s" % (submit_code_path, output_path) + ret = self._compile_command(compile_command, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + proc, inst_stderr = ret + + # Only if compilation is successful, the program is executed + # And tested with testcases + if inst_stderr == '': + executable = os.getcwd() + '/executable' + compile_main = "g++ %s %s -o %s" % (ref_code_path, output_path, + executable) + ret = self._compile_command(compile_main, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + proc, main_err = ret + if main_err == '': + args = [executable] + ret = self._run_command(args, stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + proc, stdout, stderr = ret + if proc.returncode == 0: + success, err = True, "Correct answer" + else: + err = stdout + "\n" + stderr + success = False + os.remove(executable) + else: + err = "Error:" + try: + error_lines = main_err.splitlines() + for e in error_lines: + err = err + "\n" + e.split(":", 1)[1] + except: + err = err + "\n" + main_err + success = False + os.remove(output_path) + else: + err = "Compilation Error:" + try: + error_lines = inst_stderr.splitlines() + for e in error_lines: + if ':' in e: + err = err + "\n" + e.split(":", 1)[1] + else: + err = err + "\n" + e + except: + err = err + "\n" + inst_stderr + return success, err + + def run_cplus_code(self, answer, test_code, in_dir=None): + """Tests given C++ code (`answer`) with the `test_code` supplied. + + The testcode is a path to the reference code. + The reference code will call the function submitted by the student. + The reference code will check for the expected output. + + If the path's start with a "/" then we assume they are absolute paths. + If not, we assume they are relative paths w.r.t. the location of this + code_server script. + + If the optional `in_dir` keyword argument is supplied it changes the + directory to that directory (it does not change it back to the original + when done). + + Returns + ------- + + A tuple: (success, error message). + + """ + if in_dir is not None and isdir(in_dir): + os.chdir(in_dir) + + # The file extension must be .cpp + submit_f = open('submitstd.cpp', 'w') + submit_f.write(answer.lstrip()) + submit_f.close() + submit_path = abspath(submit_f.name) + + ref_path = test_code.strip() + if not ref_path.startswith('/'): + ref_path = join(MY_DIR, ref_path) + + # Add a new signal handler for the execution of this code. + old_handler = signal.signal(signal.SIGALRM, timeout_handler) + signal.alarm(SERVER_TIMEOUT) + + # Do whatever testing needed. + success = False + try: + success, err = self._check_c_cpp_code(ref_path, submit_path) + except TimeoutException: + err = self.timeout_msg + except: + type, value = sys.exc_info()[:2] + err = "Error: {0}".format(repr(value)) + finally: + # Set back any original signal handler. + signal.signal(signal.SIGALRM, old_handler) + + # Delete the created file. + os.remove(submit_path) + + # Cancel the signal if any, see signal.alarm documentation. + signal.alarm(0) + + # Put us back into the server pool queue since we are free now. + self.queue.put(self.port) + + return success, err def run(self): """Run XMLRPC server, serving our methods. @@ -291,9 +522,9 @@ class CodeServer(object): server.serve_forever() -################################################################################ +############################################################################### # `ServerPool` class. -################################################################################ +############################################################################### class ServerPool(object): """Manages a pool of CodeServer objects.""" def __init__(self, ports, pool_port=50000): @@ -330,7 +561,8 @@ class ServerPool(object): port = q.get() if was_waiting: print '*'*80 - print "No available servers, was waiting but got server later at %d."%port + print "No available servers, was waiting but got server \ + later at %d." % port print '*'*80 sys.stdout.flush() return port @@ -345,7 +577,7 @@ class ServerPool(object): server.serve_forever() -################################################################################ +############################################################################### def main(): run_as_nobody() if len(sys.argv) == 1: diff --git a/testapp/docs/add.c b/testapp/docs/add.c new file mode 100644 index 0000000..c829971 --- /dev/null +++ b/testapp/docs/add.c @@ -0,0 +1,4 @@ +int add(int a,int b) +{ + return a-b; +} diff --git a/testapp/docs/add.cpp b/testapp/docs/add.cpp new file mode 100644 index 0000000..d3b7897 --- /dev/null +++ b/testapp/docs/add.cpp @@ -0,0 +1,6 @@ +#include +int add(int a,int b) +{ + printf("All Correct"); + return a; +} diff --git a/testapp/docs/array_sum.c b/testapp/docs/array_sum.c new file mode 100644 index 0000000..619a23c --- /dev/null +++ b/testapp/docs/array_sum.c @@ -0,0 +1,10 @@ +int array_sum(int a[5]) +{ + int i=0, sum=0; + for(i=0;i<5;i++) + { + sum = sum + a[i]; + } + return sum; +} + diff --git a/testapp/docs/array_sum.cpp b/testapp/docs/array_sum.cpp new file mode 100644 index 0000000..9b82d3b --- /dev/null +++ b/testapp/docs/array_sum.cpp @@ -0,0 +1,10 @@ +int array_sum(int a[]) +{ + int i=0, sum=0; + for(i=0;i<5;i++) + { + sum = sum + a[i]; + } + return sum; +} + diff --git a/testapp/docs/fact.c b/testapp/docs/fact.c new file mode 100644 index 0000000..e3665f5 --- /dev/null +++ b/testapp/docs/fact.c @@ -0,0 +1,10 @@ +int factorial(int a) +{ + int i,fact=1; + for(i=1;i<=a;a--) + { + fact=fact*a; + } + return fact; + +} diff --git a/testapp/docs/fact.cpp b/testapp/docs/fact.cpp new file mode 100644 index 0000000..f9b7458 --- /dev/null +++ b/testapp/docs/fact.cpp @@ -0,0 +1,16 @@ +#include +int fact = 1; +int factorial(int a) +{ + printf("%d\n",a); + if(a<1) + { + printf("\nfinal"); + return 1; + } + else + { + printf("count\n"); + return a*factorial(a-1); + } +} diff --git a/testapp/docs/greatest.c b/testapp/docs/greatest.c new file mode 100644 index 0000000..0194855 --- /dev/null +++ b/testapp/docs/greatest.c @@ -0,0 +1,15 @@ +int greatest(int a,int b,int c) +{ + if(a>b && a>c) + { + return a; + } + else if(b>c) + { + return b; + } + else + { + return c; + } +} diff --git a/testapp/docs/greatest.cpp b/testapp/docs/greatest.cpp new file mode 100644 index 0000000..0194855 --- /dev/null +++ b/testapp/docs/greatest.cpp @@ -0,0 +1,15 @@ +int greatest(int a,int b,int c) +{ + if(a>b && a>c) + { + return a; + } + else if(b>c) + { + return b; + } + else + { + return c; + } +} diff --git a/testapp/docs/hello_name.c b/testapp/docs/hello_name.c new file mode 100644 index 0000000..8fa2519 --- /dev/null +++ b/testapp/docs/hello_name.c @@ -0,0 +1,16 @@ +#include +#include + +char *message(char a[]) +{ + return (strcat("hello",a)); +} + +main() +{ + printf("he\n"); + char q[]="re"; + char s[20]; + s= message(q); + printf("%s",s); +} diff --git a/testapp/docs/main.cpp b/testapp/docs/main.cpp new file mode 100755 index 0000000..ffd110e --- /dev/null +++ b/testapp/docs/main.cpp @@ -0,0 +1,30 @@ +#include +#include + +extern int add(int, int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + result = add(0,0); + check(0, result); + result = add(2,3); + check(5,result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/docs/main2.c b/testapp/docs/main2.c new file mode 100755 index 0000000..3d28ff6 --- /dev/null +++ b/testapp/docs/main2.c @@ -0,0 +1,28 @@ +#include +#include + +extern int add(int, int, int); + +template +void check(T expect,T result) +{ + if (expect == result) + { + printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("Incorrect:\n Expected %d got %d \n",expect,result); + exit (0); + } +} + +int main(void) +{ + int result; + result = add(0,0,0); + check(0, result); + result = add(2,3,3); + check(8,result); + printf("All Correct\n"); +} diff --git a/testapp/docs/main_array_sum.cpp b/testapp/docs/main_array_sum.cpp new file mode 100755 index 0000000..72eee46 --- /dev/null +++ b/testapp/docs/main_array_sum.cpp @@ -0,0 +1,32 @@ +#include +#include + +extern int array_sum(int []); + +template + +void check(T expect,T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + int a[55555] = {1,2,3,0,0}; + result = array_sum(a); + check(6, result); + int b[] = {1,2,3,4,5}; + result = array_sum(b); + check(15,result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/docs/main_fact.cpp b/testapp/docs/main_fact.cpp new file mode 100755 index 0000000..ff65456 --- /dev/null +++ b/testapp/docs/main_fact.cpp @@ -0,0 +1,30 @@ +#include +#include + +extern int factorial(int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + result = factorial(0); + check(1, result); + result = factorial(3); + check(6, result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/docs/main_greatest.cpp b/testapp/docs/main_greatest.cpp new file mode 100755 index 0000000..fe9ff5b --- /dev/null +++ b/testapp/docs/main_greatest.cpp @@ -0,0 +1,32 @@ +#include +#include + +extern int greatest(int, int, int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + result = greatest(1, 2, 3); + check(3, result); + result = greatest(5, 9, 2); + check(9, result); + result = greatest(7, 2, 4); + check(7, result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/docs/main_hello_name.c b/testapp/docs/main_hello_name.c new file mode 100755 index 0000000..71b83a2 --- /dev/null +++ b/testapp/docs/main_hello_name.c @@ -0,0 +1,29 @@ +#include +#include + + +void check(char expect[], char result[]) +{ + if (expect == result) + { + printf("Correct:expected %s got %s \n",expect,result); + } + else + { + printf("ERROR:expected %s got %s \n",expect,result); + exit (0); + } +} + +int main(void) +{ + char result[20]; + char A[20]=" pratham"; + char B[20]=" sir"; + result[20] = message(A); + printf("%s",result); + check("hello pratham", result); + result[20] = message(B); + check("hello sir",result); + printf("All Correct\n"); +} diff --git a/testapp/docs/main_palindrome.cpp b/testapp/docs/main_palindrome.cpp new file mode 100755 index 0000000..a5d67b5 --- /dev/null +++ b/testapp/docs/main_palindrome.cpp @@ -0,0 +1,30 @@ +#include +#include + +extern bool palindrome(int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + bool result; + result = palindrome(123); + check(false, result); + result = palindrome(121); + check(true, result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/docs/palindrome.c b/testapp/docs/palindrome.c new file mode 100644 index 0000000..236d963 --- /dev/null +++ b/testapp/docs/palindrome.c @@ -0,0 +1,20 @@ +#include +bool palindrome(int a) +{ + int n1, rev = 0, rem; + n1 = a; + while (a > 0) + { + rem = a % 10; + rev = rev * 10 + rem; + a = a / 10; + } + if (n1 == rev) + { + return true; + } + else + { + return false; + } +} diff --git a/testapp/docs/palindrome.cpp b/testapp/docs/palindrome.cpp new file mode 100644 index 0000000..aae5dd1 --- /dev/null +++ b/testapp/docs/palindrome.cpp @@ -0,0 +1,19 @@ +bool palindrome(int n) +{ + int n1, rev = 0, rem; + n1 = n; + while (n > 0) + { + rem = n % 10; + rev = rev * 10 + rem; + n = n / 10; + } + if (n1 == rev) + { + return true; + } + else + { + return false; + } +} diff --git a/testapp/docs/sample.c b/testapp/docs/sample.c new file mode 100755 index 0000000..660f862 --- /dev/null +++ b/testapp/docs/sample.c @@ -0,0 +1,20 @@ +#include + +void main(int argc , char * argv[]) +{ + int i,sum=0; + +/* if(argc!=3) + { + printf("you have forgot to type numbers."); + exit(1); + } +*/ + printf("The sum is : "); + + for(i=1;i +#include +int main(int argc, char* argv[]) +{ + std::cout << atoi(argv[1])+atoi(argv[2]) << std::endl; + return 0; +} diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 7bbf601..1b60a71 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 +from exam.models import Profile, Quiz, Question from django.contrib.auth import authenticate from django.contrib.auth.models import User @@ -13,14 +13,17 @@ from string import letters, punctuation, digits import datetime QUESTION_TYPE_CHOICES = ( - ("python", "Python"), - ("bash", "Bash"), - ("mcq", "MCQ"), - ) + ("python", "Python"), + ("bash", "Bash"), + ("mcq", "MCQ"), + ("C", "C Language"), + ("C++", "C++ Language"), + ) UNAME_CHARS = letters + "._" + digits PWD_CHARS = letters + punctuation + digits + class UserRegisterForm(forms.Form): """A Class to create new form for User's Registration. It has the various fields and functions required to register @@ -28,7 +31,7 @@ class UserRegisterForm(forms.Form): username = forms.CharField\ (max_length=30, help_text='Letters, digits,\ - period and underscores only.') + period and underscores only.') email = forms.EmailField() password = forms.CharField(max_length=30, widget=forms.PasswordInput()) confirm_password = forms.CharField\ @@ -114,20 +117,20 @@ class UserLoginForm(forms.Form): class QuizForm(forms.Form): """Creates a form to add or edit a Quiz. It has the related fields and functions required.""" - + start_date = forms.DateField(initial=datetime.date.today) duration = forms.IntegerField() - active = forms.BooleanField(required = False) + active = forms.BooleanField(required=False) tags = TagField(widget=TagAutocomplete()) description = forms.CharField(max_length=256, widget=forms.Textarea\ - (attrs={'cols':20,'rows':1})) + (attrs={'cols': 20, 'rows': 1})) def save(self): start_date = self.cleaned_data["start_date"] duration = self.cleaned_data["duration"] active = self.cleaned_data['active'] description = self.cleaned_data["description"] - + new_quiz = Quiz() new_quiz.start_date = start_date new_quiz.duration = duration @@ -136,7 +139,7 @@ class QuizForm(forms.Form): new_quiz.save() class QuestionForm(forms.Form): - """Creates a form to add or edit a Question. + """Creates a form to add or edit a Question. It has the related fields and functions required.""" summary = forms.CharField(widget=forms.Textarea\ @@ -147,13 +150,13 @@ class QuestionForm(forms.Form): test = forms.CharField(widget=forms.Textarea\ (attrs={'cols': 40, 'rows': 1})) options = forms.CharField(widget=forms.Textarea\ - (attrs={'cols': 40, 'rows': 1}),required=False) + (attrs={'cols': 40, 'rows': 1}), required=False) type = forms.CharField(max_length=8, widget=forms.Select\ - (choices=QUESTION_TYPE_CHOICES)) + (choices=QUESTION_TYPE_CHOICES)) active = forms.BooleanField(required=False) - tags = TagField(widget=TagAutocomplete(),required=False) + tags = TagField(widget=TagAutocomplete(), required=False) snippet = forms.CharField(widget=forms.Textarea\ - (attrs={'cols': 40, 'rows': 1}),required=False) + (attrs={'cols': 40, 'rows': 1}), required=False) def save(self): summary = self.cleaned_data["summary"] diff --git a/testapp/exam/models.py b/testapp/exam/models.py index 00d32e4..fac01ec 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -18,7 +18,9 @@ QUESTION_TYPE_CHOICES = ( ("python", "Python"), ("bash", "Bash"), ("mcq", "MultipleChoice"), - ) + ("C", "C Language"), + ("C++", "C++ Language"), + ) ################################################################################ class Question(models.Model): @@ -233,4 +235,3 @@ the next.""" def __unicode__(self): u = self.user return u'Question paper for {0} {1}'.format(u.first_name, u.last_name) - diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 5a5f5fe..1d5d6f6 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -476,7 +476,7 @@ def automatic_questionpaper(request, questionpaper_id=None): context = {'data': {'questions': fetched_questions, 'tags': tags, 'msg': msg}} - return my_render_to_response\( + return my_render_to_response( 'exam/automatic_questionpaper.html', context, context_instance=RequestContext(request)) else: diff --git a/testapp/exam/xmlrpc_clients.py b/testapp/exam/xmlrpc_clients.py index 817e37d..b846212 100644 --- a/testapp/exam/xmlrpc_clients.py +++ b/testapp/exam/xmlrpc_clients.py @@ -9,19 +9,24 @@ from settings import SERVER_PORTS, SERVER_POOL_PORT class ConnectionError(Exception): pass -################################################################################ +############################################################################### # `CodeServerProxy` class. -################################################################################ +############################################################################### + + class CodeServerProxy(object): """A class that manages accesing the farm of Python servers and making calls to them such that no one XMLRPC server is overloaded. """ def __init__(self): - pool_url = 'http://localhost:%d'%(SERVER_POOL_PORT) + pool_url = 'http://localhost:%d' % (SERVER_POOL_PORT) self.pool_server = ServerProxy(pool_url) self.methods = {"python": 'run_python_code', - "bash": 'run_bash_code'} - + "bash": 'run_bash_code', + "C": "run_c_code", + "C++": "run_cplus_code", + } + def run_code(self, answer, test_code, user_dir, language): """Tests given code (`answer`) with the `test_code` supplied. If the optional `in_dir` keyword argument is supplied it changes the directory @@ -68,11 +73,10 @@ class CodeServerProxy(object): else: done = True if not done: - raise ConnectionError("Couldn't connect to a server!") - proxy = ServerProxy('http://localhost:%d'%port) + raise ConnectionError("Couldn't connect to a server!") + proxy = ServerProxy('http://localhost:%d' % port) return proxy # views.py calls this Python server which forwards the request to one # of the running servers. code_server = CodeServerProxy() - diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 4f65b64..6ef1e99 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -76,8 +76,13 @@ function update_time()

{{ question.summary }} (Marks : {{ question.points }})


{{ question.description|safe }} - - {% if error_message %}
ERROR:
{{ error_message }}
{% endif %} + {% if error_message %} +
+ {% for e in error_message.splitlines %} + {{ e|join:"" }} +
+ {% endfor%} +
{% endif %}

{% csrf_token %} diff --git a/testapp/test_server.py b/testapp/test_server.py index 0790816..fc6ec56 100644 --- a/testapp/test_server.py +++ b/testapp/test_server.py @@ -6,34 +6,154 @@ up the code server as:: """ from exam.xmlrpc_clients import code_server + def check_result(result, check='correct answer'): - if check != 'correct answer': - assert result[0] == False - else: - assert result[0] == True - if "unable to connect" in result[1].lower(): - assert result[0], result[1] - assert check in result[1].lower(), result[1] +# if check != 'correct answer': +# assert result[0] == False +# else: +# assert result[0] == True +# if "unable to connect" in result[1].lower(): +# assert result[0], result[1] +# assert check in result[1].lower(), result[1] + print result + def test_python(): """Test if server runs Python code as expected.""" src = 'while True: pass' - result = code_server.run_code(src, '', '/tmp', language="python") - check_result(result, 'more than ') - + # result = code_server.run_code(src, '', '/tmp', language="python") + # check_result(result, 'more than ') + """ src = 'x = 1' - result = code_server.run_code(src, 'assert x == 1', '/tmp', + result = code_server.run_code(src, 'assert x == 1', '/tmp', language="python") check_result(result, 'correct answer') - result = code_server.run_code(src, 'assert x == 0', '/tmp', + result = code_server.run_code(src, 'assert x == 0', '/tmp', language="python") check_result(result, 'assertionerror') src = 'abracadabra' - result = code_server.run_code(src, 'assert x == 0', '/tmp', + result = code_server.run_code(src, 'assert x == 0', '/tmp', language="python") check_result(result, 'nameerror') + """ + + +def test_c(): + """Test if server runs c code as expected.""" + src = """ + #include + int ad(int a, int b) + {return a+b;} + """ + result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + check_result(result) + + src = """ + int add(int a, int b) + {return a+b} + """ + result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + check_result(result) + + src = """ + int add(int a, int b) + {while(1>0){} + return a+b;} + """ + result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + check_result(result) + + src = """ + int add(int a, int b) + {return a+b;} + """ + result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + check_result(result) + + src = """ + #include + int add(int a, int b) + {printf("All Correct");} + """ + result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + check_result(result) + + +def test_cpp(): + """Test if server runs c code as expected.""" + src = """ + int add(int a, int b) + { + return a+b + } + """ + result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + check_result(result) + + src = """ + int add(int a, int b) + { + return a+b; + } + """ + result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + check_result(result) + + src = """ + int dd(int a, int b) + { + return a+b; + } + """ + result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + check_result(result) + + src = """ + int add(int a, int b) + { + while(0==0) + {} + return a+b; + } + """ + result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + check_result(result) + + +def test_java(): + """Test if server runs c code as expected.""" + src = """class Test +{ + public static void main(String arg[]) + { + int sum =Integer.parseInt(arg[0])+Integer.parseInt(arg[1]); + System.out.print(sum); + } +} + """ + +# result = code_server.run_code(src, 'docs/sample.java',\ +# '/tmp', language="Java") +# check_result(result) + + +def test_scilab(): + """Test if server runs c code as expected.""" + src = """ + +A=sciargs( +a=strtod(A(6)) +b=strtod(A(7)) +c=a+b +disp(c) +exit() + """ +# result = code_server.run_code(src, '/tmp/sample.sce',\ +# '/tmp', language="Scilab") +# check_result(result) + def test_bash(): """Test if server runs Bash code as expected.""" @@ -41,43 +161,46 @@ def test_bash(): #!/bin/bash [[ $# -eq 2 ]] && echo $(( $1 + $2 )) && exit $(( $1 + $2 )) """ - result = code_server.run_code(src, - 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - check_result(result) + # result = code_server.run_code(src, + # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + # check_result(result) src = """ #!/bin/bash [[ $# -eq 2 ]] && echo $(( $1 - $2 )) && exit $(( $1 - $2 )) """ - result = code_server.run_code(src, - 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - check_result(result, 'error') + #result = code_server.run_code(src, + # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + #check_result(result, 'error') src = """\ #!/bin/bash while [ 1 ] ; do echo "" > /dev/null ; done """ - result = code_server.run_code(src, - 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - check_result(result, 'more than ') + #result = code_server.run_code(src, + # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + #check_result(result, 'more than ') src = ''' #!/bin/bash while [ 1 ] ; do echo "" > /dev/null ''' - result = code_server.run_code(src, - 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - check_result(result, 'error') + #result = code_server.run_code(src, + # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + #check_result(result, 'error') src = '''# Enter your code here. #!/bin/bash while [ 1 ] ; do echo "" > /dev/null ''' - result = code_server.run_code(src, - 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - check_result(result, 'oserror') + #result = code_server.run_code(src, + # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + #check_result(result, 'oserror') if __name__ == '__main__': test_python() test_bash() test_c() + test_cpp() + test_java() + test_scilab() -- cgit From fc40c033a083e2a4027fdbeecfb5853e6770a7c6 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Wed, 5 Jun 2013 17:26:50 +0530 Subject: c and cpp files isolated --- testapp/docs/add.c | 4 --- testapp/docs/add.cpp | 6 ----- testapp/docs/array_sum.c | 10 -------- testapp/docs/array_sum.cpp | 10 -------- testapp/docs/fact.c | 10 -------- testapp/docs/fact.cpp | 16 ------------ testapp/docs/greatest.c | 15 ----------- testapp/docs/greatest.cpp | 15 ----------- testapp/docs/hello_name.c | 16 ------------ testapp/docs/main.cpp | 30 ---------------------- testapp/docs/main2.c | 28 --------------------- testapp/docs/main_array_sum.cpp | 32 ------------------------ testapp/docs/main_fact.cpp | 30 ---------------------- testapp/docs/main_greatest.cpp | 32 ------------------------ testapp/docs/main_hello_name.c | 29 --------------------- testapp/docs/main_palindrome.cpp | 30 ---------------------- testapp/docs/palindrome.c | 20 --------------- testapp/docs/palindrome.cpp | 19 -------------- testapp/docs/sample.c | 20 --------------- testapp/docs/sample.cpp | 7 ------ testapp/test_server.py | 54 +++++++--------------------------------- 21 files changed, 9 insertions(+), 424 deletions(-) delete mode 100644 testapp/docs/add.c delete mode 100644 testapp/docs/add.cpp delete mode 100644 testapp/docs/array_sum.c delete mode 100644 testapp/docs/array_sum.cpp delete mode 100644 testapp/docs/fact.c delete mode 100644 testapp/docs/fact.cpp delete mode 100644 testapp/docs/greatest.c delete mode 100644 testapp/docs/greatest.cpp delete mode 100644 testapp/docs/hello_name.c delete mode 100755 testapp/docs/main.cpp delete mode 100755 testapp/docs/main2.c delete mode 100755 testapp/docs/main_array_sum.cpp delete mode 100755 testapp/docs/main_fact.cpp delete mode 100755 testapp/docs/main_greatest.cpp delete mode 100755 testapp/docs/main_hello_name.c delete mode 100755 testapp/docs/main_palindrome.cpp delete mode 100644 testapp/docs/palindrome.c delete mode 100644 testapp/docs/palindrome.cpp delete mode 100755 testapp/docs/sample.c delete mode 100755 testapp/docs/sample.cpp diff --git a/testapp/docs/add.c b/testapp/docs/add.c deleted file mode 100644 index c829971..0000000 --- a/testapp/docs/add.c +++ /dev/null @@ -1,4 +0,0 @@ -int add(int a,int b) -{ - return a-b; -} diff --git a/testapp/docs/add.cpp b/testapp/docs/add.cpp deleted file mode 100644 index d3b7897..0000000 --- a/testapp/docs/add.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include -int add(int a,int b) -{ - printf("All Correct"); - return a; -} diff --git a/testapp/docs/array_sum.c b/testapp/docs/array_sum.c deleted file mode 100644 index 619a23c..0000000 --- a/testapp/docs/array_sum.c +++ /dev/null @@ -1,10 +0,0 @@ -int array_sum(int a[5]) -{ - int i=0, sum=0; - for(i=0;i<5;i++) - { - sum = sum + a[i]; - } - return sum; -} - diff --git a/testapp/docs/array_sum.cpp b/testapp/docs/array_sum.cpp deleted file mode 100644 index 9b82d3b..0000000 --- a/testapp/docs/array_sum.cpp +++ /dev/null @@ -1,10 +0,0 @@ -int array_sum(int a[]) -{ - int i=0, sum=0; - for(i=0;i<5;i++) - { - sum = sum + a[i]; - } - return sum; -} - diff --git a/testapp/docs/fact.c b/testapp/docs/fact.c deleted file mode 100644 index e3665f5..0000000 --- a/testapp/docs/fact.c +++ /dev/null @@ -1,10 +0,0 @@ -int factorial(int a) -{ - int i,fact=1; - for(i=1;i<=a;a--) - { - fact=fact*a; - } - return fact; - -} diff --git a/testapp/docs/fact.cpp b/testapp/docs/fact.cpp deleted file mode 100644 index f9b7458..0000000 --- a/testapp/docs/fact.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -int fact = 1; -int factorial(int a) -{ - printf("%d\n",a); - if(a<1) - { - printf("\nfinal"); - return 1; - } - else - { - printf("count\n"); - return a*factorial(a-1); - } -} diff --git a/testapp/docs/greatest.c b/testapp/docs/greatest.c deleted file mode 100644 index 0194855..0000000 --- a/testapp/docs/greatest.c +++ /dev/null @@ -1,15 +0,0 @@ -int greatest(int a,int b,int c) -{ - if(a>b && a>c) - { - return a; - } - else if(b>c) - { - return b; - } - else - { - return c; - } -} diff --git a/testapp/docs/greatest.cpp b/testapp/docs/greatest.cpp deleted file mode 100644 index 0194855..0000000 --- a/testapp/docs/greatest.cpp +++ /dev/null @@ -1,15 +0,0 @@ -int greatest(int a,int b,int c) -{ - if(a>b && a>c) - { - return a; - } - else if(b>c) - { - return b; - } - else - { - return c; - } -} diff --git a/testapp/docs/hello_name.c b/testapp/docs/hello_name.c deleted file mode 100644 index 8fa2519..0000000 --- a/testapp/docs/hello_name.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include - -char *message(char a[]) -{ - return (strcat("hello",a)); -} - -main() -{ - printf("he\n"); - char q[]="re"; - char s[20]; - s= message(q); - printf("%s",s); -} diff --git a/testapp/docs/main.cpp b/testapp/docs/main.cpp deleted file mode 100755 index ffd110e..0000000 --- a/testapp/docs/main.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include - -extern int add(int, int); - -template - -void check(T expect, T result) -{ - if (expect == result) - { - //printf("Correct:\n Expected %d got %d \n",expect,result); - } - else - { - printf("\nIncorrect:\n Expected %d got %d \n",expect,result); - exit (1); - } -} - -int main(void) -{ - int result; - result = add(0,0); - check(0, result); - result = add(2,3); - check(5,result); - printf("All Correct\n"); - return 0; -} diff --git a/testapp/docs/main2.c b/testapp/docs/main2.c deleted file mode 100755 index 3d28ff6..0000000 --- a/testapp/docs/main2.c +++ /dev/null @@ -1,28 +0,0 @@ -#include -#include - -extern int add(int, int, int); - -template -void check(T expect,T result) -{ - if (expect == result) - { - printf("Correct:\n Expected %d got %d \n",expect,result); - } - else - { - printf("Incorrect:\n Expected %d got %d \n",expect,result); - exit (0); - } -} - -int main(void) -{ - int result; - result = add(0,0,0); - check(0, result); - result = add(2,3,3); - check(8,result); - printf("All Correct\n"); -} diff --git a/testapp/docs/main_array_sum.cpp b/testapp/docs/main_array_sum.cpp deleted file mode 100755 index 72eee46..0000000 --- a/testapp/docs/main_array_sum.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include - -extern int array_sum(int []); - -template - -void check(T expect,T result) -{ - if (expect == result) - { - //printf("Correct:\n Expected %d got %d \n",expect,result); - } - else - { - printf("\nIncorrect:\n Expected %d got %d \n",expect,result); - exit (1); - } -} - -int main(void) -{ - int result; - int a[55555] = {1,2,3,0,0}; - result = array_sum(a); - check(6, result); - int b[] = {1,2,3,4,5}; - result = array_sum(b); - check(15,result); - printf("All Correct\n"); - return 0; -} diff --git a/testapp/docs/main_fact.cpp b/testapp/docs/main_fact.cpp deleted file mode 100755 index ff65456..0000000 --- a/testapp/docs/main_fact.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include - -extern int factorial(int); - -template - -void check(T expect, T result) -{ - if (expect == result) - { - //printf("Correct:\n Expected %d got %d \n",expect,result); - } - else - { - printf("\nIncorrect:\n Expected %d got %d \n",expect,result); - exit (1); - } -} - -int main(void) -{ - int result; - result = factorial(0); - check(1, result); - result = factorial(3); - check(6, result); - printf("All Correct\n"); - return 0; -} diff --git a/testapp/docs/main_greatest.cpp b/testapp/docs/main_greatest.cpp deleted file mode 100755 index fe9ff5b..0000000 --- a/testapp/docs/main_greatest.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include - -extern int greatest(int, int, int); - -template - -void check(T expect, T result) -{ - if (expect == result) - { - //printf("Correct:\n Expected %d got %d \n",expect,result); - } - else - { - printf("\nIncorrect:\n Expected %d got %d \n",expect,result); - exit (1); - } -} - -int main(void) -{ - int result; - result = greatest(1, 2, 3); - check(3, result); - result = greatest(5, 9, 2); - check(9, result); - result = greatest(7, 2, 4); - check(7, result); - printf("All Correct\n"); - return 0; -} diff --git a/testapp/docs/main_hello_name.c b/testapp/docs/main_hello_name.c deleted file mode 100755 index 71b83a2..0000000 --- a/testapp/docs/main_hello_name.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include - - -void check(char expect[], char result[]) -{ - if (expect == result) - { - printf("Correct:expected %s got %s \n",expect,result); - } - else - { - printf("ERROR:expected %s got %s \n",expect,result); - exit (0); - } -} - -int main(void) -{ - char result[20]; - char A[20]=" pratham"; - char B[20]=" sir"; - result[20] = message(A); - printf("%s",result); - check("hello pratham", result); - result[20] = message(B); - check("hello sir",result); - printf("All Correct\n"); -} diff --git a/testapp/docs/main_palindrome.cpp b/testapp/docs/main_palindrome.cpp deleted file mode 100755 index a5d67b5..0000000 --- a/testapp/docs/main_palindrome.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include - -extern bool palindrome(int); - -template - -void check(T expect, T result) -{ - if (expect == result) - { - //printf("Correct:\n Expected %d got %d \n",expect,result); - } - else - { - printf("\nIncorrect:\n Expected %d got %d \n",expect,result); - exit (1); - } -} - -int main(void) -{ - bool result; - result = palindrome(123); - check(false, result); - result = palindrome(121); - check(true, result); - printf("All Correct\n"); - return 0; -} diff --git a/testapp/docs/palindrome.c b/testapp/docs/palindrome.c deleted file mode 100644 index 236d963..0000000 --- a/testapp/docs/palindrome.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -bool palindrome(int a) -{ - int n1, rev = 0, rem; - n1 = a; - while (a > 0) - { - rem = a % 10; - rev = rev * 10 + rem; - a = a / 10; - } - if (n1 == rev) - { - return true; - } - else - { - return false; - } -} diff --git a/testapp/docs/palindrome.cpp b/testapp/docs/palindrome.cpp deleted file mode 100644 index aae5dd1..0000000 --- a/testapp/docs/palindrome.cpp +++ /dev/null @@ -1,19 +0,0 @@ -bool palindrome(int n) -{ - int n1, rev = 0, rem; - n1 = n; - while (n > 0) - { - rem = n % 10; - rev = rev * 10 + rem; - n = n / 10; - } - if (n1 == rev) - { - return true; - } - else - { - return false; - } -} diff --git a/testapp/docs/sample.c b/testapp/docs/sample.c deleted file mode 100755 index 660f862..0000000 --- a/testapp/docs/sample.c +++ /dev/null @@ -1,20 +0,0 @@ -#include - -void main(int argc , char * argv[]) -{ - int i,sum=0; - -/* if(argc!=3) - { - printf("you have forgot to type numbers."); - exit(1); - } -*/ - printf("The sum is : "); - - for(i=1;i -#include -int main(int argc, char* argv[]) -{ - std::cout << atoi(argv[1])+atoi(argv[2]) << std::endl; - return 0; -} diff --git a/testapp/test_server.py b/testapp/test_server.py index fc6ec56..c63ee4b 100644 --- a/testapp/test_server.py +++ b/testapp/test_server.py @@ -47,14 +47,14 @@ def test_c(): int ad(int a, int b) {return a+b;} """ - result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") check_result(result) src = """ int add(int a, int b) {return a+b} """ - result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") check_result(result) src = """ @@ -62,14 +62,14 @@ def test_c(): {while(1>0){} return a+b;} """ - result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") check_result(result) src = """ int add(int a, int b) {return a+b;} """ - result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") check_result(result) src = """ @@ -77,7 +77,7 @@ def test_c(): int add(int a, int b) {printf("All Correct");} """ - result = code_server.run_code(src, '/tmp/main.c', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") check_result(result) @@ -89,7 +89,7 @@ def test_cpp(): return a+b } """ - result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") check_result(result) src = """ @@ -98,7 +98,7 @@ def test_cpp(): return a+b; } """ - result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") check_result(result) src = """ @@ -107,7 +107,7 @@ def test_cpp(): return a+b; } """ - result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") check_result(result) src = """ @@ -118,43 +118,9 @@ def test_cpp(): return a+b; } """ - result = code_server.run_code(src, 'docs/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") check_result(result) - -def test_java(): - """Test if server runs c code as expected.""" - src = """class Test -{ - public static void main(String arg[]) - { - int sum =Integer.parseInt(arg[0])+Integer.parseInt(arg[1]); - System.out.print(sum); - } -} - """ - -# result = code_server.run_code(src, 'docs/sample.java',\ -# '/tmp', language="Java") -# check_result(result) - - -def test_scilab(): - """Test if server runs c code as expected.""" - src = """ - -A=sciargs( -a=strtod(A(6)) -b=strtod(A(7)) -c=a+b -disp(c) -exit() - """ -# result = code_server.run_code(src, '/tmp/sample.sce',\ -# '/tmp', language="Scilab") -# check_result(result) - - def test_bash(): """Test if server runs Bash code as expected.""" src = """ @@ -202,5 +168,3 @@ if __name__ == '__main__': test_bash() test_c() test_cpp() - test_java() - test_scilab() -- cgit From 041064618c290b50bd7ea213c4535b1f585d0f03 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Wed, 5 Jun 2013 17:28:58 +0530 Subject: c_cpp_files --- testapp/c_cpp_files/add.c | 4 ++++ testapp/c_cpp_files/add.cpp | 6 ++++++ testapp/c_cpp_files/array_sum.c | 10 ++++++++++ testapp/c_cpp_files/array_sum.cpp | 10 ++++++++++ testapp/c_cpp_files/fact.c | 10 ++++++++++ testapp/c_cpp_files/fact.cpp | 16 ++++++++++++++++ testapp/c_cpp_files/greatest.c | 15 +++++++++++++++ testapp/c_cpp_files/greatest.cpp | 15 +++++++++++++++ testapp/c_cpp_files/hello_name.c | 16 ++++++++++++++++ testapp/c_cpp_files/main.cpp | 30 ++++++++++++++++++++++++++++++ testapp/c_cpp_files/main2.c | 28 ++++++++++++++++++++++++++++ testapp/c_cpp_files/main_array_sum.cpp | 32 ++++++++++++++++++++++++++++++++ testapp/c_cpp_files/main_fact.cpp | 30 ++++++++++++++++++++++++++++++ testapp/c_cpp_files/main_greatest.cpp | 32 ++++++++++++++++++++++++++++++++ testapp/c_cpp_files/main_hello_name.c | 29 +++++++++++++++++++++++++++++ testapp/c_cpp_files/main_palindrome.cpp | 30 ++++++++++++++++++++++++++++++ testapp/c_cpp_files/palindrome.c | 20 ++++++++++++++++++++ testapp/c_cpp_files/palindrome.cpp | 19 +++++++++++++++++++ testapp/c_cpp_files/sample.c | 20 ++++++++++++++++++++ testapp/c_cpp_files/sample.cpp | 7 +++++++ 20 files changed, 379 insertions(+) create mode 100644 testapp/c_cpp_files/add.c create mode 100644 testapp/c_cpp_files/add.cpp create mode 100644 testapp/c_cpp_files/array_sum.c create mode 100644 testapp/c_cpp_files/array_sum.cpp create mode 100644 testapp/c_cpp_files/fact.c create mode 100644 testapp/c_cpp_files/fact.cpp create mode 100644 testapp/c_cpp_files/greatest.c create mode 100644 testapp/c_cpp_files/greatest.cpp create mode 100644 testapp/c_cpp_files/hello_name.c create mode 100755 testapp/c_cpp_files/main.cpp create mode 100755 testapp/c_cpp_files/main2.c create mode 100755 testapp/c_cpp_files/main_array_sum.cpp create mode 100755 testapp/c_cpp_files/main_fact.cpp create mode 100755 testapp/c_cpp_files/main_greatest.cpp create mode 100755 testapp/c_cpp_files/main_hello_name.c create mode 100755 testapp/c_cpp_files/main_palindrome.cpp create mode 100644 testapp/c_cpp_files/palindrome.c create mode 100644 testapp/c_cpp_files/palindrome.cpp create mode 100755 testapp/c_cpp_files/sample.c create mode 100755 testapp/c_cpp_files/sample.cpp diff --git a/testapp/c_cpp_files/add.c b/testapp/c_cpp_files/add.c new file mode 100644 index 0000000..c829971 --- /dev/null +++ b/testapp/c_cpp_files/add.c @@ -0,0 +1,4 @@ +int add(int a,int b) +{ + return a-b; +} diff --git a/testapp/c_cpp_files/add.cpp b/testapp/c_cpp_files/add.cpp new file mode 100644 index 0000000..d3b7897 --- /dev/null +++ b/testapp/c_cpp_files/add.cpp @@ -0,0 +1,6 @@ +#include +int add(int a,int b) +{ + printf("All Correct"); + return a; +} diff --git a/testapp/c_cpp_files/array_sum.c b/testapp/c_cpp_files/array_sum.c new file mode 100644 index 0000000..619a23c --- /dev/null +++ b/testapp/c_cpp_files/array_sum.c @@ -0,0 +1,10 @@ +int array_sum(int a[5]) +{ + int i=0, sum=0; + for(i=0;i<5;i++) + { + sum = sum + a[i]; + } + return sum; +} + diff --git a/testapp/c_cpp_files/array_sum.cpp b/testapp/c_cpp_files/array_sum.cpp new file mode 100644 index 0000000..9b82d3b --- /dev/null +++ b/testapp/c_cpp_files/array_sum.cpp @@ -0,0 +1,10 @@ +int array_sum(int a[]) +{ + int i=0, sum=0; + for(i=0;i<5;i++) + { + sum = sum + a[i]; + } + return sum; +} + diff --git a/testapp/c_cpp_files/fact.c b/testapp/c_cpp_files/fact.c new file mode 100644 index 0000000..e3665f5 --- /dev/null +++ b/testapp/c_cpp_files/fact.c @@ -0,0 +1,10 @@ +int factorial(int a) +{ + int i,fact=1; + for(i=1;i<=a;a--) + { + fact=fact*a; + } + return fact; + +} diff --git a/testapp/c_cpp_files/fact.cpp b/testapp/c_cpp_files/fact.cpp new file mode 100644 index 0000000..f9b7458 --- /dev/null +++ b/testapp/c_cpp_files/fact.cpp @@ -0,0 +1,16 @@ +#include +int fact = 1; +int factorial(int a) +{ + printf("%d\n",a); + if(a<1) + { + printf("\nfinal"); + return 1; + } + else + { + printf("count\n"); + return a*factorial(a-1); + } +} diff --git a/testapp/c_cpp_files/greatest.c b/testapp/c_cpp_files/greatest.c new file mode 100644 index 0000000..0194855 --- /dev/null +++ b/testapp/c_cpp_files/greatest.c @@ -0,0 +1,15 @@ +int greatest(int a,int b,int c) +{ + if(a>b && a>c) + { + return a; + } + else if(b>c) + { + return b; + } + else + { + return c; + } +} diff --git a/testapp/c_cpp_files/greatest.cpp b/testapp/c_cpp_files/greatest.cpp new file mode 100644 index 0000000..0194855 --- /dev/null +++ b/testapp/c_cpp_files/greatest.cpp @@ -0,0 +1,15 @@ +int greatest(int a,int b,int c) +{ + if(a>b && a>c) + { + return a; + } + else if(b>c) + { + return b; + } + else + { + return c; + } +} diff --git a/testapp/c_cpp_files/hello_name.c b/testapp/c_cpp_files/hello_name.c new file mode 100644 index 0000000..8fa2519 --- /dev/null +++ b/testapp/c_cpp_files/hello_name.c @@ -0,0 +1,16 @@ +#include +#include + +char *message(char a[]) +{ + return (strcat("hello",a)); +} + +main() +{ + printf("he\n"); + char q[]="re"; + char s[20]; + s= message(q); + printf("%s",s); +} diff --git a/testapp/c_cpp_files/main.cpp b/testapp/c_cpp_files/main.cpp new file mode 100755 index 0000000..ffd110e --- /dev/null +++ b/testapp/c_cpp_files/main.cpp @@ -0,0 +1,30 @@ +#include +#include + +extern int add(int, int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + result = add(0,0); + check(0, result); + result = add(2,3); + check(5,result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/c_cpp_files/main2.c b/testapp/c_cpp_files/main2.c new file mode 100755 index 0000000..3d28ff6 --- /dev/null +++ b/testapp/c_cpp_files/main2.c @@ -0,0 +1,28 @@ +#include +#include + +extern int add(int, int, int); + +template +void check(T expect,T result) +{ + if (expect == result) + { + printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("Incorrect:\n Expected %d got %d \n",expect,result); + exit (0); + } +} + +int main(void) +{ + int result; + result = add(0,0,0); + check(0, result); + result = add(2,3,3); + check(8,result); + printf("All Correct\n"); +} diff --git a/testapp/c_cpp_files/main_array_sum.cpp b/testapp/c_cpp_files/main_array_sum.cpp new file mode 100755 index 0000000..72eee46 --- /dev/null +++ b/testapp/c_cpp_files/main_array_sum.cpp @@ -0,0 +1,32 @@ +#include +#include + +extern int array_sum(int []); + +template + +void check(T expect,T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + int a[55555] = {1,2,3,0,0}; + result = array_sum(a); + check(6, result); + int b[] = {1,2,3,4,5}; + result = array_sum(b); + check(15,result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/c_cpp_files/main_fact.cpp b/testapp/c_cpp_files/main_fact.cpp new file mode 100755 index 0000000..ff65456 --- /dev/null +++ b/testapp/c_cpp_files/main_fact.cpp @@ -0,0 +1,30 @@ +#include +#include + +extern int factorial(int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + result = factorial(0); + check(1, result); + result = factorial(3); + check(6, result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/c_cpp_files/main_greatest.cpp b/testapp/c_cpp_files/main_greatest.cpp new file mode 100755 index 0000000..fe9ff5b --- /dev/null +++ b/testapp/c_cpp_files/main_greatest.cpp @@ -0,0 +1,32 @@ +#include +#include + +extern int greatest(int, int, int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + int result; + result = greatest(1, 2, 3); + check(3, result); + result = greatest(5, 9, 2); + check(9, result); + result = greatest(7, 2, 4); + check(7, result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/c_cpp_files/main_hello_name.c b/testapp/c_cpp_files/main_hello_name.c new file mode 100755 index 0000000..71b83a2 --- /dev/null +++ b/testapp/c_cpp_files/main_hello_name.c @@ -0,0 +1,29 @@ +#include +#include + + +void check(char expect[], char result[]) +{ + if (expect == result) + { + printf("Correct:expected %s got %s \n",expect,result); + } + else + { + printf("ERROR:expected %s got %s \n",expect,result); + exit (0); + } +} + +int main(void) +{ + char result[20]; + char A[20]=" pratham"; + char B[20]=" sir"; + result[20] = message(A); + printf("%s",result); + check("hello pratham", result); + result[20] = message(B); + check("hello sir",result); + printf("All Correct\n"); +} diff --git a/testapp/c_cpp_files/main_palindrome.cpp b/testapp/c_cpp_files/main_palindrome.cpp new file mode 100755 index 0000000..a5d67b5 --- /dev/null +++ b/testapp/c_cpp_files/main_palindrome.cpp @@ -0,0 +1,30 @@ +#include +#include + +extern bool palindrome(int); + +template + +void check(T expect, T result) +{ + if (expect == result) + { + //printf("Correct:\n Expected %d got %d \n",expect,result); + } + else + { + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); + exit (1); + } +} + +int main(void) +{ + bool result; + result = palindrome(123); + check(false, result); + result = palindrome(121); + check(true, result); + printf("All Correct\n"); + return 0; +} diff --git a/testapp/c_cpp_files/palindrome.c b/testapp/c_cpp_files/palindrome.c new file mode 100644 index 0000000..236d963 --- /dev/null +++ b/testapp/c_cpp_files/palindrome.c @@ -0,0 +1,20 @@ +#include +bool palindrome(int a) +{ + int n1, rev = 0, rem; + n1 = a; + while (a > 0) + { + rem = a % 10; + rev = rev * 10 + rem; + a = a / 10; + } + if (n1 == rev) + { + return true; + } + else + { + return false; + } +} diff --git a/testapp/c_cpp_files/palindrome.cpp b/testapp/c_cpp_files/palindrome.cpp new file mode 100644 index 0000000..aae5dd1 --- /dev/null +++ b/testapp/c_cpp_files/palindrome.cpp @@ -0,0 +1,19 @@ +bool palindrome(int n) +{ + int n1, rev = 0, rem; + n1 = n; + while (n > 0) + { + rem = n % 10; + rev = rev * 10 + rem; + n = n / 10; + } + if (n1 == rev) + { + return true; + } + else + { + return false; + } +} diff --git a/testapp/c_cpp_files/sample.c b/testapp/c_cpp_files/sample.c new file mode 100755 index 0000000..660f862 --- /dev/null +++ b/testapp/c_cpp_files/sample.c @@ -0,0 +1,20 @@ +#include + +void main(int argc , char * argv[]) +{ + int i,sum=0; + +/* if(argc!=3) + { + printf("you have forgot to type numbers."); + exit(1); + } +*/ + printf("The sum is : "); + + for(i=1;i +#include +int main(int argc, char* argv[]) +{ + std::cout << atoi(argv[1])+atoi(argv[2]) << std::endl; + return 0; +} -- cgit From 33366bfa87d62d433cc7541e4699b61be78e5024 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Mon, 1 Jul 2013 15:55:26 +0530 Subject: comments and print statement removed --- testapp/test_server.py | 70 ++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/testapp/test_server.py b/testapp/test_server.py index c63ee4b..f2ea84c 100644 --- a/testapp/test_server.py +++ b/testapp/test_server.py @@ -8,22 +8,19 @@ from exam.xmlrpc_clients import code_server def check_result(result, check='correct answer'): -# if check != 'correct answer': -# assert result[0] == False -# else: -# assert result[0] == True -# if "unable to connect" in result[1].lower(): -# assert result[0], result[1] -# assert check in result[1].lower(), result[1] - print result - + if check != 'correct answer': + assert result[0] == False + else: + assert result[0] == True + if "unable to connect" in result[1].lower(): + assert result[0], result[1] + assert check in result[1].lower(), result[1] def test_python(): """Test if server runs Python code as expected.""" src = 'while True: pass' - # result = code_server.run_code(src, '', '/tmp', language="python") - # check_result(result, 'more than ') - """ + result = code_server.run_code(src, '', '/tmp', language="python") + check_result(result, 'more than ') src = 'x = 1' result = code_server.run_code(src, 'assert x == 1', '/tmp', language="python") @@ -37,7 +34,6 @@ def test_python(): result = code_server.run_code(src, 'assert x == 0', '/tmp', language="python") check_result(result, 'nameerror') - """ def test_c(): @@ -48,14 +44,14 @@ def test_c(): {return a+b;} """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") - check_result(result) + check_result(result, 'error') src = """ int add(int a, int b) {return a+b} """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") - check_result(result) + check_result(result, 'compilation error') src = """ int add(int a, int b) @@ -63,14 +59,14 @@ def test_c(): return a+b;} """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") - check_result(result) + check_result(result, 'more than') src = """ int add(int a, int b) {return a+b;} """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") - check_result(result) + check_result(result, 'correct answer') src = """ #include @@ -78,7 +74,7 @@ def test_c(): {printf("All Correct");} """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") - check_result(result) + check_result(result, 'incorrect') def test_cpp(): @@ -90,7 +86,7 @@ def test_cpp(): } """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") - check_result(result) + check_result(result, 'compilation error') src = """ int add(int a, int b) @@ -99,7 +95,7 @@ def test_cpp(): } """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") - check_result(result) + check_result(result, 'correct answer') src = """ int dd(int a, int b) @@ -108,7 +104,7 @@ def test_cpp(): } """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") - check_result(result) + check_result(result, 'error') src = """ int add(int a, int b) @@ -119,7 +115,7 @@ def test_cpp(): } """ result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") - check_result(result) + check_result(result, 'more than') def test_bash(): """Test if server runs Bash code as expected.""" @@ -127,41 +123,41 @@ def test_bash(): #!/bin/bash [[ $# -eq 2 ]] && echo $(( $1 + $2 )) && exit $(( $1 + $2 )) """ - # result = code_server.run_code(src, - # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - # check_result(result) + result = code_server.run_code(src, + 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + check_result(result) src = """ #!/bin/bash [[ $# -eq 2 ]] && echo $(( $1 - $2 )) && exit $(( $1 - $2 )) """ - #result = code_server.run_code(src, - # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - #check_result(result, 'error') + result = code_server.run_code(src, + 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + check_result(result, 'error') src = """\ #!/bin/bash while [ 1 ] ; do echo "" > /dev/null ; done """ - #result = code_server.run_code(src, - # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - #check_result(result, 'more than ') + result = code_server.run_code(src, + 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + check_result(result, 'more than ') src = ''' #!/bin/bash while [ 1 ] ; do echo "" > /dev/null ''' - #result = code_server.run_code(src, - # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - #check_result(result, 'error') + result = code_server.run_code(src, + 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + check_result(result, 'error') src = '''# Enter your code here. #!/bin/bash while [ 1 ] ; do echo "" > /dev/null ''' - #result = code_server.run_code(src, - # 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") - #check_result(result, 'oserror') + result = code_server.run_code(src, + 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + check_result(result, 'oserror') if __name__ == '__main__': test_python() -- cgit From 8a3016a88af5c4a09e8b5683f1e305e9100f3562 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Tue, 2 Jul 2013 12:25:33 +0530 Subject: c files moved --- testapp/c_cpp_files/add.c | 4 ---- testapp/c_cpp_files/add.cpp | 6 ------ testapp/c_cpp_files/array_sum.c | 10 ---------- testapp/c_cpp_files/array_sum.cpp | 10 ---------- testapp/c_cpp_files/fact.c | 10 ---------- testapp/c_cpp_files/fact.cpp | 16 ---------------- testapp/c_cpp_files/greatest.c | 15 --------------- testapp/c_cpp_files/greatest.cpp | 15 --------------- testapp/c_cpp_files/hello_name.c | 16 ---------------- testapp/c_cpp_files/palindrome.c | 20 -------------------- testapp/c_cpp_files/palindrome.cpp | 19 ------------------- testapp/code_server.py | 6 +++--- 12 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 testapp/c_cpp_files/add.c delete mode 100644 testapp/c_cpp_files/add.cpp delete mode 100644 testapp/c_cpp_files/array_sum.c delete mode 100644 testapp/c_cpp_files/array_sum.cpp delete mode 100644 testapp/c_cpp_files/fact.c delete mode 100644 testapp/c_cpp_files/fact.cpp delete mode 100644 testapp/c_cpp_files/greatest.c delete mode 100644 testapp/c_cpp_files/greatest.cpp delete mode 100644 testapp/c_cpp_files/hello_name.c delete mode 100644 testapp/c_cpp_files/palindrome.c delete mode 100644 testapp/c_cpp_files/palindrome.cpp diff --git a/testapp/c_cpp_files/add.c b/testapp/c_cpp_files/add.c deleted file mode 100644 index c829971..0000000 --- a/testapp/c_cpp_files/add.c +++ /dev/null @@ -1,4 +0,0 @@ -int add(int a,int b) -{ - return a-b; -} diff --git a/testapp/c_cpp_files/add.cpp b/testapp/c_cpp_files/add.cpp deleted file mode 100644 index d3b7897..0000000 --- a/testapp/c_cpp_files/add.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include -int add(int a,int b) -{ - printf("All Correct"); - return a; -} diff --git a/testapp/c_cpp_files/array_sum.c b/testapp/c_cpp_files/array_sum.c deleted file mode 100644 index 619a23c..0000000 --- a/testapp/c_cpp_files/array_sum.c +++ /dev/null @@ -1,10 +0,0 @@ -int array_sum(int a[5]) -{ - int i=0, sum=0; - for(i=0;i<5;i++) - { - sum = sum + a[i]; - } - return sum; -} - diff --git a/testapp/c_cpp_files/array_sum.cpp b/testapp/c_cpp_files/array_sum.cpp deleted file mode 100644 index 9b82d3b..0000000 --- a/testapp/c_cpp_files/array_sum.cpp +++ /dev/null @@ -1,10 +0,0 @@ -int array_sum(int a[]) -{ - int i=0, sum=0; - for(i=0;i<5;i++) - { - sum = sum + a[i]; - } - return sum; -} - diff --git a/testapp/c_cpp_files/fact.c b/testapp/c_cpp_files/fact.c deleted file mode 100644 index e3665f5..0000000 --- a/testapp/c_cpp_files/fact.c +++ /dev/null @@ -1,10 +0,0 @@ -int factorial(int a) -{ - int i,fact=1; - for(i=1;i<=a;a--) - { - fact=fact*a; - } - return fact; - -} diff --git a/testapp/c_cpp_files/fact.cpp b/testapp/c_cpp_files/fact.cpp deleted file mode 100644 index f9b7458..0000000 --- a/testapp/c_cpp_files/fact.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -int fact = 1; -int factorial(int a) -{ - printf("%d\n",a); - if(a<1) - { - printf("\nfinal"); - return 1; - } - else - { - printf("count\n"); - return a*factorial(a-1); - } -} diff --git a/testapp/c_cpp_files/greatest.c b/testapp/c_cpp_files/greatest.c deleted file mode 100644 index 0194855..0000000 --- a/testapp/c_cpp_files/greatest.c +++ /dev/null @@ -1,15 +0,0 @@ -int greatest(int a,int b,int c) -{ - if(a>b && a>c) - { - return a; - } - else if(b>c) - { - return b; - } - else - { - return c; - } -} diff --git a/testapp/c_cpp_files/greatest.cpp b/testapp/c_cpp_files/greatest.cpp deleted file mode 100644 index 0194855..0000000 --- a/testapp/c_cpp_files/greatest.cpp +++ /dev/null @@ -1,15 +0,0 @@ -int greatest(int a,int b,int c) -{ - if(a>b && a>c) - { - return a; - } - else if(b>c) - { - return b; - } - else - { - return c; - } -} diff --git a/testapp/c_cpp_files/hello_name.c b/testapp/c_cpp_files/hello_name.c deleted file mode 100644 index 8fa2519..0000000 --- a/testapp/c_cpp_files/hello_name.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include - -char *message(char a[]) -{ - return (strcat("hello",a)); -} - -main() -{ - printf("he\n"); - char q[]="re"; - char s[20]; - s= message(q); - printf("%s",s); -} diff --git a/testapp/c_cpp_files/palindrome.c b/testapp/c_cpp_files/palindrome.c deleted file mode 100644 index 236d963..0000000 --- a/testapp/c_cpp_files/palindrome.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -bool palindrome(int a) -{ - int n1, rev = 0, rem; - n1 = a; - while (a > 0) - { - rem = a % 10; - rev = rev * 10 + rem; - a = a / 10; - } - if (n1 == rev) - { - return true; - } - else - { - return false; - } -} diff --git a/testapp/c_cpp_files/palindrome.cpp b/testapp/c_cpp_files/palindrome.cpp deleted file mode 100644 index aae5dd1..0000000 --- a/testapp/c_cpp_files/palindrome.cpp +++ /dev/null @@ -1,19 +0,0 @@ -bool palindrome(int n) -{ - int n1, rev = 0, rem; - n1 = n; - while (n > 0) - { - rem = n % 10; - rev = rev * 10 + rem; - n = n / 10; - } - if (n1 == rev) - { - return true; - } - else - { - return false; - } -} diff --git a/testapp/code_server.py b/testapp/code_server.py index ad15501..2fdd11f 100755 --- a/testapp/code_server.py +++ b/testapp/code_server.py @@ -252,7 +252,7 @@ class CodeServer(object): stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc, stdnt_stdout, stdnt_stderr = ret - if inst_stdout in stdnt_stdout: + if inst_stdout == stdnt_stdout: return True, 'Correct answer' else: err = "Error: expected %s, got %s" % (inst_stderr, @@ -284,7 +284,7 @@ class CodeServer(object): stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc, stdnt_stdout, stdnt_stderr = ret - valid_answer = inst_stdout in stdnt_stdout + valid_answer = inst_stdout == stdnt_stdout if valid_answer and (num_lines == loop_count): return True, "Correct answer" else: @@ -293,7 +293,7 @@ class CodeServer(object): return False, err def run_c_code(self, answer, test_code, in_dir=None): - """Tests given C code (`answer`) with the `test_code` supplied. + """Tests given C code (`answer`) with the `test_code` supplied. The testcode is a path to the reference code. The reference code will call the function submitted by the student. -- cgit From 610709c2ff35263741ca6e41c3648439806b564a Mon Sep 17 00:00:00 2001 From: prathamesh Date: Tue, 2 Jul 2013 13:00:40 +0530 Subject: changes made --- testapp/code_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/code_server.py b/testapp/code_server.py index 2fdd11f..d6ae75d 100755 --- a/testapp/code_server.py +++ b/testapp/code_server.py @@ -293,7 +293,7 @@ class CodeServer(object): return False, err def run_c_code(self, answer, test_code, in_dir=None): - """Tests given C code (`answer`) with the `test_code` supplied. + """Tests given C code (`answer`) with the `test_code` supplied. The testcode is a path to the reference code. The reference code will call the function submitted by the student. -- cgit From 217f2c859fc0b2b4a224c009e9cd374989da050e Mon Sep 17 00:00:00 2001 From: prathamesh Date: Tue, 2 Jul 2013 13:24:00 +0530 Subject: clean C and Cpp --- testapp/c_cpp_files/sample.c | 20 -------------------- testapp/c_cpp_files/sample.cpp | 7 ------- 2 files changed, 27 deletions(-) delete mode 100755 testapp/c_cpp_files/sample.c delete mode 100755 testapp/c_cpp_files/sample.cpp diff --git a/testapp/c_cpp_files/sample.c b/testapp/c_cpp_files/sample.c deleted file mode 100755 index 660f862..0000000 --- a/testapp/c_cpp_files/sample.c +++ /dev/null @@ -1,20 +0,0 @@ -#include - -void main(int argc , char * argv[]) -{ - int i,sum=0; - -/* if(argc!=3) - { - printf("you have forgot to type numbers."); - exit(1); - } -*/ - printf("The sum is : "); - - for(i=1;i -#include -int main(int argc, char* argv[]) -{ - std::cout << atoi(argv[1])+atoi(argv[2]) << std::endl; - return 0; -} -- cgit From eee6362ab994bc0082fdc777c225773318978b1a Mon Sep 17 00:00:00 2001 From: prathamesh Date: Tue, 2 Jul 2013 15:52:59 +0530 Subject: minor changes --- testapp/c_cpp_files/main.cpp | 4 +++- testapp/c_cpp_files/main2.c | 6 ++++-- testapp/c_cpp_files/main_array_sum.cpp | 8 +++++--- testapp/c_cpp_files/main_fact.cpp | 4 +++- testapp/c_cpp_files/main_greatest.cpp | 14 +++++++++++++- testapp/c_cpp_files/main_palindrome.cpp | 4 +++- testapp/code_server.py | 2 -- 7 files changed, 31 insertions(+), 11 deletions(-) diff --git a/testapp/c_cpp_files/main.cpp b/testapp/c_cpp_files/main.cpp index ffd110e..ebe1f08 100755 --- a/testapp/c_cpp_files/main.cpp +++ b/testapp/c_cpp_files/main.cpp @@ -9,7 +9,7 @@ void check(T expect, T result) { if (expect == result) { - //printf("Correct:\n Expected %d got %d \n",expect,result); + printf("\nCorrect:\n Expected %d got %d \n",expect,result); } else { @@ -22,8 +22,10 @@ int main(void) { int result; result = add(0,0); + printf("Input submitted to the function: 0, 0"); check(0, result); result = add(2,3); + printf("Input submitted to the function: 2 3"); check(5,result); printf("All Correct\n"); return 0; diff --git a/testapp/c_cpp_files/main2.c b/testapp/c_cpp_files/main2.c index 3d28ff6..ccd1768 100755 --- a/testapp/c_cpp_files/main2.c +++ b/testapp/c_cpp_files/main2.c @@ -8,11 +8,11 @@ void check(T expect,T result) { if (expect == result) { - printf("Correct:\n Expected %d got %d \n",expect,result); + printf("\nCorrect:\n Expected %d got %d \n",expect,result); } else { - printf("Incorrect:\n Expected %d got %d \n",expect,result); + printf("\nIncorrect:\n Expected %d got %d \n",expect,result); exit (0); } } @@ -21,8 +21,10 @@ int main(void) { int result; result = add(0,0,0); + printf("Input submitted to the function: 0, 0, 0"); check(0, result); result = add(2,3,3); + printf("Input submitted to the function: 2, 3, 3"); check(8,result); printf("All Correct\n"); } diff --git a/testapp/c_cpp_files/main_array_sum.cpp b/testapp/c_cpp_files/main_array_sum.cpp index 72eee46..55b2ebf 100755 --- a/testapp/c_cpp_files/main_array_sum.cpp +++ b/testapp/c_cpp_files/main_array_sum.cpp @@ -9,7 +9,7 @@ void check(T expect,T result) { if (expect == result) { - //printf("Correct:\n Expected %d got %d \n",expect,result); + printf("\nCorrect:\n Expected %d got %d \n",expect,result); } else { @@ -21,11 +21,13 @@ void check(T expect,T result) int main(void) { int result; - int a[55555] = {1,2,3,0,0}; + int a[] = {1,2,3,0,0}; result = array_sum(a); + printf("Input submitted to the function: {1, 2, 3, 0, 0}"); check(6, result); int b[] = {1,2,3,4,5}; - result = array_sum(b); + result = array_sum(b); + printf("Input submitted to the function: {1, 2, 3, 4, 5}"); check(15,result); printf("All Correct\n"); return 0; diff --git a/testapp/c_cpp_files/main_fact.cpp b/testapp/c_cpp_files/main_fact.cpp index ff65456..a4ff230 100755 --- a/testapp/c_cpp_files/main_fact.cpp +++ b/testapp/c_cpp_files/main_fact.cpp @@ -9,7 +9,7 @@ void check(T expect, T result) { if (expect == result) { - //printf("Correct:\n Expected %d got %d \n",expect,result); + printf("\nCorrect:\n Expected %d got %d \n",expect,result); } else { @@ -22,8 +22,10 @@ int main(void) { int result; result = factorial(0); + printf("Input submitted to the function: 0"); check(1, result); result = factorial(3); + printf("Input submitted to the function: 3"); check(6, result); printf("All Correct\n"); return 0; diff --git a/testapp/c_cpp_files/main_greatest.cpp b/testapp/c_cpp_files/main_greatest.cpp index fe9ff5b..6d0a7c2 100755 --- a/testapp/c_cpp_files/main_greatest.cpp +++ b/testapp/c_cpp_files/main_greatest.cpp @@ -9,7 +9,7 @@ void check(T expect, T result) { if (expect == result) { - //printf("Correct:\n Expected %d got %d \n",expect,result); + printf("\nCorrect:\n Expected %d got %d \n",expect,result); } else { @@ -22,11 +22,23 @@ int main(void) { int result; result = greatest(1, 2, 3); + printf("Input submitted to the function: 1, 2, 3"); check(3, result); result = greatest(5, 9, 2); + printf("Input submitted to the function: 5, 9, 2"); check(9, result); result = greatest(7, 2, 4); + printf("Input submitted to the function: 7, 2, 4"); check(7, result); + result = greatest(11, 2, 45); + printf("Input submitted to the function: 11, 2, 45"); + check(45, result); + result = greatest(2, 7, 0); + printf("Input submitted to the function: 2, 7, 0"); + check(7, result); + result = greatest(9, 6, 5); + printf("Input submitted to the function: 9, 6, 5"); + check(9, result); printf("All Correct\n"); return 0; } diff --git a/testapp/c_cpp_files/main_palindrome.cpp b/testapp/c_cpp_files/main_palindrome.cpp index a5d67b5..0e66928 100755 --- a/testapp/c_cpp_files/main_palindrome.cpp +++ b/testapp/c_cpp_files/main_palindrome.cpp @@ -9,7 +9,7 @@ void check(T expect, T result) { if (expect == result) { - //printf("Correct:\n Expected %d got %d \n",expect,result); + printf("\nCorrect:\n Expected %d got %d \n",expect,result); } else { @@ -22,8 +22,10 @@ int main(void) { bool result; result = palindrome(123); + printf("Input submitted to the function: 123"); check(false, result); result = palindrome(121); + printf("Input submitted to the function: 121"); check(true, result); printf("All Correct\n"); return 0; diff --git a/testapp/code_server.py b/testapp/code_server.py index d6ae75d..19c70b1 100755 --- a/testapp/code_server.py +++ b/testapp/code_server.py @@ -204,8 +204,6 @@ class CodeServer(object): except TimeoutException: # Runaway code, so kill it. proc.kill() - # Re-raise exception. - #raise stderr = self.timeout_msg stdout = '' return proc, stdout, stderr -- cgit From 781842c523ccf11b85e0be06e884b2cd585f3cb9 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Wed, 3 Jul 2013 12:41:00 +0530 Subject: clean code --- testapp/code_server.py | 14 ++++---------- testapp/templates/exam/question.html | 2 +- testapp/test_server.py | 12 ++++++------ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/testapp/code_server.py b/testapp/code_server.py index 19c70b1..a3513b7 100755 --- a/testapp/code_server.py +++ b/testapp/code_server.py @@ -204,8 +204,8 @@ class CodeServer(object): except TimeoutException: # Runaway code, so kill it. proc.kill() - stderr = self.timeout_msg - stdout = '' + # Re-raise exception. + raise return proc, stdout, stderr def check_bash_script(self, ref_script_path, submit_script_path, @@ -398,9 +398,7 @@ class CodeServer(object): success = False output_path = os.getcwd() + '/output' compile_command = "g++ %s -c -o %s" % (submit_code_path, output_path) - ret = self._compile_command(compile_command, stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + ret = self._compile_command(compile_command) proc, inst_stderr = ret # Only if compilation is successful, the program is executed @@ -409,9 +407,7 @@ class CodeServer(object): executable = os.getcwd() + '/executable' compile_main = "g++ %s %s -o %s" % (ref_code_path, output_path, executable) - ret = self._compile_command(compile_main, stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + ret = self._compile_command(compile_main) proc, main_err = ret if main_err == '': args = [executable] @@ -423,7 +419,6 @@ class CodeServer(object): success, err = True, "Correct answer" else: err = stdout + "\n" + stderr - success = False os.remove(executable) else: err = "Error:" @@ -433,7 +428,6 @@ class CodeServer(object): err = err + "\n" + e.split(":", 1)[1] except: err = err + "\n" + main_err - success = False os.remove(output_path) else: err = "Compilation Error:" diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 11ea1aa..1203c0e 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -92,7 +92,7 @@ function update_time() {% endfor %} {% else %} - +
diff --git a/testapp/test_server.py b/testapp/test_server.py index f2ea84c..924a6c5 100644 --- a/testapp/test_server.py +++ b/testapp/test_server.py @@ -8,13 +8,13 @@ from exam.xmlrpc_clients import code_server def check_result(result, check='correct answer'): - if check != 'correct answer': - assert result[0] == False - else: - assert result[0] == True - if "unable to connect" in result[1].lower(): + if check != 'correct answer': + assert result[0] == False + else: + assert result[0] == True + if "unable to connect" in result[1].lower(): assert result[0], result[1] - assert check in result[1].lower(), result[1] + assert check in result[1].lower(), result[1] def test_python(): """Test if server runs Python code as expected.""" -- cgit From b522a1ba1c1edff7648c6c7d69fa2867a08b4100 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Wed, 3 Jul 2013 16:49:29 +0530 Subject: merged java --- testapp/code_server.py | 166 +++++++++++++++++++++++++++++++- testapp/exam/forms.py | 1 + testapp/exam/models.py | 1 + testapp/exam/views.py | 2 +- testapp/exam/xmlrpc_clients.py | 1 + testapp/java_files/main_array_sum.java | 36 +++++++ testapp/java_files/main_fact.java | 29 ++++++ testapp/java_files/main_great.java | 39 ++++++++ testapp/java_files/main_hello_name.java | 29 ++++++ testapp/java_files/main_palindrome.java | 29 ++++++ testapp/java_files/main_square.java | 32 ++++++ testapp/test_server.py | 115 +++++++++++++++++++--- 12 files changed, 463 insertions(+), 17 deletions(-) create mode 100644 testapp/java_files/main_array_sum.java create mode 100644 testapp/java_files/main_fact.java create mode 100644 testapp/java_files/main_great.java create mode 100644 testapp/java_files/main_hello_name.java create mode 100644 testapp/java_files/main_palindrome.java create mode 100644 testapp/java_files/main_square.java diff --git a/testapp/code_server.py b/testapp/code_server.py index a3513b7..8b3f8f1 100755 --- a/testapp/code_server.py +++ b/testapp/code_server.py @@ -353,7 +353,7 @@ class CodeServer(object): return success, err def _compile_command(self, cmd, *args, **kw): - """Compiles C/C++ code and returns errors if any. + """Compiles C/C++/java code and returns errors if any. Run a command in a subprocess while blocking, the process is killed if it takes more than 2 seconds to run. Return the Popen object, the stderr. @@ -370,6 +370,7 @@ class CodeServer(object): raise return proc_compile, err + def _check_c_cpp_code(self, ref_code_path, submit_code_path): """ Function validates student code using instructor code as reference.The first argument ref_code_path, is the path to @@ -399,11 +400,11 @@ class CodeServer(object): output_path = os.getcwd() + '/output' compile_command = "g++ %s -c -o %s" % (submit_code_path, output_path) ret = self._compile_command(compile_command) - proc, inst_stderr = ret + proc, stdnt_stderr = ret # Only if compilation is successful, the program is executed # And tested with testcases - if inst_stderr == '': + if stdnt_stderr == '': executable = os.getcwd() + '/executable' compile_main = "g++ %s %s -o %s" % (ref_code_path, output_path, executable) @@ -432,14 +433,14 @@ class CodeServer(object): else: err = "Compilation Error:" try: - error_lines = inst_stderr.splitlines() + error_lines = stdnt_stderr.splitlines() for e in error_lines: if ':' in e: err = err + "\n" + e.split(":", 1)[1] else: err = err + "\n" + e except: - err = err + "\n" + inst_stderr + err = err + "\n" + stdnt_stderr return success, err def run_cplus_code(self, answer, test_code, in_dir=None): @@ -504,6 +505,161 @@ class CodeServer(object): return success, err + def run_java_code(self, answer, test_code, in_dir=None): + """Tests given java code (`answer`) with the `test_code` supplied. + + The testcode is a path to the reference code. + The reference code will call the function submitted by the student. + The reference code will check for the expected output. + + If the path's start with a "/" then we assume they are absolute paths. + If not, we assume they are relative paths w.r.t. the location of this + code_server script. + + If the optional `in_dir` keyword argument is supplied it changes the + directory to that directory (it does not change it back to the original + when done). + + Returns + ------- + + A tuple: (success, error message). + + """ + if in_dir is not None and isdir(in_dir): + os.chdir(in_dir) + + # The file extension must be .java + # The class name and file name must be same in java + submit_f = open('Test.java', 'w') + submit_f.write(answer.lstrip()) + submit_f.close() + submit_path = abspath(submit_f.name) + + ref_path = test_code.strip() + if not ref_path.startswith('/'): + ref_path = join(MY_DIR, ref_path) + + # Add a new signal handler for the execution of this code. + old_handler = signal.signal(signal.SIGALRM, timeout_handler) + signal.alarm(SERVER_TIMEOUT) + + # Do whatever testing needed. + success = False + try: + success, err = self._check_java_code(ref_path, submit_path) + except TimeoutException: + err = self.timeout_msg + except: + type, value = sys.exc_info()[:2] + err = "Error: {0}".format(repr(value)) + finally: + # Set back any original signal handler. + signal.signal(signal.SIGALRM, old_handler) + + # Delete the created file. + os.remove(submit_path) + + # Cancel the signal if any, see signal.alarm documentation. + signal.alarm(0) + + # Put us back into the server pool queue since we are free now. + self.queue.put(self.port) + + return success, err + + def _check_java_code(self, ref_code_path, submit_code_path): + """ Function validates student code using instructor code as + reference.The first argument ref_code_path, is the path to + instructor code, it is assumed to have executable permission. + The second argument submit_code_path, is the path to the student + code, it is assumed to have executable permission. + + Returns + -------- + + returns (True, "Correct answer") : If the student function returns + expected output when called by reference code. + + returns (False, error_msg): If the student function fails to return + expected output when called by reference code. + + Returns (False, error_msg): If mandatory arguments are not files or + if the required permissions are not given to the file(s). + + """ + if not isfile(ref_code_path): + return False, "No file at %s" % ref_code_path + if not isfile(submit_code_path): + return False, 'No file at %s' % submit_code_path + + success = False + compile_command = "javac %s" % (submit_code_path) + ret = self._compile_command(compile_command) + proc, stdnt_stderr = ret + stdnt_stderr = self._remove_null_substitute_char(stdnt_stderr) + + # Only if compilation is successful, the program is executed + # And tested with testcases + if stdnt_stderr == '': + student_directory = os.getcwd() + '/' + student_file_name = "Test" + compile_main = "javac %s -classpath %s -d %s" % (ref_code_path, + student_directory, + student_directory) + ret = self._compile_command(compile_main) + proc, main_err = ret + main_err = self._remove_null_substitute_char(main_err) + + if main_err == '': + main_file_name = (ref_code_path.split('/')[-1]).split('.')[0] + run_command = "java -cp %s %s" % (student_directory, + main_file_name) + ret = self._run_command(run_command, + stdin=None, + shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + proc, stdout, stderr = ret + if proc.returncode == 0: + success, err = True, "Correct answer" + else: + err = stdout + "\n" + stderr + success = False + os.remove("%s%s.class" % (student_directory, main_file_name)) + else: + err = "Error:\n" + try: + error_lines = main_err.splitlines() + for e in error_lines: + if ':' in e: + err = err + "\n" + e.split(":", 1)[1] + else: + err = err + "\n" + e + except: + err = err + "\n" + main_err + os.remove("%s%s.class" % (student_directory, student_file_name)) + else: + err = "Compilation Error:\n" + try: + error_lines = stdnt_stderr.splitlines() + for e in error_lines: + if ':' in e: + err = err + "\n" + e.split(":", 1)[1] + else: + err = err + "\n" + e + except: + err = err + "\n" + stdnt_stderr + return success, err + + def _remove_null_substitute_char(self, string): + """Returns a string without any null and substitute characters""" + stripped = "" + for c in string: + if ord(c) is not 26 and ord(c) is not 0: + stripped = stripped + c + return ''.join(stripped) + def run(self): """Run XMLRPC server, serving our methods. """ diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 1b60a71..8506de2 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -18,6 +18,7 @@ QUESTION_TYPE_CHOICES = ( ("mcq", "MCQ"), ("C", "C Language"), ("C++", "C++ Language"), + ("java", "Java Language"), ) UNAME_CHARS = letters + "._" + digits diff --git a/testapp/exam/models.py b/testapp/exam/models.py index fac01ec..5d6e2cf 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -20,6 +20,7 @@ QUESTION_TYPE_CHOICES = ( ("mcq", "MultipleChoice"), ("C", "C Language"), ("C++", "C++ Language"), + ("java", "Java Language"), ) ################################################################################ diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 4c47004..dd11346 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -963,7 +963,7 @@ def user_data(request, username): """Render user data.""" current_user = request.user - if not current_user.is_authenticated() or not is_moderator(user): + if not current_user.is_authenticated() or not is_moderator(current_user): raise Http404('You are not allowed to view this page!') data = get_user_data(username) diff --git a/testapp/exam/xmlrpc_clients.py b/testapp/exam/xmlrpc_clients.py index b846212..cc21e62 100644 --- a/testapp/exam/xmlrpc_clients.py +++ b/testapp/exam/xmlrpc_clients.py @@ -25,6 +25,7 @@ class CodeServerProxy(object): "bash": 'run_bash_code', "C": "run_c_code", "C++": "run_cplus_code", + "java": "run_java_code", } def run_code(self, answer, test_code, user_dir, language): diff --git a/testapp/java_files/main_array_sum.java b/testapp/java_files/main_array_sum.java new file mode 100644 index 0000000..5eae299 --- /dev/null +++ b/testapp/java_files/main_array_sum.java @@ -0,0 +1,36 @@ +class main_array_sum +{ + public static void check(E expect, E result) + { + if(result.equals(expect)) + { + System.out.println("Correct:\nOutput expected "+expect+" and got "+result); + } + else + { + System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result); + System.exit(1); + } + } + public static void main(String arg[]) + { + int result; + Test t = new Test(); + int x[] = {0,0,0,0,0}; + result = t.array_sum(x); + System.out.println("Input submitted to the function: {0,0,0,0,0}"); + check(0, result); + int a[] = {1,2,3,4,5}; + result = t.array_sum(a); + System.out.println("Input submitted to the function: {1,2,3,4,5}"); + check(15, result); + int b[] = {1,2,3,0,0}; + result = t.array_sum(b); + System.out.println("Input submitted to the function: {1,2,3,0,0}"); + check(6, result); + int c[] = {1,1,1,1,1}; + result = t.array_sum(c); + System.out.println("Input submitted to the function: {1,1,1,1,1}"); + check(5, result); + } +} diff --git a/testapp/java_files/main_fact.java b/testapp/java_files/main_fact.java new file mode 100644 index 0000000..325dab6 --- /dev/null +++ b/testapp/java_files/main_fact.java @@ -0,0 +1,29 @@ +class main_fact +{ + public static void check(E expect, E result) + { + if(result.equals(expect)) + { + System.out.println("Correct:\nOutput expected "+expect+" and got "+result); + } + else + { + System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result); + System.exit(1); + } + } + public static void main(String arg[]) + { + Test t = new Test(); + int result; + result = t.factorial(0); + System.out.println("Input submitted to the function: 0"); + check(1, result); + result = t.factorial(3); + System.out.println("Input submitted to the function: 3"); + check(6, result); + result = t.factorial(4); + System.out.println("Input submitted to the function: 4"); + check(24, result); + } +} diff --git a/testapp/java_files/main_great.java b/testapp/java_files/main_great.java new file mode 100644 index 0000000..4bfcb1f --- /dev/null +++ b/testapp/java_files/main_great.java @@ -0,0 +1,39 @@ +class main_great +{ + public static void check(E expect, E result) + { + if(result.equals(expect)) + { + System.out.println("Correct:\nOutput expected "+expect+" and got "+result); + } + else + { + System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result); + System.exit(1); + } + } + public static void main(String arg[]) + { + Test t = new Test(); + int result; + result = t.greatest(1, 3, 4); + System.out.println("Input submitted to the function: 1, 3, 4"); + check(4, result); + result = t.greatest(5, 10, 3); + System.out.println("Input submitted to the function: 5, 10, 3"); + check(10, result); + result = t.greatest(6, 1, 4); + System.out.println("Input submitted to the function: 6, 1, 4"); + check(6, result); + result = t.greatest(6, 11, 14); + System.out.println("Input submitted to the function: 6, 11, 14"); + check(14, result); + result = t.greatest(3, 31, 4); + System.out.println("Input submitted to the function: 3, 31, 4"); + check(31, result); + result = t.greatest(26, 13, 3); + System.out.println("Input submitted to the function: 26, 13, 3"); + check(26, result); + + } +} diff --git a/testapp/java_files/main_hello_name.java b/testapp/java_files/main_hello_name.java new file mode 100644 index 0000000..84bb282 --- /dev/null +++ b/testapp/java_files/main_hello_name.java @@ -0,0 +1,29 @@ +class main_hello_name +{ + public static void check(E expect, E result) + { + if(result.equals(expect)) + { + System.out.println("Correct:\nOutput expected "+expect+" and got "+result); + } + else + { + System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result); + System.exit(1); + } + } + public static void main(String arg[]) + { + Test t = new Test(); + String result; + result = t.hello_name("Raj"); + System.out.println("Input submitted to the function: 'Raj'"); + check("hello Raj", result); + result = t.hello_name("Pratham"); + System.out.println("Input submitted to the function: 'Pratham'"); + check("hello Pratham", result); + result = t.hello_name("Ram"); + System.out.println("Input submitted to the function: 'Ram'"); + check("hello Ram", result); + } +} diff --git a/testapp/java_files/main_palindrome.java b/testapp/java_files/main_palindrome.java new file mode 100644 index 0000000..bd463e5 --- /dev/null +++ b/testapp/java_files/main_palindrome.java @@ -0,0 +1,29 @@ +class main_palindrome +{ + public static void check(E expect, E result) + { + if(result.equals(expect)) + { + System.out.println("Correct\n:Output expected "+expect+" and got "+result); + } + else + { + System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result); + System.exit(1); + } + } + public static void main(String arg[]) + { + Test t = new Test(); + boolean result; + result= t.palindrome(123); + System.out.println("Input submitted to the function: 123"); + check(false, result); + result = t.palindrome(151); + System.out.println("Input submitted to the function: 151"); + check(true, result); + result = t.palindrome(23432); + System.out.println("Input submitted to the function: 23432"); + check(true, result); + } +} diff --git a/testapp/java_files/main_square.java b/testapp/java_files/main_square.java new file mode 100644 index 0000000..5cb8c35 --- /dev/null +++ b/testapp/java_files/main_square.java @@ -0,0 +1,32 @@ +class main_square +{ + public static void check(E expect, E result) + { + if(result.equals(expect)) + { + System.out.println("Correct:\nOutput expected "+expect+" and got "+result); + } + else + { + System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result); + System.exit(1); + } + } + public static void main(String arg[]) + { + Test t = new Test(); + int result, input, output; + input = 0; output = 0; + result = t.square_num(input); + System.out.println("Input submitted to the function: "+input); + check(output, result); + input = 5; output = 25; + result = t.square_num(input); + System.out.println("Input submitted to the function: "+input); + check(output, result); + input = 6; output = 36; + result = t.square_num(input); + System.out.println("Input submitted to the function: "+input); + check(output, result); + } +} diff --git a/testapp/test_server.py b/testapp/test_server.py index 924a6c5..2a17739 100644 --- a/testapp/test_server.py +++ b/testapp/test_server.py @@ -16,6 +16,7 @@ def check_result(result, check='correct answer'): assert result[0], result[1] assert check in result[1].lower(), result[1] + def test_python(): """Test if server runs Python code as expected.""" src = 'while True: pass' @@ -43,14 +44,16 @@ def test_c(): int ad(int a, int b) {return a+b;} """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C") check_result(result, 'error') src = """ int add(int a, int b) {return a+b} """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C") check_result(result, 'compilation error') src = """ @@ -58,14 +61,16 @@ def test_c(): {while(1>0){} return a+b;} """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C") check_result(result, 'more than') src = """ int add(int a, int b) {return a+b;} """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C") check_result(result, 'correct answer') src = """ @@ -73,7 +78,8 @@ def test_c(): int add(int a, int b) {printf("All Correct");} """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C") check_result(result, 'incorrect') @@ -85,8 +91,9 @@ def test_cpp(): return a+b } """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") - check_result(result, 'compilation error') + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C++") + check_result(result, 'error') src = """ int add(int a, int b) @@ -94,7 +101,8 @@ def test_cpp(): return a+b; } """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C++") check_result(result, 'correct answer') src = """ @@ -103,7 +111,8 @@ def test_cpp(): return a+b; } """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C++") check_result(result, 'error') src = """ @@ -114,9 +123,92 @@ def test_cpp(): return a+b; } """ - result = code_server.run_code(src, 'c_cpp_files/main.cpp', '/tmp', language="C++") + result = code_server.run_code(src, 'c_cpp_files/main.cpp', + '/tmp', language="C++") check_result(result, 'more than') + +def test_java(): + """Test if server runs java code as expected.""" + src = """ + class Test + { + int square_num(int a) + { + return a*a; + } + } + """ + result = code_server.run_code(src, 'java_files/main_square.java', + '/tmp', language="java") + check_result(result, 'correct answer') + + src = """ + class Test + { + int square_num(int a) + { + return b*b; + } + } + """ + result = code_server.run_code(src, 'java_files/main_square.java', + '/tmp', language="java") + check_result(result, 'error') + + src = """ + class Test + { + int square_nu(int a) + { + return a*a; + } + } + """ + result = code_server.run_code(src, 'java_files/main_square.java', + '/tmp', language="java") + check_result(result, 'error') + + src = """ + class Test + { + int square_num(int a) + { + while(0==0) + {} + } + } + """ + result = code_server.run_code(src, 'java_files/main_square.java', + '/tmp', language="java") + check_result(result, 'more than') + + src = """ + class Test + { + int square_num(int a) + { + return a+b + } + } + """ + result = code_server.run_code(src, 'java_files/main_square.java', + '/tmp', language="java") + check_result(result, 'error') + + src = """ + class Test + { + int square_num(int a) + { + return a+b + + """ + result = code_server.run_code(src, 'java_files/main_square.java', + '/tmp', language="java") + check_result(result, 'error') + + def test_bash(): """Test if server runs Bash code as expected.""" src = """ @@ -132,7 +224,7 @@ def test_bash(): [[ $# -eq 2 ]] && echo $(( $1 - $2 )) && exit $(( $1 - $2 )) """ result = code_server.run_code(src, - 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") + 'docs/sample.sh\ndocs/sample.args', '/tmp', language="bash") check_result(result, 'error') src = """\ @@ -164,3 +256,4 @@ if __name__ == '__main__': test_bash() test_c() test_cpp() + test_java() -- cgit