sum-of-multiples: update tests to v1.5.0 (exercism#1603)

GascaK · cmccandless · commit cb49ef8d8e90 · 2018-12-03T08:09:02.000-05:00
* sum-of-multiples: update tests to v1.5.0 Fixes exercism#1580 * Updated 3 test cases to conform to canonical data (reordered list to fit the ascending order convention) * Updated example to check for ZeroDivisionError * sum-of-multiples: pep8 formatting connotation Small edits to conform to Pep8 standards * sum-of-multiples: pep8 formatting connotation Even smaller updates to conform to pep8 * sum-of_multiples: update import list Change import to link to correct file * sum-of-multiples: update tests to v1.5.0 * Updated test case names to reflect significance of each case. * Updated example.py for brevity * sum-of-multiples: update * Delete blank line
diff --git a/exercises/sum-of-multiples/example.py b/exercises/sum-of-multiples/example.py
@@ -1,4 +1,5 @@
 def sum_of_multiples(limit, multiples):
     return sum(value for value in range(limit)
                if any(value % multiple == 0
-                      for multiple in multiples))
+                      for multiple in multiples
+                      if multiple > 0))
diff --git a/exercises/sum-of-multiples/sum_of_multiples_test.py b/exercises/sum-of-multiples/sum_of_multiples_test.py
@@ -12,48 +12,58 @@
 from sum_of_multiples import sum_of_multiples
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.5.0
 
 class SumOfMultiplesTest(unittest.TestCase):
-    def test_multiples_of_3_or_5_up_to_1(self):
+    def test_multiples_with_no_factors_in_limit(self):
         self.assertEqual(sum_of_multiples(1, [3, 5]), 0)
 
-    def test_multiples_of_3_or_5_up_to_4(self):
+    def test_multiples_of_one_factor_within_limit(self):
         self.assertEqual(sum_of_multiples(4, [3, 5]), 3)
 
-    def test_multiples_of_3_up_to_7(self):
+    def test_various_multiples_in_limit(self):
         self.assertEqual(sum_of_multiples(7, [3]), 9)
 
-    def test_multiples_of_3_or_5_up_to_10(self):
+    def test_various_factors_with_multiples_in_limit(self):
         self.assertEqual(sum_of_multiples(10, [3, 5]), 23)
 
-    def test_multiples_of_3_or_5_up_to_100(self):
+    def test_multiples_counted_only_once(self):
         self.assertEqual(sum_of_multiples(100, [3, 5]), 2318)
 
-    def test_multiples_of_3_or_5_up_to_1000(self):
+    def test_multiples_with_large_limit(self):
         self.assertEqual(sum_of_multiples(1000, [3, 5]), 233168)
 
-    def test_multiples_of_7_13_or_17_up_to_20(self):
+    def test_multiples_with_three_factors(self):
         self.assertEqual(sum_of_multiples(20, [7, 13, 17]), 51)
 
-    def test_multiples_of_4_or_6_up_to_15(self):
+    def test_multiples_with_factors_not_prime(self):
         self.assertEqual(sum_of_multiples(15, [4, 6]), 30)
 
-    def test_multiples_of_5_6_or_8_up_to_150(self):
+    def test_multiples_with_factors_prime_and_not(self):
         self.assertEqual(sum_of_multiples(150, [5, 6, 8]), 4419)
 
-    def test_multiples_of_5_or_25_up_to_51(self):
+    def test_multiples_with_similar_factors(self):
         self.assertEqual(sum_of_multiples(51, [5, 25]), 275)
 
-    def test_multiples_of_43_or_47_up_to_10000(self):
+    def test_multiples_with_large_factors(self):
         self.assertEqual(sum_of_multiples(10000, [43, 47]), 2203160)
 
-    def test_multiples_of_1_up_to_100(self):
+    def test_multiples_of_one_will_be_all(self):
         self.assertEqual(sum_of_multiples(100, [1]), 4950)
 
-    def test_multiples_of_an_empty_list_up_to_10000(self):
+    def test_multiples_of_an_empty_list(self):
         self.assertEqual(sum_of_multiples(10000, []), 0)
 
+    def test_multiples_of_zero_will_be_none(self):
+        self.assertEqual(sum_of_multiples(1, [0]), 0)
+
+    def test_multiples_with_a_zero_factor(self):
+        self.assertEqual(sum_of_multiples(4, [0, 3]), 3)
+
+    def test_multiples_of_several_factors(self):
+        self.assertEqual(sum_of_multiples(10000,
+                         [2, 3, 5, 7, 11]), 39614537)
+
 
 if __name__ == '__main__':
     unittest.main()
