summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--yaksh/evaluator_tests/test_bash_evaluation.py1
-rw-r--r--yaksh/evaluator_tests/test_c_cpp_evaluation.py1
-rw-r--r--yaksh/evaluator_tests/test_java_evaluation.py1
-rw-r--r--yaksh/models.py9
-rw-r--r--yaksh/stdio_evaluator.py11
-rw-r--r--yaksh/templates/yaksh/question.html4
-rw-r--r--yaksh/templates/yaksh/showquestions.html2
-rw-r--r--yaksh/templates/yaksh/user_data.html14
-rw-r--r--yaksh/templates/yaksh/view_answerpaper.html12
-rw-r--r--yaksh/test_models.py48
10 files changed, 78 insertions, 25 deletions
diff --git a/yaksh/evaluator_tests/test_bash_evaluation.py b/yaksh/evaluator_tests/test_bash_evaluation.py
index 6e7410e..2faa7bf 100644
--- a/yaksh/evaluator_tests/test_bash_evaluation.py
+++ b/yaksh/evaluator_tests/test_bash_evaluation.py
@@ -255,7 +255,6 @@ class BashStdIOEvaluationTestCases(EvaluatorBaseTest):
"""
)
test_case_data = [{'expected_output': '10',
- 'expected_input': '',
'test_case_type': 'stdiobasedtestcase',
'weight': 0.0
}]
diff --git a/yaksh/evaluator_tests/test_c_cpp_evaluation.py b/yaksh/evaluator_tests/test_c_cpp_evaluation.py
index 5ff4e4c..0898b3f 100644
--- a/yaksh/evaluator_tests/test_c_cpp_evaluation.py
+++ b/yaksh/evaluator_tests/test_c_cpp_evaluation.py
@@ -415,7 +415,6 @@ class CppStdIOEvaluationTestCases(EvaluatorBaseTest):
def test_only_stdout(self):
# Given
self.test_case_data = [{'expected_output': '11',
- 'expected_input': '',
'weight': 0.0,
'test_case_type': 'stdiobasedtestcase',
}]
diff --git a/yaksh/evaluator_tests/test_java_evaluation.py b/yaksh/evaluator_tests/test_java_evaluation.py
index c733586..5ddf8cd 100644
--- a/yaksh/evaluator_tests/test_java_evaluation.py
+++ b/yaksh/evaluator_tests/test_java_evaluation.py
@@ -414,7 +414,6 @@ class JavaStdIOEvaluationTestCases(EvaluatorBaseTest):
def test_only_stdout(self):
# Given
self.test_case_data = [{'expected_output': '11',
- 'expected_input': '',
'test_case_type': 'stdiobasedtestcase',
'weight': 0.0
}]
diff --git a/yaksh/models.py b/yaksh/models.py
index 787daa6..f7d9906 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -420,9 +420,11 @@ class Question(models.Model):
msg = "Questions Uploaded Successfully"
for question in questions:
question['user'] = user
- file_names = question.pop('files')
+ file_names = question.pop('files') \
+ if 'files' in question \
+ else None
+ tags = question.pop('tags') if 'tags' in question else None
test_cases = question.pop('testcase')
- tags = question.pop('tags')
que, result = Question.objects.get_or_create(**question)
if file_names:
que._add_files_to_db(file_names, file_path)
@@ -923,7 +925,6 @@ class QuestionPaper(models.Model):
def create_demo_quiz_ppr(self, demo_quiz, user):
question_paper = QuestionPaper.objects.create(quiz=demo_quiz,
- total_marks=6.0,
shuffle_questions=False
)
summaries = ['Roots of quadratic equation', 'Print Output',
@@ -939,6 +940,8 @@ class QuestionPaper(models.Model):
question_paper.save()
# add fixed set of questions to the question paper
question_paper.fixed_questions.add(*questions)
+ question_paper.update_total_marks()
+ question_paper.save()
def get_ordered_questions(self):
ques = []
diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py
index 932ae7e..5e4ce18 100644
--- a/yaksh/stdio_evaluator.py
+++ b/yaksh/stdio_evaluator.py
@@ -11,10 +11,15 @@ from .compare_stdio import compare_outputs
class StdIOEvaluator(BaseEvaluator):
def evaluate_stdio(self, user_answer, proc, expected_input, expected_output):
success = False
- ip = expected_input.replace(",", " ")
- encoded_input = '{0}\n'.format(ip).encode('utf-8')
try:
- user_output_bytes, output_err_bytes = proc.communicate(encoded_input)
+ if expected_input:
+ ip = expected_input.replace(",", " ")
+ encoded_input = '{0}\n'.format(ip).encode('utf-8')
+ user_output_bytes, output_err_bytes = proc.communicate(
+ encoded_input
+ )
+ else:
+ user_output_bytes, output_err_bytes = proc.communicate()
user_output = user_output_bytes.decode('utf-8')
output_err = output_err_bytes.decode('utf-8')
except TimeoutException:
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 1e1f38f..fa69b76 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -184,11 +184,11 @@ lang = "{{ question.language }}"
{% if question.type == "mcc" %}
{% for test_case in test_cases %}
{% if last_attempt and test_case.id|safe in last_attempt|safe %}
- <input name="answer" type="checkbox" value="{{ test_case.id }}" checked/> {{ test_case.options }}
+ <input name="answer" type="checkbox" value="{{ test_case.id }}" checked/> {{ test_case.options| safe }}
<br>
{% else %}
<input name="answer" type="checkbox" value="{{ test_case.id }}">
- {{ test_case.options}}
+ {{ test_case.options| safe }}
<br/>
{% endif %}
{% endfor %}
diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index a8983bd..4240b2e 100644
--- a/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
@@ -18,7 +18,7 @@
<li><a href="#updown" data-toggle="pill" > Upload and Download Questions</a></li>
</ul>
</div>
-<div class="tab-content">
+<div class="tab-content col-md-9 col-md-offset-2 main">
<!-- Upload Questions -->
<div id="updown" class="tab-pane fade">
<a class="btn btn-primary" href="{{URL_ROOT}}/exam/manage/courses/download_yaml_template/"> Download Template</a>
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 31a023d..6dfaac3 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -78,7 +78,8 @@ User IP address: {{ paper.user_ip }}
{% endif %}
{% endfor %}
- {% elif question.type == "integer" or "string" or "float" %}
+ {% elif question.type == "integer" or question.type == "string"
+ or question.type == "float" %}
<h5> <u>Correct Answer:</u></h5>
{% for testcase in question.get_test_cases %}
<strong>{{ testcase.correct|safe }}</strong>
@@ -96,15 +97,14 @@ User IP address: {{ paper.user_ip }}
{% if question.type != "code" %}
{% if "Correct answer" in answers.0.error_list %}
<div class="panel panel-success">
+ <div class="panel-heading"><strong>Correct</strong></div>
{% else %}
<div class="panel panel-danger">
+ <div class="panel-heading"><strong> Incorrect</strong></div>
{% endif %}
- <div class="panel-heading">
- Autocheck: {{ answers.0.error_list.0 }}
- </div>
<div class="panel-body">
<h5><u>Student answer:</u></h5>
- {% if question.type == "mcc"%}
+ {% if question.type == "mcc"%}
<div class="well well-sm">
{% for testcases in question.get_test_cases %}
{%if testcases.id|stringformat:"i" in answers.0.answer|safe %}
@@ -124,9 +124,9 @@ User IP address: {{ paper.user_ip }}
<div class="well well-sm">
{{ answers.0.answer|safe }}
</div>
- </div>
- </div>
{% endif %}
+ </div>
+ </div>
{% else %}
<h5>Student answer: </h5>
{% for answer in answers %}
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 850d789..79987b1 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -79,7 +79,7 @@
<div class="panel panel-danger">
{% endif %}
<div class="panel-heading">
- Autocheck: {{ answers.0.error_list.0 }}
+ <strong>{{ answers.0.error_list.0 }}</strong>
</div>
<div class="panel-body">
{% if question.type == "mcc"%}
@@ -117,12 +117,18 @@
<h5>Student answer: </h5>
{% for answer in answers %}
{% if not answer.skipped %}
- {% if "Correct answer" in answer.error %}
+ {% if answer.answer.correct %}
<div class="panel panel-success">
+ <div class="panel-heading">
+ <strong>Correct Answer</strong>
+ </div>
{% else %}
<div class="panel panel-danger">
+ <div class="panel-heading">
+ <strong>Incorrect Answer</strong>
+ </div>
{% endif %}
- <div class="panel-heading">Error:</div>
+
{% with answer.error_list as err %}
{% for error in err %}
{% if not error.expected_output %}
diff --git a/yaksh/test_models.py b/yaksh/test_models.py
index 00506cd..ea0cfca 100644
--- a/yaksh/test_models.py
+++ b/yaksh/test_models.py
@@ -163,7 +163,20 @@ class QuestionTestCases(unittest.TestCase):
"summary": "Yaml Demo",
"tags": ['yaml_demo']
}]
+ questions_data_with_missing_fields = [{"active": True,
+ "points": 1.0,
+ "description":\
+ "factorial of a no",
+ "language": "Python",
+ "type": "Code",
+ "testcase":\
+ self.test_case_upload_data,
+ "summary": "Yaml Demo 2"
+ }]
self.yaml_questions_data = yaml.safe_dump_all(questions_data)
+ self.yaml_questions_data_with_missing_fields = yaml.safe_dump_all(
+ questions_data_with_missing_fields
+ )
def tearDown(self):
shutil.rmtree(self.load_tmp_path)
@@ -213,12 +226,15 @@ class QuestionTestCases(unittest.TestCase):
self.assertEqual(self.question2.points, q['points'])
self.assertTrue(self.question2.active)
self.assertEqual(self.question2.snippet, q['snippet'])
- self.assertEqual(os.path.basename(que_file.file.path), q['files'][0][0])
- self.assertEqual([case.get_field_value() for case in test_case], q['testcase'])
+ self.assertEqual(os.path.basename(que_file.file.path),
+ q['files'][0][0])
+ self.assertEqual([case.get_field_value() for case in test_case],
+ q['testcase']
+ )
for file in zip_file.namelist():
os.remove(os.path.join(tmp_path, file))
- def test_load_questions(self):
+ def test_load_questions_with_all_fields(self):
""" Test load questions into database from Yaml """
question = Question()
result = question.load_questions(self.yaml_questions_data, self.user1)
@@ -231,12 +247,38 @@ class QuestionTestCases(unittest.TestCase):
self.assertEqual(question_data.description, 'factorial of a no')
self.assertEqual(question_data.points, 1.0)
self.assertTrue(question_data.active)
+ tags = question_data.tags.all().values_list("name",flat=True)
+ self.assertListEqual(list(tags), ['yaml_demo'])
self.assertEqual(question_data.snippet, 'def fact()')
self.assertEqual(os.path.basename(file.file.path), "test.txt")
self.assertEqual([case.get_field_value() for case in test_case],
self.test_case_upload_data
)
+ def test_load_questions_with_missing_fields(self):
+ """ Test load questions into database from Yaml with
+ missing fields like files, snippet and tags. """
+ question = Question()
+ result = question.load_questions(
+ self.yaml_questions_data_with_missing_fields,
+ self.user1
+ )
+ question_data = Question.objects.get(summary="Yaml Demo 2")
+ file = FileUpload.objects.filter(question=question_data)
+ test_case = question_data.get_test_cases()
+ self.assertEqual(question_data.summary,'Yaml Demo 2')
+ self.assertEqual(question_data.language,'Python')
+ self.assertEqual(question_data.type, 'Code')
+ self.assertEqual(question_data.description,'factorial of a no')
+ self.assertEqual(question_data.points, 1.0)
+ self.assertTrue(question_data.active)
+ self.assertEqual(question_data.snippet,'')
+ self.assertListEqual(list(file),[])
+ self.assertEqual([case.get_field_value() for case in test_case],
+ self.test_case_upload_data
+ )
+ tags = question_data.tags.all().values_list("name",flat=True)
+ self.assertListEqual(list(tags), [])
###############################################################################
class QuizTestCases(unittest.TestCase):
generated by cgit (git 2.34.1) at 2024-12-22 05:05:55 +0000