Use generated test cases instead of manual list

pganssle · pganssle · commit 3307865cb634 · 2019-04-29T08:00:27.000-04:00
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
@@ -1848,18 +1848,23 @@ def test_fromisocalendar_value_errors(self):
                     self.theclass.fromisocalendar(*isocal)
 
     def test_fromisocalendar_type_errors(self):
-        isocals = [
-            ("2019", 1, 1),
-            (2019, "1", 1),
-            (2019, 1, "1"),
-            (None, 1, 1),
-            (2019, None, 1),
-            (2019, 1, None),
-            (2019.0, 1, 1),
-            (2019, 1.0, 1),
-            (2019, 1, 1.0),
+        err_txformers = [
+            str,
+            float,
+            lambda x: None,
         ]
 
+        # Take a valid base tuple and transform it to contain one argument
+        # with the wrong type. Repeat this for each argument, e.g.
+        # [("2019", 1, 1), (2019, "1", 1), (2019, 1, "1"), ...]
+        isocals = []
+        base = (2019, 1, 1)
+        for i in range(3):
+            for txformer in err_txformers:
+                err_val = list(base)
+                err_val[i] = txformer(err_val[i])
+                isocals.append(tuple(err_val))
+
         for isocal in isocals:
             with self.subTest(isocal=isocal):
                 with self.assertRaises(TypeError):
