rebase changes with stdio evaluator

1 files changed, 13 insertions, 7 deletions

diff --git a/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py
index c64aa3b..ff76317 100644
--- a/yaksh/java_code_evaluator.py
+++ b/yaksh/java_code_evaluator.py
@@ -8,6 +8,7 @@ import importlib
 
 # local imports
 from code_evaluator import CodeEvaluator
+from file_utils import copy_files, delete_files
 
 
 class JavaCodeEvaluator(CodeEvaluator):
@@ -21,7 +22,13 @@ class JavaCodeEvaluator(CodeEvaluator):
     def teardown(self):
         super(JavaCodeEvaluator, self).teardown()
         # Delete the created file.
-        os.remove(self.submit_code_path) 
+        os.remove(self.submit_code_path)
+        if os.path.exists(self.user_output_path):
+            os.remove(self.user_output_path)
+        if os.path.exists(self.ref_output_path):
+            os.remove(self.ref_output_path)
+        if self.files:
+            delete_files(self.files)
 
     def get_commands(self, clean_ref_code_path, user_code_directory):
         compile_command = 'javac  {0}'.format(self.submit_code_path),
@@ -35,14 +42,16 @@ class JavaCodeEvaluator(CodeEvaluator):
         output_path = "{0}{1}.class".format(directory, file_name)
         return output_path
 
-    def compile_code(self, user_answer, test_case):
+    def compile_code(self, user_answer, file_paths, test_case):
+        self.files = []
         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 file_paths:
+                self.files = copy_files(file_paths)
             if not isfile(clean_ref_code_path):
                 msg = "No file at %s or Incorrect path" % clean_ref_code_path
                 return False, msg
@@ -83,7 +92,7 @@ class JavaCodeEvaluator(CodeEvaluator):
 
             return self.compiled_user_answer, self.compiled_test_code
 
-    def check_code(self, user_answer, test_case):
+    def check_code(self, user_answer, file_paths, 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.
@@ -123,7 +132,6 @@ class JavaCodeEvaluator(CodeEvaluator):
                     success, err = True, "Correct answer"
                 else:
                     err = stdout + "\n" + stderr
-                os.remove(self.ref_output_path)
             else:
                 err = "Error:"
                 try:
@@ -135,7 +143,6 @@ class JavaCodeEvaluator(CodeEvaluator):
                             err = err + "\n" + e
                 except:
                         err = err + "\n" + main_err
-            os.remove(self.user_output_path)
         else:
             err = "Compilation Error:"
             try:
@@ -147,5 +154,4 @@ class JavaCodeEvaluator(CodeEvaluator):
                         err = err + "\n" + e
             except:
                 err = err + "\n" + stdnt_stderr
-
         return success, err