summaryrefslogtreecommitdiff
path: root/testapp/exam/python_code_evaluator.py
diff options
context:
space:
mode:
Diffstat (limited to 'testapp/exam/python_code_evaluator.py')
-rw-r--r--testapp/exam/python_code_evaluator.py59
1 files changed, 16 insertions, 43 deletions
diff --git a/testapp/exam/python_code_evaluator.py b/testapp/exam/python_code_evaluator.py
index 05a5063..61eee66 100644
--- a/testapp/exam/python_code_evaluator.py
+++ b/testapp/exam/python_code_evaluator.py
@@ -7,13 +7,12 @@ import importlib
# local imports
from code_evaluator import CodeEvaluator
-# from language_registry import registry
class PythonCodeEvaluator(CodeEvaluator):
"""Tests the Python code obtained from Code Server"""
# Private Protocol ##########
- def check_code(self):
+ def _check_code(self):
success = False
try:
@@ -37,49 +36,23 @@ class PythonCodeEvaluator(CodeEvaluator):
del tb
return success, err
- # # Public Protocol ##########
- # def evaluate_code(self):
- # success = False
-
- # try:
- # tb = None
- # test_code = self._create_test_case()
- # submitted = compile(self.user_answer, '<string>', mode='exec')
- # g = {}
- # exec submitted in g
- # _tests = compile(test_code, '<string>', mode='exec')
- # exec _tests in g
- # except AssertionError:
- # type, value, tb = sys.exc_info()
- # info = traceback.extract_tb(tb)
- # fname, lineno, func, text = info[-1]
- # text = str(test_code).splitlines()[lineno-1]
- # err = "{0} {1} in: {2}".format(type.__name__, str(value), text)
- # else:
- # success = True
- # err = 'Correct answer'
-
- # del tb
- # return success, err
-
- # Private Protocol ##########
def _create_test_case(self):
"""
Create assert based test cases in python
"""
test_code = ""
- for test_case in self.test_case_data:
- pos_args = ", ".join(str(i) for i in test_case.get('pos_args')) \
- if test_case.get('pos_args') else ""
- kw_args = ", ".join(str(k+"="+a) for k, a
- in test_case.get('kw_args').iteritems()) \
- if test_case.get('kw_args') else ""
- args = pos_args + ", " + kw_args if pos_args and kw_args \
- else pos_args or kw_args
- tcode = "assert {0}({1}) == {2}".format(test_case.get('func_name'),
- args, test_case.get('expected_answer'))
- test_code += tcode + "\n"
- return test_code
-
-
-# registry.register('python', EvaluatePythonCode)
+ if self.test:
+ return self.test
+ elif self.test_case_data:
+ for test_case in self.test_case_data:
+ pos_args = ", ".join(str(i) for i in test_case.get('pos_args')) \
+ if test_case.get('pos_args') else ""
+ kw_args = ", ".join(str(k+"="+a) for k, a
+ in test_case.get('kw_args').iteritems()) \
+ if test_case.get('kw_args') else ""
+ args = pos_args + ", " + kw_args if pos_args and kw_args \
+ else pos_args or kw_args
+ tcode = "assert {0}({1}) == {2}".format(test_case.get('func_name'),
+ args, test_case.get('expected_answer'))
+ test_code += tcode + "\n"
+ return test_code