trackler 2.2.1.107 → 2.2.1.108

data/tracks/python/exercises/clock/clock_test.py

@@ -2,8 +2,8 @@ import unittest
 
 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 @@ class ClockTest(unittest.TestCase):
         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):

data/tracks/python/exercises/clock/example.py

@@ -1,4 +1,3 @@
-
 class Clock(object):
     'Clock that displays 24 hour clock that rollsover properly'
 
@@ -17,6 +16,10 @@ class Clock(object):
         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

data/tracks/python/exercises/collatz-conjecture/collatz_conjecture_test.py

@@ -2,8 +2,8 @@ import unittest
 
 from collatz_conjecture import collatz_steps
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.1
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0
 
 class CollatzConjectureTests(unittest.TestCase):
 
@@ -20,12 +20,22 @@ class CollatzConjectureTests(unittest.TestCase):
         self.assertEqual(collatz_steps(1000000), 152)
 
     def test_zero_is_invalid_input(self):
-        self.assertEqual(collatz_steps(0), None)
+        with self.assertRaisesWithMessage(ValueError):
+            collatz_steps(0)
 
     def test_negative_number_is_invalid_input(self):
-        self.assertEqual(collatz_steps(-1), None)
-
-        self.assertEqual(collatz_steps(-15), None)
+        with self.assertRaisesWithMessage(ValueError):
+            collatz_steps(-15)
+
+    # Utility functions
+    def setUp(self):
+        try:
+            self.assertRaisesRegex
+        except AttributeError:
+            self.assertRaisesRegex = self.assertRaisesRegexp
+
+    def assertRaisesWithMessage(self, exception):
+        return self.assertRaisesRegex(exception, r".+")
 
 
 if __name__ == '__main__':

data/tracks/python/exercises/collatz-conjecture/example.py

@@ -1,6 +1,6 @@
 def collatz_steps(n):
     if n <= 0:
-        return
+        raise ValueError("input should be positive")
 
     step_count = 0
     while n > 1:

data/tracks/python/exercises/complex-numbers/complex_numbers_test.py

@@ -7,11 +7,40 @@ import math
 from complex_numbers import ComplexNumber
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.0
-
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.3.0
 
 class ComplexNumbersTest(unittest.TestCase):
 
+    def test_real_part_of_a_purely_real_number(self):
+        input_number = ComplexNumber(1, 0)
+        self.assertEqual(input_number.real, 1)
+
+    def test_real_part_of_a_purely_imaginary_number(self):
+        input_number = ComplexNumber(0, 1)
+        self.assertEqual(input_number.real, 0)
+
+    def test_real_part_of_a_number_with_real_and_imaginary_part(self):
+        input_number = ComplexNumber(1, 2)
+        self.assertEqual(input_number.real, 1)
+
+    def test_imaginary_part_of_a_purely_real_number(self):
+        input_number = ComplexNumber(1, 0)
+        self.assertEqual(input_number.imaginary, 0)
+
+    def test_imaginary_part_of_a_purely_imaginary_number(self):
+        input_number = ComplexNumber(0, 1)
+        self.assertEqual(input_number.imaginary, 1)
+
+    def test_imaginary_part_of_a_number_with_real_and_imaginary_part(self):
+        input_number = ComplexNumber(1, 2)
+        self.assertEqual(input_number.imaginary, 2)
+
+    def test_imaginary_unit(self):
+        first_input = ComplexNumber(0, 1)
+        second_input = ComplexNumber(0, 1)
+        expected = ComplexNumber(-1, 0)
+        self.assertEqual(first_input * second_input, expected)
+
     def test_add_purely_real_numbers(self):
         first_input = ComplexNumber(1, 0)
         second_input = ComplexNumber(2, 0)
@@ -120,30 +149,6 @@ class ComplexNumbersTest(unittest.TestCase):
         self.assertEqual(input_number.conjugate().imaginary,
                          expected.imaginary)
 
-    def test_real_part_of_a_purely_real_number(self):
-        input_number = ComplexNumber(1, 0)
-        self.assertEqual(input_number.real, 1)
-
-    def test_real_part_of_a_purely_imaginary_number(self):
-        input_number = ComplexNumber(0, 1)
-        self.assertEqual(input_number.real, 0)
-
-    def test_real_part_of_a_number_with_real_and_imaginary_part(self):
-        input_number = ComplexNumber(1, 2)
-        self.assertEqual(input_number.real, 1)
-
-    def test_imaginary_part_of_a_purely_real_number(self):
-        input_number = ComplexNumber(1, 0)
-        self.assertEqual(input_number.imaginary, 0)
-
-    def test_imaginary_part_of_a_purely_imaginary_number(self):
-        input_number = ComplexNumber(0, 1)
-        self.assertEqual(input_number.imaginary, 1)
-
-    def test_imaginary_part_of_a_number_with_real_and_imaginary_part(self):
-        input_number = ComplexNumber(1, 2)
-        self.assertEqual(input_number.imaginary, 2)
-
     def test_eulers_identity_formula(self):
         input_number = ComplexNumber(0, math.pi)
         expected = ComplexNumber(-1, 0)
@@ -162,6 +167,12 @@ class ComplexNumbersTest(unittest.TestCase):
         self.assertEqual(input_number.exp().real, expected.real)
         self.assertEqual(input_number.exp().imaginary, expected.imaginary)
 
+    def test_exponential_of_a_number_with_real_and_imaginary_part(self):
+        input_number = ComplexNumber(math.log(2), math.pi)
+        expected = ComplexNumber(-2, 0)
+        self.assertEqual(input_number.exp().real, expected.real)
+        self.assertEqual(input_number.exp().imaginary, expected.imaginary)
+
 
 if __name__ == '__main__':
     unittest.main()

data/tracks/python/exercises/custom-set/custom_set_test.py

@@ -3,7 +3,7 @@ import unittest
 from custom_set import CustomSet
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.3.0
 
 class CustomSetTest(unittest.TestCase):
     def test_sets_with_no_elements_are_empty(self):

data/tracks/python/exercises/diamond/diamond_test.py

@@ -3,7 +3,7 @@ import unittest
 from diamond import make_diamond
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.0
 
 class DiamondTests(unittest.TestCase):
     def test_degenerate_case_with_a_single_row(self):

data/tracks/python/exercises/dominoes/dominoes_test.py

@@ -3,7 +3,7 @@ import unittest
 from dominoes import chain
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v2.0.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v2.1.0
 
 class DominoesTest(unittest.TestCase):
     def test_empty_input_empty_output(self):

data/tracks/python/exercises/forth/forth_test.py

@@ -3,7 +3,7 @@ import unittest
 from forth import evaluate, StackUnderflowError
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.4.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.5.0
 # Tests for case-insensitivity are track-specific
 
 class ForthParsingTest(unittest.TestCase):

data/tracks/python/exercises/house/example.py

@@ -17,8 +17,16 @@ def verse(verse_num):
     v.extend(['that {0} {1}'.format(parts[i][0], parts[i][1])
               for i in range(verse_num - 1, -1, -1)])
     v[-1] += '.'
-    return '\n'.join(v)
+    return v
 
 
-def rhyme():
-    return "\n\n".join(verse(n) for n in range(len(parts)))
+def recite(start_verse, end_verse):
+    if start_verse == end_verse:
+        return verse(start_verse - 1)
+    else:
+        result = []
+        for verse_num in range(start_verse-1, end_verse):
+            result.extend(verse(verse_num))
+            result.append("")
+        result.pop()
+        return result

data/tracks/python/exercises/house/house.py

@@ -1,6 +1,2 @@
-def verse(verse_num):
-    pass
-
-
-def rhyme():
+def recite(start_verse, end_verse):
     pass

data/tracks/python/exercises/house/house_test.py

@@ -2,127 +2,280 @@
 
 import unittest
 
-from house import rhyme, verse
+from house import recite
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v2.1.0
+
 class VerseTest(unittest.TestCase):
-    def test_verse_0(self):
-        expected = 'This is the house that Jack built.'
-        self.assertEqual(verse(0), expected)
-
-    def test_verse_1(self):
-        expected = 'This is the malt\n'\
-                   'that lay in the house that Jack built.'
-        self.assertEqual(verse(1), expected)
-
-    def test_verse_2(self):
-        expected = 'This is the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.'
-        self.assertEqual(verse(2), expected)
-
-    def test_verse_3(self):
-        expected = 'This is the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.'
-        self.assertEqual(verse(3), expected)
+    def test_verse_one(self):
+        expected = ["This is the house that Jack built."]
+        self.assertEqual(recite(1, 1), expected)
+
+    def test_verse_two(self):
+        expected = [
+            "This is the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(2, 2), expected)
+
+    def test_verse_three(self):
+        expected = [
+            "This is the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(3, 3), expected)
+
+    def test_verse_four(self):
+        expected = [
+            "This is the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(4, 4), expected)
+
+    def test_verse_five(self):
+        expected = [
+            "This is the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(5, 5), expected)
+
+    def test_verse_six(self):
+        expected = [
+            "This is the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(6, 6), expected)
+
+    def test_verse_seven(self):
+        expected = [
+            "This is the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(7, 7), expected)
+
+    def test_verse_eight(self):
+        expected = [
+            "This is the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(8, 8), expected)
+
+    def test_verse_nine(self):
+        expected = [
+            "This is the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(9, 9), expected)
+
+    def test_verse_10(self):
+        expected = [
+            "This is the rooster that crowed in the morn",
+            "that woke the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(10, 10), expected)
 
     def test_verse_11(self):
-        expected = 'This is the horse and the hound and the horn\n'\
-                   'that belonged to the farmer sowing his corn\n'\
-                   'that kept the rooster that crowed in the morn\n'\
-                   'that woke the priest all shaven and shorn\n'\
-                   'that married the man all tattered and torn\n'\
-                   'that kissed the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.'
-        self.assertEqual(verse(11), expected)
-
-    def test_rhyme(self):
-        expected = 'This is the house that Jack built.\n\n'\
-                   'This is the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the man all tattered and torn\n'\
-                   'that kissed the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the priest all shaven and shorn\n'\
-                   'that married the man all tattered and torn\n'\
-                   'that kissed the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the rooster that crowed in the morn\n'\
-                   'that woke the priest all shaven and shorn\n'\
-                   'that married the man all tattered and torn\n'\
-                   'that kissed the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the farmer sowing his corn\n'\
-                   'that kept the rooster that crowed in the morn\n'\
-                   'that woke the priest all shaven and shorn\n'\
-                   'that married the man all tattered and torn\n'\
-                   'that kissed the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.\n\n'\
-                   'This is the horse and the hound and the horn\n'\
-                   'that belonged to the farmer sowing his corn\n'\
-                   'that kept the rooster that crowed in the morn\n'\
-                   'that woke the priest all shaven and shorn\n'\
-                   'that married the man all tattered and torn\n'\
-                   'that kissed the maiden all forlorn\n'\
-                   'that milked the cow with the crumpled horn\n'\
-                   'that tossed the dog\n'\
-                   'that worried the cat\n'\
-                   'that killed the rat\n'\
-                   'that ate the malt\n'\
-                   'that lay in the house that Jack built.'
-        self.assertEqual(rhyme(), expected)
+        expected = [
+            "This is the farmer sowing his corn",
+            "that kept the rooster that crowed in the morn",
+            "that woke the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(11, 11), expected)
+
+    def test_verse_12(self):
+        expected = [
+            "This is the horse and the hound and the horn",
+            "that belonged to the farmer sowing his corn",
+            "that kept the rooster that crowed in the morn",
+            "that woke the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(12, 12), expected)
+
+    def test_multiple_verses(self):
+        expected = [
+            "This is the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(4, 8), expected)
+
+    def test_full_rhyme(self):
+        expected = [
+            "This is the house that Jack built.",
+            "",
+            "This is the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the rooster that crowed in the morn",
+            "that woke the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the farmer sowing his corn",
+            "that kept the rooster that crowed in the morn",
+            "that woke the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+            "",
+            "This is the horse and the hound and the horn",
+            "that belonged to the farmer sowing his corn",
+            "that kept the rooster that crowed in the morn",
+            "that woke the priest all shaven and shorn",
+            "that married the man all tattered and torn",
+            "that kissed the maiden all forlorn",
+            "that milked the cow with the crumpled horn",
+            "that tossed the dog",
+            "that worried the cat",
+            "that killed the rat",
+            "that ate the malt",
+            "that lay in the house that Jack built.",
+        ]
+        self.assertEqual(recite(1, 12), expected)
 
 
 if __name__ == '__main__':