From 5a6237fc92fc57f87fe3f11144e4ade5baa96350 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 22 Sep 2015 12:03:57 +0200 Subject: Update test functions for existing problems The test function is now expected to return a boolean indicating whether the program is correct and a list of hint objects. --- python/problems/while_and_if/buy_five/common.py | 5 ++++- python/problems/while_and_if/competition/common.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'python/problems/while_and_if') diff --git a/python/problems/while_and_if/buy_five/common.py b/python/problems/while_and_if/buy_five/common.py index c7081c2..84be034 100644 --- a/python/problems/while_and_if/buy_five/common.py +++ b/python/problems/while_and_if/buy_five/common.py @@ -53,7 +53,10 @@ def test(python, code): for output, correct in zip(outputs, test_out): if string_almost_equal(output, correct): n_correct += 1 - return n_correct, len(test_in) + + passed = n_correct == len(test_in) + hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}] + return passed, hints def hint(python, code): # run one test first to see if there are any exceptions diff --git a/python/problems/while_and_if/competition/common.py b/python/problems/while_and_if/competition/common.py index 79f7447..4be8b12 100644 --- a/python/problems/while_and_if/competition/common.py +++ b/python/problems/while_and_if/competition/common.py @@ -48,7 +48,10 @@ def test(python, code): for output, correct in zip(outputs, test_out): if string_almost_equal(output, correct): n_correct += 1 - return n_correct, len(test_in) + + passed = n_correct == len(test_in) + hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}] + return passed, hints def hint(python, code): # run one test first to see if there are any exceptions -- cgit v1.2.1