Parametrize test

Author: radarhere

Tests/test_file_bmp.py

@@ -15,25 +15,19 @@
 )
 
 
-def test_sanity(tmp_path: Path) -> None:
-    def roundtrip(im: Image.Image) -> None:
-        outfile = tmp_path / "temp.bmp"
-
-        im.save(outfile, "BMP")
-
-        with Image.open(outfile) as reloaded:
-            reloaded.load()
-            assert im.mode == reloaded.mode
-            assert im.size == reloaded.size
-            assert reloaded.format == "BMP"
-            assert reloaded.get_format_mimetype() == "image/bmp"
+@pytest.mark.parametrize("mode", ("1", "L", "P", "RGB"))
+def test_sanity(mode: str, tmp_path: Path) -> None:
+    outfile = tmp_path / "temp.bmp"
 
-    roundtrip(hopper())
+    im = hopper(mode)
+    im.save(outfile, "BMP")
 
-    roundtrip(hopper("1"))
-    roundtrip(hopper("L"))
-    roundtrip(hopper("P"))
-    roundtrip(hopper("RGB"))
+    with Image.open(outfile) as reloaded:
+        reloaded.load()
+        assert im.mode == reloaded.mode
+        assert im.size == reloaded.size
+        assert reloaded.format == "BMP"
+        assert reloaded.get_format_mimetype() == "image/bmp"
 
 
 def test_invalid_file() -> None:

Tests/test_file_sgi.py

@@ -71,24 +71,26 @@ def test_invalid_file() -> None:
         SgiImagePlugin.SgiImageFile(invalid_file)
 
 
-def test_write(tmp_path: Path) -> None:
-    def roundtrip(img: Image.Image) -> None:
-        out = tmp_path / "temp.sgi"
-        img.save(out, format="sgi")
+def roundtrip(img: Image.Image, tmp_path: Path) -> None:
+    out = tmp_path / "temp.sgi"
+    img.save(out, format="sgi")
+    assert_image_equal_tofile(img, out)
+
+    out = tmp_path / "fp.sgi"
+    with open(out, "wb") as fp:
+        img.save(fp)
         assert_image_equal_tofile(img, out)
 
-        out = tmp_path / "fp.sgi"
-        with open(out, "wb") as fp:
-            img.save(fp)
-            assert_image_equal_tofile(img, out)
+        assert not fp.closed
+
 
-            assert not fp.closed
+@pytest.mark.parametrize("mode", ("L", "RGB", "RGBA"))
+def test_write(mode: str, tmp_path: Path) -> None:
+    roundtrip(hopper(mode), tmp_path)
 
-    for mode in ("L", "RGB", "RGBA"):
-        roundtrip(hopper(mode))
 
-    # Test 1 dimension for an L mode image
-    roundtrip(Image.new("L", (10, 1)))
+def test_write_L_mode_1_dimension(tmp_path: Path) -> None:
+    roundtrip(Image.new("L", (10, 1)), tmp_path)
 
 
 def test_write16(tmp_path: Path) -> None: