Change all evaluator structure and make sure eval test cases pass

1 files changed, 26 insertions, 15 deletions

diff --git a/yaksh/java_stdio_evaluator.py b/yaksh/java_stdio_evaluator.py
index 88d4c88..78bc20e 100644
--- a/yaksh/java_stdio_evaluator.py
+++ b/yaksh/java_stdio_evaluator.py
@@ -11,17 +11,28 @@ from .file_utils import copy_files, delete_files
 
 class JavaStdioEvaluator(StdIOEvaluator):
     """Evaluates Java StdIO based code"""
-
-    def setup(self):
-        super(JavaStdioEvaluator, self).setup()
+    def __init__(self, metadata, test_case_data):
         self.files = []
-        self.submit_code_path = self.create_submit_code_file('Test.java')
+
+        # Set metadata values
+        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.expected_input = test_case_data.get('expected_input')
+        self.expected_output = test_case_data.get('expected_output')
+        self.weight = test_case_data.get('weight') 
+
+    # def setup(self):
+    #     super(JavaStdioEvaluator, self).setup()
+    #     self.files = []
+    #     self.submit_code_path = self.create_submit_code_file('Test.java')
 
     def teardown(self):
         os.remove(self.submit_code_path)
         if self.files:
             delete_files(self.files)
-        super(JavaStdioEvaluator, self).teardown()
 
     def set_file_paths(self, directory, file_name):
         output_path = "{0}{1}.class".format(directory, file_name)
@@ -31,14 +42,15 @@ class JavaStdioEvaluator(StdIOEvaluator):
         compile_command = 'javac {0}'.format(self.submit_code_path)
         return compile_command
 
-    def compile_code(self, user_answer, file_paths, expected_input, expected_output, weight):
+    def compile_code(self):
+        self.submit_code_path = self.create_submit_code_file('Test.java')
         if not isfile(self.submit_code_path):
             msg = "No file at %s or Incorrect path" % self.submit_code_path
             return False, msg
-        if file_paths:
-            self.files = copy_files(file_paths)
+        if self.file_paths:
+            self.files = copy_files(self.file_paths)
         user_code_directory = os.getcwd() + '/'
-        self.write_to_submit_code_file(self.submit_code_path, user_answer)
+        self.write_to_submit_code_file(self.submit_code_path, self.user_answer)
         self.user_output_path = self.set_file_paths(user_code_directory,
                                                     'Test'
                                                     )
@@ -50,8 +62,7 @@ class JavaStdioEvaluator(StdIOEvaluator):
                                                       )
         return self.compiled_user_answer
 
-    def check_code(self, user_answer, file_paths, partial_grading,
-        expected_input, expected_output, weight):
+    def check_code(self):
         success = False
         test_case_weight = 0.0
         proc, stdnt_out, stdnt_stderr = self.compiled_user_answer
@@ -63,9 +74,9 @@ class JavaStdioEvaluator(StdIOEvaluator):
                                     stdout=subprocess.PIPE,
                                     stderr=subprocess.PIPE
                                     )
-            success, err = self.evaluate_stdio(user_answer, proc,
-                                               expected_input,
-                                               expected_output
+            success, err = self.evaluate_stdio(self.user_answer, proc,
+                                               self.expected_input,
+                                               self.expected_output
                                                )
             os.remove(self.user_output_path)
         else:
@@ -79,5 +90,5 @@ class JavaStdioEvaluator(StdIOEvaluator):
                         err = err + "\n" + e
             except:
                 err = err + "\n" + stdnt_stderr
-        test_case_weight = float(weight) if partial_grading and success else 0.0
+        test_case_weight = float(self.weight) if self.partial_grading and success else 0.0
         return success, err, test_case_weight