clock: update tests to v2.2.1 (exercism#1324)

mrcfps · cmccandless · commit 0704fa35adce · 2018-02-21T08:41:42.000-06:00
* clock: update tests to v2.2.1

* Test 'subtract' instead of 'add negative'

* clock: add necessary methods to clock in stub

* clock: improve example to pass tests v2.2.1

* clock: fix mistaken test cases

Fix following three tests:
* subtract to previous hour
* subtract more than an hour
* subtract across midnight
diff --git a/exercises/clock/clock.py b/exercises/clock/clock.py
@@ -2,5 +2,14 @@ class Clock(object):
     def __init__(self, hour, minute):
         pass
 
-    def __add__(self, other):
+    def __repr__(self):
+        pass
+
+    def __eq__(self, other):
+        pass
+
+    def __add__(self, minutes):
+        pass
+
+    def __sub__(self, minutes):
         pass
diff --git a/exercises/clock/clock_test.py b/exercises/clock/clock_test.py
@@ -2,8 +2,8 @@
 
 from clock import Clock
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.1
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v2.2.1
 
 class ClockTest(unittest.TestCase):
     # Test creating a new clock with an initial time.
@@ -90,28 +90,28 @@ def test_add_more_than_two_days(self):
         self.assertEqual(str(Clock(1, 1) + 3500), '11:21')
 
     def test_subtract_minutes(self):
-        self.assertEqual(str(Clock(10, 3) + -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) + -3), '10:00')
+        self.assertEqual(str(Clock(10, 3) - 30), '09:33')
 
     def test_subtract_more_than_an_hour(self):
-        self.assertEqual(str(Clock(10, 3) + -30), '09:33')
+        self.assertEqual(str(Clock(10, 3) - 70), '08:53')
 
     def test_subtract_across_midnight(self):
-        self.assertEqual(str(Clock(10, 3) + -70), '08:53')
+        self.assertEqual(str(Clock(0, 3) - 4), '23:59')
 
     def test_subtract_more_than_two_hours(self):
-        self.assertEqual(str(Clock(0, 0) + -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) + -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) + -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) + -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):
diff --git a/exercises/clock/example.py b/exercises/clock/example.py
@@ -1,4 +1,3 @@
-
 class Clock(object):
     'Clock that displays 24 hour clock that rollsover properly'
 
@@ -17,6 +16,10 @@ def __add__(self, minutes):
         self.minute += minutes
         return self.cleanup()
 
+    def __sub__(self, minutes):
+        self.minute -= minutes
+        return self.cleanup()
+
     def cleanup(self):
         self.hour += self.minute // 60
         self.hour %= 24
