Make code simpler

Author: kwj

python/tests/bin/test_p0018.py

@@ -26,7 +26,7 @@ def test_compute(self):
         test_patterns = [((max, test_data_1), '23'), ((max, test_data_2), '1074')]
 
         for args, expected in test_patterns:
-            with self.subTest('triangle size: {}'.format(len(args[1]))):
+            with self.subTest(f'triangle size: {len(args[1])}'):
                 self.assertEqual(expected, compute(*args))
 
 

python/tests/bin/test_p0022.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '871198282')]
+        test_patterns = [('p022_names.txt', '871198282')]
 
-        fh = asset_file('p022_names.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p022_names.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(fh))
-        fh.close()
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0042.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '162')]
+        test_patterns = [('p042_words.txt', '162')]
 
-        fh = asset_file('p042_words.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p042_words.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(fh))
-        fh.close()
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0054.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '376')]
+        test_patterns = [('p054_poker.txt', '376')]
 
-        fh = asset_file('p054_poker.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p054_poker.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(fh))
-        fh.close()
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0059.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '129448')]
+        test_patterns = [('p059_cipher.txt', '129448')]
 
-        fh = asset_file('p059_cipher.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p059_cipher.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(fh))
-        fh.close()
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0063.py

@@ -9,7 +9,7 @@ def test_compute(self):
 
         for args, expected in test_patterns:
             with self.subTest('NONE'):
-                self.assertEqual(expected, compute())
+                self.assertEqual(expected, compute(*args))
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0067.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '7273')]
+        test_patterns = [('p067_triangle.txt', '7273')]
 
-        fh = asset_file('p067_triangle.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p067_triangle.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(max, fh))
-        fh.close()
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0070.py

@@ -9,7 +9,7 @@ def test_compute(self):
 
         for args, expected in test_patterns:
             with self.subTest('NONE'):
-                self.assertEqual(expected, compute())
+                self.assertEqual(expected, compute(*args))
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0079.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '73162890')]
+        test_patterns = [('p079_keylog.txt', '73162890')]
 
-        fh = asset_file('p079_keylog.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p079_keylog.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(fh))
-        fh.close()
 
 
 if __name__ == '__main__':

python/tests/bin/test_p0081.py

@@ -6,13 +6,11 @@
 
 class TestSolution(unittest.TestCase):
     def test_compute(self):
-        test_patterns = [((), '427337')]
+        test_patterns = [('p081_matrix.txt', '427337')]
 
-        fh = asset_file('p081_matrix.txt')
-        for args, expected in test_patterns:
-            with self.subTest('data file: p081_matrix.txt'):
+        for fname, expected in test_patterns:
+            with asset_file(fname) as fh, self.subTest(f'data file: {fname}'):
                 self.assertEqual(expected, compute(min, fh))
-        fh.close()
 
 
 if __name__ == '__main__':