Skip to content

Changed tournament_tests files #1776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmccandless merged 12 commits into from
May 8, 2019
Merged

Changed tournament_tests files #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e8644c
update tournament tests
spencer51324312 May 8, 2019
84137b8
Merge pull request #1 from spencer51324312/spencer51324312-patch-1
spencer51324312 May 8, 2019
00ab1f3
Update Example.py
spencer51324312 May 8, 2019
92b23e2
Updated the thign
spencer51324312 May 8, 2019
f9d8782
Merge pull request #2 from spencer51324312/spencer51324312-patch-1
spencer51324312 May 8, 2019
562daa8
Removed My Comment From File
spencer51324312 May 8, 2019
34dad70
Merge pull request #3 from spencer51324312/spencer51324312-patch-2
spencer51324312 May 8, 2019
4c7271f
Removed My White Space
spencer51324312 May 8, 2019
9f7aa46
Update example.py
spencer51324312 May 8, 2019
dbab68a
Made it so tests now work as they should
spencer51324312 May 8, 2019
2dfb431
Update example.py
spencer51324312 May 8, 2019
0bb524f
Update example.py
spencer51324312 May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions exercises/tournament/example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ def format_table(results):
team_fmt = '{0:30} | {1:2} | {3:2} | {4:2} | {5:2} | {2:2}'
table.append(
team_fmt.format(team, sum(games), calculate_points(games), *games))

return '\n'.join(table)
return table


def tally(data):
table = defaultdict(lambda: [0, 0, 0])

for line in data.split('\n'):
for line in data:
for team, result in parse_game(line):
table[team][result] += 1

Expand Down
136 changes: 68 additions & 68 deletions exercises/tournament/tournament_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,107 +8,107 @@
class TournamentTest(unittest.TestCase):
def test_just_the_header_if_no_input(self):
self.assertEqual(
tally(''),
'Team | MP | W | D | L | P'
tally([]),
['Team | MP | W | D | L | P']
)

def test_a_win_is_three_points_and_a_loss_is_zero_points(self):
results = 'Allegoric Alaskans;Blithering Badgers;win'
table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 1 | 1 | 0 | 0 | 3\n'
'Blithering Badgers | 1 | 0 | 0 | 1 | 0')
results = ['Allegoric Alaskans;Blithering Badgers;win']
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 1 | 1 | 0 | 0 | 3',
'Blithering Badgers | 1 | 0 | 0 | 1 | 0']
self.assertEqual(tally(results), table)

def test_a_win_can_also_be_expressed_as_a_loss(self):
results = 'Blithering Badgers;Allegoric Alaskans;loss'
table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 1 | 1 | 0 | 0 | 3\n'
'Blithering Badgers | 1 | 0 | 0 | 1 | 0')
results = ['Blithering Badgers;Allegoric Alaskans;loss']
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 1 | 1 | 0 | 0 | 3',
'Blithering Badgers | 1 | 0 | 0 | 1 | 0']
self.assertEqual(tally(results), table)

def test_a_different_team_can_win(self):
results = 'Blithering Badgers;Allegoric Alaskans;win'
table = ('Team | MP | W | D | L | P\n'
'Blithering Badgers | 1 | 1 | 0 | 0 | 3\n'
'Allegoric Alaskans | 1 | 0 | 0 | 1 | 0')
results = ['Blithering Badgers;Allegoric Alaskans;win']
table = ['Team | MP | W | D | L | P',
'Blithering Badgers | 1 | 1 | 0 | 0 | 3',
'Allegoric Alaskans | 1 | 0 | 0 | 1 | 0']
self.assertEqual(tally(results), table)

def test_a_draw_is_one_point_each(self):
results = 'Allegoric Alaskans;Blithering Badgers;draw'
table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 1 | 0 | 1 | 0 | 1\n'
'Blithering Badgers | 1 | 0 | 1 | 0 | 1')
results = ['Allegoric Alaskans;Blithering Badgers;draw']
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 1 | 0 | 1 | 0 | 1',
'Blithering Badgers | 1 | 0 | 1 | 0 | 1']
self.assertEqual(tally(results), table)

def test_there_can_be_more_than_one_match(self):
results = ('Allegoric Alaskans;Blithering Badgers;win\n'
'Allegoric Alaskans;Blithering Badgers;win')
table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 2 | 2 | 0 | 0 | 6\n'
'Blithering Badgers | 2 | 0 | 0 | 2 | 0')
results = ['Allegoric Alaskans;Blithering Badgers;win',
'Allegoric Alaskans;Blithering Badgers;win']
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 2 | 2 | 0 | 0 | 6',
'Blithering Badgers | 2 | 0 | 0 | 2 | 0']
self.assertEqual(tally(results), table)

def test_there_can_be_more_than_one_winner(self):
results = ('Allegoric Alaskans;Blithering Badgers;loss\n'
'Allegoric Alaskans;Blithering Badgers;win')
table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 2 | 1 | 0 | 1 | 3\n'
'Blithering Badgers | 2 | 1 | 0 | 1 | 3')
results = ['Allegoric Alaskans;Blithering Badgers;loss',
'Allegoric Alaskans;Blithering Badgers;win']
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 2 | 1 | 0 | 1 | 3',
'Blithering Badgers | 2 | 1 | 0 | 1 | 3']
self.assertEqual(tally(results), table)

def test_there_can_be_more_than_two_teams(self):
results = ('Allegoric Alaskans;Blithering Badgers;win\n'
'Blithering Badgers;Courageous Californians;win\n'
'Courageous Californians;Allegoric Alaskans;loss')
table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 2 | 2 | 0 | 0 | 6\n'
'Blithering Badgers | 2 | 1 | 0 | 1 | 3\n'
'Courageous Californians | 2 | 0 | 0 | 2 | 0')
results = ['Allegoric Alaskans;Blithering Badgers;win',
'Blithering Badgers;Courageous Californians;win',
'Courageous Californians;Allegoric Alaskans;loss']
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 2 | 2 | 0 | 0 | 6',
'Blithering Badgers | 2 | 1 | 0 | 1 | 3',
'Courageous Californians | 2 | 0 | 0 | 2 | 0']
self.assertEqual(tally(results), table)

def test_typical_input(self):
results = ('Allegoric Alaskans;Blithering Badgers;win\n'
'Devastating Donkeys;Courageous Californians;draw\n'
'Devastating Donkeys;Allegoric Alaskans;win\n'
'Courageous Californians;Blithering Badgers;loss\n'
'Blithering Badgers;Devastating Donkeys;loss\n'
'Allegoric Alaskans;Courageous Californians;win')

table = ('Team | MP | W | D | L | P\n'
'Devastating Donkeys | 3 | 2 | 1 | 0 | 7\n'
'Allegoric Alaskans | 3 | 2 | 0 | 1 | 6\n'
'Blithering Badgers | 3 | 1 | 0 | 2 | 3\n'
'Courageous Californians | 3 | 0 | 1 | 2 | 1')
results = ['Allegoric Alaskans;Blithering Badgers;win',
'Devastating Donkeys;Courageous Californians;draw',
'Devastating Donkeys;Allegoric Alaskans;win',
'Courageous Californians;Blithering Badgers;loss',
'Blithering Badgers;Devastating Donkeys;loss',
'Allegoric Alaskans;Courageous Californians;win']

table = ['Team | MP | W | D | L | P',
'Devastating Donkeys | 3 | 2 | 1 | 0 | 7',
'Allegoric Alaskans | 3 | 2 | 0 | 1 | 6',
'Blithering Badgers | 3 | 1 | 0 | 2 | 3',
'Courageous Californians | 3 | 0 | 1 | 2 | 1']

self.assertEqual(tally(results), table)

def test_incomplete_competitionnot_not_all_pairs_have_played(self):
results = ('Allegoric Alaskans;Blithering Badgers;loss\n'
'Devastating Donkeys;Allegoric Alaskans;loss\n'
'Courageous Californians;Blithering Badgers;draw\n'
'Allegoric Alaskans;Courageous Californians;win')
results = ['Allegoric Alaskans;Blithering Badgers;loss',
'Devastating Donkeys;Allegoric Alaskans;loss',
'Courageous Californians;Blithering Badgers;draw',
'Allegoric Alaskans;Courageous Californians;win']

table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 3 | 2 | 0 | 1 | 6\n'
'Blithering Badgers | 2 | 1 | 1 | 0 | 4\n'
'Courageous Californians | 2 | 0 | 1 | 1 | 1\n'
'Devastating Donkeys | 1 | 0 | 0 | 1 | 0')
table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 3 | 2 | 0 | 1 | 6',
'Blithering Badgers | 2 | 1 | 1 | 0 | 4',
'Courageous Californians | 2 | 0 | 1 | 1 | 1',
'Devastating Donkeys | 1 | 0 | 0 | 1 | 0']

self.assertEqual(tally(results), table)

def test_ties_broken_alphabetically(self):
results = ('Courageous Californians;Devastating Donkeys;win\n'
'Allegoric Alaskans;Blithering Badgers;win\n'
'Devastating Donkeys;Allegoric Alaskans;loss\n'
'Courageous Californians;Blithering Badgers;win\n'
'Blithering Badgers;Devastating Donkeys;draw\n'
'Allegoric Alaskans;Courageous Californians;draw')

table = ('Team | MP | W | D | L | P\n'
'Allegoric Alaskans | 3 | 2 | 1 | 0 | 7\n'
'Courageous Californians | 3 | 2 | 1 | 0 | 7\n'
'Blithering Badgers | 3 | 0 | 1 | 2 | 1\n'
'Devastating Donkeys | 3 | 0 | 1 | 2 | 1')
results = ['Courageous Californians;Devastating Donkeys;win',
'Allegoric Alaskans;Blithering Badgers;win',
'Devastating Donkeys;Allegoric Alaskans;loss',
'Courageous Californians;Blithering Badgers;win',
'Blithering Badgers;Devastating Donkeys;draw',
'Allegoric Alaskans;Courageous Californians;draw']

table = ['Team | MP | W | D | L | P',
'Allegoric Alaskans | 3 | 2 | 1 | 0 | 7',
'Courageous Californians | 3 | 2 | 1 | 0 | 7',
'Blithering Badgers | 3 | 0 | 1 | 2 | 1',
'Devastating Donkeys | 3 | 0 | 1 | 2 | 1']

self.assertEqual(tally(results), table)

Expand Down