|
2 | 2 |
|
3 | 3 | from grade_school import School |
4 | 4 |
|
5 | | - |
6 | 5 | # Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.0 |
7 | 6 |
|
| 7 | + |
8 | 8 | class GradeSchoolTest(unittest.TestCase): |
9 | | - def test_adding_student_adds_them_to_sorted_roster(self): |
| 9 | + def test_adding_a_student_adds_them_to_the_sorted_roster(self): |
10 | 10 | school = School() |
11 | | - school.add_student(name='Aimee', grade=2) |
12 | | - expected = ['Aimee'] |
| 11 | + school.add_student(name="Aimee", grade=2) |
| 12 | + expected = ["Aimee"] |
13 | 13 | self.assertEqual(school.roster(), expected) |
14 | 14 |
|
15 | | - def test_adding_more_students_adds_them_to_sorted_roster(self): |
| 15 | + def test_adding_more_student_adds_them_to_the_sorted_roster(self): |
16 | 16 | school = School() |
17 | | - school.add_student(name='Blair', grade=2) |
18 | | - school.add_student(name='James', grade=2) |
19 | | - school.add_student(name='Paul', grade=2) |
20 | | - expected = ['Blair', 'James', 'Paul'] |
| 17 | + school.add_student(name="Blair", grade=2) |
| 18 | + school.add_student(name="James", grade=2) |
| 19 | + school.add_student(name="Paul", grade=2) |
| 20 | + expected = ["Blair", "James", "Paul"] |
21 | 21 | self.assertEqual(school.roster(), expected) |
22 | 22 |
|
23 | | - def test_students_in_different_grades_in_same_roster(self): |
| 23 | + def test_adding_students_to_different_grades_adds_them_to_the_same_sorted_roster( |
| 24 | + self |
| 25 | + ): |
24 | 26 | school = School() |
25 | | - school.add_student(name='Chelsea', grade=3) |
26 | | - school.add_student(name='Logan', grade=7) |
27 | | - expected = ['Chelsea', 'Logan'] |
| 27 | + school.add_student(name="Chelsea", grade=3) |
| 28 | + school.add_student(name="Logan", grade=7) |
| 29 | + expected = ["Chelsea", "Logan"] |
28 | 30 | self.assertEqual(school.roster(), expected) |
29 | 31 |
|
30 | | - def test_roster_returns_empty_list_if_no_students_are_enrolled(self): |
31 | | - self.assertEqual(School().roster(), []) |
| 32 | + def test_roster_returns_an_empty_list_if_there_are_no_students_enrolled(self): |
| 33 | + school = School() |
| 34 | + expected = [] |
| 35 | + self.assertEqual(school.roster(), expected) |
32 | 36 |
|
33 | | - def test_roster_is_sorted_by_grade_then_name(self): |
| 37 | + def test_student_names_with_grades_are_displayed_in_the_same_sorted_roster(self): |
34 | 38 | school = School() |
35 | | - for name, grade in [ |
36 | | - ('Peter', 2), |
37 | | - ('Anna', 1), |
38 | | - ('Barb', 1), |
39 | | - ('Zoe', 2), |
40 | | - ('Alex', 2), |
41 | | - ('Jim', 3), |
42 | | - ('Charlie', 1), |
43 | | - ]: |
44 | | - school.add_student(name, grade) |
45 | | - expected = ['Anna', 'Barb', 'Charlie', 'Alex', 'Peter', 'Zoe', 'Jim'] |
| 39 | + school.add_student(name="Peter", grade=2) |
| 40 | + school.add_student(name="Anna", grade=1) |
| 41 | + school.add_student(name="Barb", grade=1) |
| 42 | + school.add_student(name="Zoe", grade=2) |
| 43 | + school.add_student(name="Alex", grade=2) |
| 44 | + school.add_student(name="Jim", grade=3) |
| 45 | + school.add_student(name="Charlie", grade=1) |
| 46 | + expected = ["Anna", "Barb", "Charlie", "Alex", "Peter", "Zoe", "Jim"] |
46 | 47 | self.assertEqual(school.roster(), expected) |
47 | 48 |
|
48 | | - def test_grade_returns_students_in_that_grade_in_alphabetical_order(self): |
| 49 | + def test_grade_returns_the_students_in_that_grade_in_alphabetical_order(self): |
49 | 50 | school = School() |
50 | | - school.add_student(name='Franklin', grade=5) |
51 | | - school.add_student(name='Bradley', grade=5) |
52 | | - school.add_student(name='Jeff', grade=1) |
53 | | - expected = ['Bradley', 'Franklin'] |
| 51 | + school.add_student(name="Franklin", grade=5) |
| 52 | + school.add_student(name="Bradley", grade=5) |
| 53 | + school.add_student(name="Jeff", grade=1) |
| 54 | + expected = ["Bradley", "Franklin"] |
54 | 55 | self.assertEqual(school.grade(5), expected) |
55 | 56 |
|
56 | | - def test_grade_returns_empty_list_if_no_students_are_in_that_grade(self): |
57 | | - self.assertEqual(School().grade(1), []) |
| 57 | + def test_grade_returns_an_empty_list_if_there_are_no_students_in_that_grade(self): |
| 58 | + school = School() |
| 59 | + expected = [] |
| 60 | + self.assertEqual(school.grade(1), expected) |
58 | 61 |
|
59 | 62 |
|
60 | | -if __name__ == '__main__': |
| 63 | +if __name__ == "__main__": |
61 | 64 | unittest.main() |
0 commit comments