From f1e3bac2dedb453c3fccce4c8328c5a252aff06e Mon Sep 17 00:00:00 2001 From: Stigjb Date: Thu, 23 May 2019 11:21:21 +0200 Subject: [PATCH 1/4] Collatz-conjecture: rename collatz_steps to steps This brings the exercise in line with canonical-data --- exercises/collatz-conjecture/collatz_conjecture.py | 2 +- .../collatz-conjecture/collatz_conjecture_test.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/exercises/collatz-conjecture/collatz_conjecture.py b/exercises/collatz-conjecture/collatz_conjecture.py index 8db473b096..17404248f6 100644 --- a/exercises/collatz-conjecture/collatz_conjecture.py +++ b/exercises/collatz-conjecture/collatz_conjecture.py @@ -1,2 +1,2 @@ -def collatz_steps(number): +def steps(number): pass diff --git a/exercises/collatz-conjecture/collatz_conjecture_test.py b/exercises/collatz-conjecture/collatz_conjecture_test.py index 3ad09b19f0..5b1d91ff05 100644 --- a/exercises/collatz-conjecture/collatz_conjecture_test.py +++ b/exercises/collatz-conjecture/collatz_conjecture_test.py @@ -1,6 +1,6 @@ import unittest -from collatz_conjecture import collatz_steps +from collatz_conjecture import steps # Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.1 @@ -8,24 +8,24 @@ class CollatzConjectureTest(unittest.TestCase): def test_zero_steps_for_one(self): - self.assertEqual(collatz_steps(1), 0) + self.assertEqual(steps(1), 0) def test_divide_if_even(self): - self.assertEqual(collatz_steps(16), 4) + self.assertEqual(steps(16), 4) def test_even_and_odd_steps(self): - self.assertEqual(collatz_steps(12), 9) + self.assertEqual(steps(12), 9) def test_large_number_of_even_and_odd_steps(self): - self.assertEqual(collatz_steps(1000000), 152) + self.assertEqual(steps(1000000), 152) def test_zero_is_invalid_input(self): with self.assertRaisesWithMessage(ValueError): - collatz_steps(0) + steps(0) def test_negative_number_is_invalid_input(self): with self.assertRaisesWithMessage(ValueError): - collatz_steps(-15) + steps(-15) # Utility functions def setUp(self): From d159689d5ed5b5cc60f29a55c4c63f16f9cae73f Mon Sep 17 00:00:00 2001 From: Stigjb Date: Thu, 23 May 2019 11:22:38 +0200 Subject: [PATCH 2/4] Collatz-conjecture: format with Black --- exercises/collatz-conjecture/collatz_conjecture_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/collatz-conjecture/collatz_conjecture_test.py b/exercises/collatz-conjecture/collatz_conjecture_test.py index 5b1d91ff05..7b35d30a03 100644 --- a/exercises/collatz-conjecture/collatz_conjecture_test.py +++ b/exercises/collatz-conjecture/collatz_conjecture_test.py @@ -5,8 +5,8 @@ # Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.1 -class CollatzConjectureTest(unittest.TestCase): +class CollatzConjectureTest(unittest.TestCase): def test_zero_steps_for_one(self): self.assertEqual(steps(1), 0) @@ -38,5 +38,5 @@ def assertRaisesWithMessage(self, exception): return self.assertRaisesRegex(exception, r".+") -if __name__ == '__main__': +if __name__ == "__main__": unittest.main() From da757f8c88b2531f9b337bd8f731eced17d2d92d Mon Sep 17 00:00:00 2001 From: Stigjb Date: Thu, 23 May 2019 11:27:16 +0200 Subject: [PATCH 3/4] Collatz-conjecture: Updated function name in ex --- exercises/collatz-conjecture/example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/collatz-conjecture/example.py b/exercises/collatz-conjecture/example.py index 181b6cf735..b784225600 100644 --- a/exercises/collatz-conjecture/example.py +++ b/exercises/collatz-conjecture/example.py @@ -1,4 +1,4 @@ -def collatz_steps(n): +def steps(n): if n <= 0: raise ValueError("input should be positive") From 0b01a815cb8ecd0aca9faacdd8fea330a924fe66 Mon Sep 17 00:00:00 2001 From: Stigjb Date: Thu, 23 May 2019 11:38:17 +0200 Subject: [PATCH 4/4] collatz-conjecture: Update test descriptions --- exercises/collatz-conjecture/collatz_conjecture_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/collatz-conjecture/collatz_conjecture_test.py b/exercises/collatz-conjecture/collatz_conjecture_test.py index 7b35d30a03..690bf7eb09 100644 --- a/exercises/collatz-conjecture/collatz_conjecture_test.py +++ b/exercises/collatz-conjecture/collatz_conjecture_test.py @@ -19,11 +19,11 @@ def test_even_and_odd_steps(self): def test_large_number_of_even_and_odd_steps(self): self.assertEqual(steps(1000000), 152) - def test_zero_is_invalid_input(self): + def test_zero_is_an_error(self): with self.assertRaisesWithMessage(ValueError): steps(0) - def test_negative_number_is_invalid_input(self): + def test_negative_value_is_an_error(self): with self.assertRaisesWithMessage(ValueError): steps(-15)