Remove the use of files for specifying test cases

3 files changed, 23 insertions, 15 deletions

diff --git a/yaksh/cpp_code_evaluator.py b/yaksh/cpp_code_evaluator.py
index f0c2029..ca70a74 100644
--- a/yaksh/cpp_code_evaluator.py
+++ b/yaksh/cpp_code_evaluator.py
@@ -15,11 +15,12 @@ class CppCodeEvaluator(BaseEvaluator):
     """Tests the C code obtained from Code Server"""
     def __init__(self, metadata, test_case_data):
         self.files = []
-        self.submit_code_path = self.create_submit_code_file('submit.c')
         self.compiled_user_answer = None
         self.compiled_test_code = None
         self.user_output_path = ""
         self.ref_output_path = ""
+        self.submit_code_path = ""
+        self.test_code_path = ""
 
         # Set metadata values
         self.user_answer = metadata.get('user_answer')
@@ -32,11 +33,14 @@ class CppCodeEvaluator(BaseEvaluator):
 
     def teardown(self):
         # Delete the created file.
-        os.remove(self.submit_code_path)
+        if os.path.exists(self.submit_code_path):
+            os.remove(self.submit_code_path)
         if os.path.exists(self.ref_output_path):
             os.remove(self.ref_output_path)
         if os.path.exists(self.user_output_path):
             os.remove(self.user_output_path)
+        if os.path.exists(self.test_code_path):
+            os.remove(self.test_code_path)
         if self.files:
             delete_files(self.files)
 
@@ -59,9 +63,11 @@ class CppCodeEvaluator(BaseEvaluator):
         if self.compiled_user_answer and self.compiled_test_code:
             return None
         else:
-            ref_code_path = self.test_case
-            clean_ref_code_path, clean_test_case_path = \
-                self._set_test_code_file_path(ref_code_path)
+            self.submit_code_path = self.create_submit_code_file('submit.c')
+            self.test_code_path = self.create_submit_code_file('main.c')
+            self.write_to_submit_code_file(self.submit_code_path, self.user_answer)
+            self.write_to_submit_code_file(self.test_code_path, self.test_case)
+            clean_ref_code_path = self.test_code_path
             if self.file_paths:
                 self.files = copy_files(self.file_paths)
             if not isfile(clean_ref_code_path):
@@ -71,7 +77,6 @@ class CppCodeEvaluator(BaseEvaluator):
                 msg = "No file at %s or Incorrect path" % self.submit_code_path
                 return False, msg
 
-            self.write_to_submit_code_file(self.submit_code_path, self.user_answer)
             self.user_output_path, self.ref_output_path = self.set_file_paths()
             self.compile_command, self.compile_main = self.get_commands(
                 clean_ref_code_path,
diff --git a/yaksh/cpp_stdio_evaluator.py b/yaksh/cpp_stdio_evaluator.py
index c318a82..d1dcd65 100644
--- a/yaksh/cpp_stdio_evaluator.py
+++ b/yaksh/cpp_stdio_evaluator.py
@@ -13,7 +13,6 @@ class CppStdIOEvaluator(StdIOEvaluator):
     """Evaluates C StdIO based code"""
     def __init__(self, metadata, test_case_data):
         self.files = []
-        self.submit_code_path = self.create_submit_code_file('submit.c')
 
         # Set metadata values
         self.user_answer = metadata.get('user_answer')
@@ -43,6 +42,7 @@ class CppStdIOEvaluator(StdIOEvaluator):
         return compile_command, compile_main
 
     def compile_code(self):
+        self.submit_code_path = self.create_submit_code_file('submit.c')
         if self.file_paths:
             self.files = copy_files(file_paths)
         if not isfile(self.submit_code_path):
diff --git a/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py
index 5d3fd28..25876b5 100644
--- a/yaksh/java_code_evaluator.py
+++ b/yaksh/java_code_evaluator.py
@@ -25,18 +25,20 @@ class JavaCodeEvaluator(BaseEvaluator):
         self.user_answer = metadata.get('user_answer')
         self.file_paths = metadata.get('file_paths')
         self.partial_grading = metadata.get('partial_grading')
-
         # Set test case data values
         self.test_case = test_case_data.get('test_case')
         self.weight = test_case_data.get('weight')
 
     def teardown(self):
         # Delete the created file.
-        os.remove(self.submit_code_path)
+        if os.path.exists(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 os.path.exists(self.test_code_path):
+            os.remove(self.test_code_path)
         if self.files:
             delete_files(self.files)
 
@@ -56,10 +58,14 @@ class JavaCodeEvaluator(BaseEvaluator):
         if self.compiled_user_answer and self.compiled_test_code:
             return None
         else:
+            # create student code and moderator code file
             self.submit_code_path = self.create_submit_code_file('Test.java')
-            ref_code_path = self.test_case
-            clean_ref_code_path, clean_test_case_path = \
-                     self._set_test_code_file_path(ref_code_path)
+            self.test_code_path = self.create_submit_code_file('main.java')
+            self.write_to_submit_code_file(self.submit_code_path,
+                    self.user_answer
+                )
+            self.write_to_submit_code_file(self.test_code_path, self.test_case)
+            clean_ref_code_path = self.test_code_path
             if self.file_paths:
                 self.files = copy_files(self.file_paths)
             if not isfile(clean_ref_code_path):
@@ -70,9 +76,6 @@ class JavaCodeEvaluator(BaseEvaluator):
                 return False, msg
 
             user_code_directory = os.getcwd() + '/'
-            self.write_to_submit_code_file(self.submit_code_path, 
-                self.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'