Merge pull request #96 from ankitjavalkar/code-eval-refactor-clean2

Code evaluator refactor

1 files changed, 75 insertions, 52 deletions

diff --git a/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py
index 4367259..c64aa3b 100644
--- a/yaksh/java_code_evaluator.py
+++ b/yaksh/java_code_evaluator.py
@@ -12,48 +12,78 @@ from code_evaluator import CodeEvaluator
 
 class JavaCodeEvaluator(CodeEvaluator):
     """Tests the Java code obtained from Code Server"""
-    def __init__(self, test_case_data, test, language, user_answer,
-                     ref_code_path=None, in_dir=None):
-        super(JavaCodeEvaluator, self).__init__(test_case_data, test,
-                                                 language, user_answer,
-                                                 ref_code_path, in_dir)
-        self.test_case_args = self._setup()
-
-    # Private Protocol ##########
-    def _setup(self):
-        super(JavaCodeEvaluator, self)._setup()
-
-        ref_path, test_case_path = self._set_test_code_file_path(self.ref_code_path)
-        self.submit_path = self.create_submit_code_file('Test.java')
-
-        # Set file paths
-        java_student_directory = os.getcwd() + '/'
-        java_ref_file_name = (ref_path.split('/')[-1]).split('.')[0]
-
-        # Set command variables
-        compile_command = 'javac  {0}'.format(self.submit_path),
-        compile_main = ('javac {0} -classpath '
-                        '{1} -d {2}').format(ref_path,
-                                             java_student_directory,
-                                             java_student_directory)
-        run_command_args = "java -cp {0} {1}".format(java_student_directory,
-                                                     java_ref_file_name)
-        remove_user_output = "{0}{1}.class".format(java_student_directory,
-                                                     'Test')
-        remove_ref_output = "{0}{1}.class".format(java_student_directory,
-                                                     java_ref_file_name)
-
-        return (ref_path, self.submit_path, compile_command, compile_main,
-                     run_command_args, remove_user_output, remove_ref_output)
-
-    def _teardown(self):
+    def setup(self):
+        super(JavaCodeEvaluator, self).setup()
+        self.submit_code_path = self.create_submit_code_file('Test.java')
+        self.compiled_user_answer = None
+        self.compiled_test_code = None
+
+    def teardown(self):
+        super(JavaCodeEvaluator, self).teardown()
         # Delete the created file.
-        super(JavaCodeEvaluator, self)._teardown()
-        os.remove(self.submit_path)
+        os.remove(self.submit_code_path) 
 
-    def _check_code(self, ref_code_path, submit_code_path, compile_command,
-                     compile_main, run_command_args, remove_user_output,
-                     remove_ref_output):
+    def get_commands(self, clean_ref_code_path, user_code_directory):
+        compile_command = 'javac  {0}'.format(self.submit_code_path),
+        compile_main = ('javac {0} -classpath '
+                        '{1} -d {2}').format(clean_ref_code_path,
+                                             user_code_directory,
+                                             user_code_directory)
+        return compile_command, compile_main
+
+    def set_file_paths(self, directory, file_name):
+        output_path = "{0}{1}.class".format(directory, file_name)
+        return output_path
+
+    def compile_code(self, user_answer, test_case):
+        if self.compiled_user_answer and self.compiled_test_code:
+            return None
+        else:
+            ref_code_path = test_case
+            clean_ref_code_path, clean_test_case_path = \
+                     self._set_test_code_file_path(ref_code_path)
+
+            if not isfile(clean_ref_code_path):
+                msg = "No file at %s or Incorrect path" % clean_ref_code_path
+                return False, msg
+            if not isfile(self.submit_code_path):
+                msg = "No file at %s or Incorrect path" % self.submit_code_path
+                return False, msg
+
+            user_code_directory = os.getcwd() + '/'
+            self.write_to_submit_code_file(self.submit_code_path, 
+                user_answer
+            )
+            ref_file_name = (clean_ref_code_path.split('/')[-1]).split('.')[0]
+            self.user_output_path = self.set_file_paths(user_code_directory, 
+                'Test'
+            )
+            self.ref_output_path = self.set_file_paths(user_code_directory,
+                ref_file_name
+            )
+            compile_command, self.compile_main = self.get_commands(
+                clean_ref_code_path,
+                user_code_directory
+            )
+            self.run_command_args = "java -cp {0} {1}".format(
+                user_code_directory,
+                ref_file_name
+            )
+            self.compiled_user_answer = self._run_command(compile_command,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE
+            )
+
+            self.compiled_test_code = self._run_command(self.compile_main,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE
+            )
+
+            return self.compiled_user_answer, self.compiled_test_code
+
+    def check_code(self, user_answer, test_case):
         """ 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.
@@ -73,25 +103,18 @@ class JavaCodeEvaluator(CodeEvaluator):
         if the required permissions are not given to the file(s).
 
         """
-        if not isfile(ref_code_path):
-            return False, "No file at %s or Incorrect path" % ref_code_path
-        if not isfile(submit_code_path):
-            return False, 'No file at %s or Incorrect path' % submit_code_path
-
         success = False
-        ret = self._compile_command(compile_command)
-        proc, stdnt_stderr = ret
+        proc, stdnt_out, stdnt_stderr = self.compiled_user_answer
         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 == '':
-            ret = self._compile_command(compile_main)
-            proc, main_err = ret
+            proc, main_out, main_err = self.compiled_test_code
             main_err = self._remove_null_substitute_char(main_err)
 
             if main_err == '':
-                ret = self._run_command(run_command_args, shell=True,
+                ret = self._run_command(self.run_command_args, shell=True,
                                          stdin=None,
                                          stdout=subprocess.PIPE,
                                          stderr=subprocess.PIPE)
@@ -100,7 +123,7 @@ class JavaCodeEvaluator(CodeEvaluator):
                     success, err = True, "Correct answer"
                 else:
                     err = stdout + "\n" + stderr
-                os.remove(remove_ref_output)
+                os.remove(self.ref_output_path)
             else:
                 err = "Error:"
                 try:
@@ -112,7 +135,7 @@ class JavaCodeEvaluator(CodeEvaluator):
                             err = err + "\n" + e
                 except:
                         err = err + "\n" + main_err
-            os.remove(remove_user_output)
+            os.remove(self.user_output_path)
         else:
             err = "Compilation Error:"
             try: