Skip to content

clock: Replace Clock.add() with operator Clock.__add__() #728

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
ilya-khadykin merged 2 commits into from
Oct 21, 2017
Merged

clock: Replace Clock.add() with operator Clock.__add__() #728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c769d90
clock: Replace Clock.add() with operator Clock.__add__()
cmccandless Oct 6, 2017
bb64899
add magic method to solution template
cmccandless Oct 21, 2017
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
32 changes: 16 additions & 16 deletions exercises/clock/clock_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,52 +64,52 @@ def test_negative_hour_and_minutes_both_roll_over_continuously(self):

# Test adding and subtracting minutes.
def test_add_minutes(self):
self.assertEqual(str(Clock(10, 0).add(3)), '10:03')
self.assertEqual(str(Clock(10, 0) + 3), '10:03')

def test_add_no_minutes(self):
self.assertEqual(str(Clock(6, 41).add(0)), '06:41')
self.assertEqual(str(Clock(6, 41) + 0), '06:41')

def test_add_to_next_hour(self):
self.assertEqual(str(Clock(0, 45).add(40)), '01:25')
self.assertEqual(str(Clock(0, 45) + 40), '01:25')

def test_add_more_than_one_hour(self):
self.assertEqual(str(Clock(10, 0).add(61)), '11:01')
self.assertEqual(str(Clock(10, 0) + 61), '11:01')

def test_add_more_than_two_hours_with_carry(self):
self.assertEqual(str(Clock(0, 45).add(160)), '03:25')
self.assertEqual(str(Clock(0, 45) + 160), '03:25')

def test_add_across_midnight(self):
self.assertEqual(str(Clock(23, 59).add(2)), '00:01')
self.assertEqual(str(Clock(23, 59) + 2), '00:01')

def test_add_more_than_one_day(self):
self.assertEqual(str(Clock(5, 32).add(1500)), '06:32')
self.assertEqual(str(Clock(5, 32) + 1500), '06:32')

def test_add_more_than_two_days(self):
self.assertEqual(str(Clock(1, 1).add(3500)), '11:21')
self.assertEqual(str(Clock(1, 1) + 3500), '11:21')

def test_subtract_minutes(self):
self.assertEqual(str(Clock(10, 3).add(-3)), '10:00')
self.assertEqual(str(Clock(10, 3) + -3), '10:00')

def test_subtract_to_previous_hour(self):
self.assertEqual(str(Clock(10, 3).add(-3)), '10:00')
self.assertEqual(str(Clock(10, 3) + -3), '10:00')

def test_subtract_more_than_an_hour(self):
self.assertEqual(str(Clock(10, 3).add(-30)), '09:33')
self.assertEqual(str(Clock(10, 3) + -30), '09:33')

def test_subtract_across_midnight(self):
self.assertEqual(str(Clock(10, 3).add(-70)), '08:53')
self.assertEqual(str(Clock(10, 3) + -70), '08:53')

def test_subtract_more_than_two_hours(self):
self.assertEqual(str(Clock(0, 0).add(-160)), '21:20')
self.assertEqual(str(Clock(0, 0) + -160), '21:20')

def test_subtract_more_than_two_hours_with_borrow(self):
self.assertEqual(str(Clock(6, 15).add(-160)), '03:35')
self.assertEqual(str(Clock(6, 15) + -160), '03:35')

def test_subtract_more_than_one_day(self):
self.assertEqual(str(Clock(5, 32).add(-1500)), '04:32')
self.assertEqual(str(Clock(5, 32) + -1500), '04:32')

def test_subtract_more_than_two_days(self):
self.assertEqual(str(Clock(2, 20).add(-3000)), '00:20')
self.assertEqual(str(Clock(2, 20) + -3000), '00:20')

# Construct two separate clocks, set times, test if they are equal.
def test_clocks_with_same_time(self):
Expand Down
2 changes: 1 addition & 1 deletion exercises/clock/example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __repr__(self):
def __eq__(self, other):
return repr(self) == repr(other)

def add(self, minutes):
def __add__(self, minutes):
self.minute += minutes
return self.cleanup()

Expand Down