Skip to content

Commit 3941f61

Browse files
authored
[book-store] update template names (#2173)
Fixes #2172 by updating some variable names to relate to the exercise.
1 parent cc146fa commit 3941f61

File tree

2 files changed

+32
-48
lines changed

2 files changed

+32
-48
lines changed

exercises/book-store/.meta/template.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ class {{ exercise | camel_case }}Test(unittest.TestCase):
55
{% for casegroup in cases %}{% for case in casegroup["cases"] -%}
66
{%- set input = case["input"] -%}
77
def test_{{ case["description"] | to_snake }}(self):
8-
results = {{ input["basket"] }}
9-
table = {{ case["expected"] }}
10-
self.assertEqual({{ case["property"] }}(results), table)
8+
basket = {{ input["basket"] }}
9+
self.assertEqual({{ case["property"] }}(basket), {{ case["expected"] }})
1110

1211
{% endfor %}{% endfor %}
1312

exercises/book-store/book_store_test.py

Lines changed: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,81 +7,66 @@
77

88
class BookStoreTest(unittest.TestCase):
99
def test_only_a_single_book(self):
10-
results = [1]
11-
table = 800
12-
self.assertEqual(total(results), table)
10+
basket = [1]
11+
self.assertEqual(total(basket), 800)
1312

1413
def test_two_of_the_same_book(self):
15-
results = [2, 2]
16-
table = 1600
17-
self.assertEqual(total(results), table)
14+
basket = [2, 2]
15+
self.assertEqual(total(basket), 1600)
1816

1917
def test_empty_basket(self):
20-
results = []
21-
table = 0
22-
self.assertEqual(total(results), table)
18+
basket = []
19+
self.assertEqual(total(basket), 0)
2320

2421
def test_two_different_books(self):
25-
results = [1, 2]
26-
table = 1520
27-
self.assertEqual(total(results), table)
22+
basket = [1, 2]
23+
self.assertEqual(total(basket), 1520)
2824

2925
def test_three_different_books(self):
30-
results = [1, 2, 3]
31-
table = 2160
32-
self.assertEqual(total(results), table)
26+
basket = [1, 2, 3]
27+
self.assertEqual(total(basket), 2160)
3328

3429
def test_four_different_books(self):
35-
results = [1, 2, 3, 4]
36-
table = 2560
37-
self.assertEqual(total(results), table)
30+
basket = [1, 2, 3, 4]
31+
self.assertEqual(total(basket), 2560)
3832

3933
def test_five_different_books(self):
40-
results = [1, 2, 3, 4, 5]
41-
table = 3000
42-
self.assertEqual(total(results), table)
34+
basket = [1, 2, 3, 4, 5]
35+
self.assertEqual(total(basket), 3000)
4336

4437
def test_two_groups_of_four_is_cheaper_than_group_of_five_plus_group_of_three(self):
45-
results = [1, 1, 2, 2, 3, 3, 4, 5]
46-
table = 5120
47-
self.assertEqual(total(results), table)
38+
basket = [1, 1, 2, 2, 3, 3, 4, 5]
39+
self.assertEqual(total(basket), 5120)
4840

4941
def test_two_groups_of_four_is_cheaper_than_groups_of_five_and_three(self):
50-
results = [1, 1, 2, 3, 4, 4, 5, 5]
51-
table = 5120
52-
self.assertEqual(total(results), table)
42+
basket = [1, 1, 2, 3, 4, 4, 5, 5]
43+
self.assertEqual(total(basket), 5120)
5344

5445
def test_group_of_four_plus_group_of_two_is_cheaper_than_two_groups_of_three(self):
55-
results = [1, 1, 2, 2, 3, 4]
56-
table = 4080
57-
self.assertEqual(total(results), table)
46+
basket = [1, 1, 2, 2, 3, 4]
47+
self.assertEqual(total(basket), 4080)
5848

5949
def test_two_each_of_first_4_books_and_1_copy_each_of_rest(self):
60-
results = [1, 1, 2, 2, 3, 3, 4, 4, 5]
61-
table = 5560
62-
self.assertEqual(total(results), table)
50+
basket = [1, 1, 2, 2, 3, 3, 4, 4, 5]
51+
self.assertEqual(total(basket), 5560)
6352

6453
def test_two_copies_of_each_book(self):
65-
results = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5]
66-
table = 6000
67-
self.assertEqual(total(results), table)
54+
basket = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5]
55+
self.assertEqual(total(basket), 6000)
6856

6957
def test_three_copies_of_first_book_and_2_each_of_remaining(self):
70-
results = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1]
71-
table = 6800
72-
self.assertEqual(total(results), table)
58+
basket = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1]
59+
self.assertEqual(total(basket), 6800)
7360

7461
def test_three_each_of_first_2_books_and_2_each_of_remaining_books(self):
75-
results = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2]
76-
table = 7520
77-
self.assertEqual(total(results), table)
62+
basket = [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2]
63+
self.assertEqual(total(basket), 7520)
7864

7965
def test_four_groups_of_four_are_cheaper_than_two_groups_each_of_five_and_three(
8066
self
8167
):
82-
results = [1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5]
83-
table = 10240
84-
self.assertEqual(total(results), table)
68+
basket = [1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5]
69+
self.assertEqual(total(basket), 10240)
8570

8671

8772
if __name__ == "__main__":

0 commit comments

Comments
 (0)