diff --git a/exercises/book-store/.meta/template.j2 b/exercises/book-store/.meta/template.j2 index 1802852a488..b7752646771 100644 --- a/exercises/book-store/.meta/template.j2 +++ b/exercises/book-store/.meta/template.j2 @@ -5,9 +5,8 @@ class {{ exercise | camel_case }}Test(unittest.TestCase): {% for casegroup in cases %}{% for case in casegroup["cases"] -%} {%- set input = case["input"] -%} def test_{{ case["description"] | to_snake }}(self): - results = {{ input["basket"] }} - table = {{ case["expected"] }} - self.assertEqual({{ case["property"] }}(results), table) + basket = {{ input["basket"] }} + self.assertEqual({{ case["property"] }}(basket), {{ case["expected"] }}) {% endfor %}{% endfor %} diff --git a/exercises/book-store/book_store_test.py b/exercises/book-store/book_store_test.py index 9bf91b85f90..b993f2969ca 100644 --- a/exercises/book-store/book_store_test.py +++ b/exercises/book-store/book_store_test.py @@ -7,81 +7,66 @@ class BookStoreTest(unittest.TestCase): def test_only_a_single_book(self): - results = [1] - table = 800 - self.assertEqual(total(results), table) + basket = [1] + self.assertEqual(total(basket), 800) def test_two_of_the_same_book(self): - results = [2, 2] - table = 1600 - self.assertEqual(total(results), table) + basket = [2, 2] + self.assertEqual(total(basket), 1600) def test_empty_basket(self): - results = [] - table = 0 - self.assertEqual(total(results), table) + basket = [] + self.assertEqual(total(basket), 0) def test_two_different_books(self): - results = [1, 2] - table = 1520 - self.assertEqual(total(results), table) + basket = [1, 2] + self.assertEqual(total(basket), 1520) def test_three_different_books(self): - results = [1, 2, 3] - table = 2160 - self.assertEqual(total(results), table) + basket = [1, 2, 3] + self.assertEqual(total(basket), 2160) def test_four_different_books(self): - results = [1, 2, 3, 4] - table = 2560 - self.assertEqual(total(results), table) + basket = [1, 2, 3, 4] + self.assertEqual(total(basket), 2560) def test_five_different_books(self): - results = [1, 2, 3, 4, 5] - table = 3000 - self.assertEqual(total(results), table) + basket = [1, 2, 3, 4, 5] + self.assertEqual(total(basket), 3000) def test_two_groups_of_four_is_cheaper_than_group_of_five_plus_group_of_three(self): - results = [1, 1, 2, 2, 3, 3, 4, 5] - table = 5120 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 3, 4, 5] + self.assertEqual(total(basket), 5120) def test_two_groups_of_four_is_cheaper_than_groups_of_five_and_three(self): - results = [1, 1, 2, 3, 4, 4, 5, 5] - table = 5120 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 3, 4, 4, 5, 5] + self.assertEqual(total(basket), 5120) def test_group_of_four_plus_group_of_two_is_cheaper_than_two_groups_of_three(self): - results = [1, 1, 2, 2, 3, 4] - table = 4080 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 4] + self.assertEqual(total(basket), 4080) def test_two_each_of_first_4_books_and_1_copy_each_of_rest(self): - results = [1, 1, 2, 2, 3, 3, 4, 4, 5] - table = 5560 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 3, 4, 4, 5] + self.assertEqual(total(basket), 5560) def test_two_copies_of_each_book(self): - results = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5] - table = 6000 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5] + self.assertEqual(total(basket), 6000) def test_three_copies_of_first_book_and_2_each_of_remaining(self): - results = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1] - table = 6800 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1] + self.assertEqual(total(basket), 6800) def test_three_each_of_first_2_books_and_2_each_of_remaining_books(self): - results = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2] - table = 7520 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2] + self.assertEqual(total(basket), 7520) def test_four_groups_of_four_are_cheaper_than_two_groups_each_of_five_and_three( self ): - results = [1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5] - table = 10240 - self.assertEqual(total(results), table) + basket = [1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5] + self.assertEqual(total(basket), 10240) if __name__ == "__main__":