From a34a9cd6d1d4b346573fca7336f1cb82918af4b3 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:49:48 +1100
Subject: [PATCH] Improved test coverage

---
 Tests/test_file_iptc.py    | 5 +----
 Tests/test_file_jpeg2k.py  | 3 +--
 Tests/test_file_libtiff.py | 6 +-----
 Tests/test_image.py        | 2 --
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py
index 8a7c59fb1..c6c0c1aab 100644
--- a/Tests/test_file_iptc.py
+++ b/Tests/test_file_iptc.py
@@ -58,10 +58,7 @@ def test_getiptcinfo_fotostation() -> None:
 
     # Assert
     assert iptc is not None
-    for tag in iptc.keys():
-        if tag[0] == 240:
-            return
-    pytest.fail("FotoStation tag not found")
+    assert 240 in (tag[0] for tag in iptc.keys()), "FotoStation tag not found"
 
 
 def test_getiptcinfo_zero_padding() -> None:
diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index dbc2e49ec..711e988df 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -492,8 +492,7 @@ def test_plt_marker(card: ImageFile.ImageFile) -> None:
     out.seek(0)
     while True:
         marker = out.read(2)
-        if not marker:
-            pytest.fail("End of stream without PLT")
+        assert marker, "End of stream without PLT"
 
         jp2_boxid = _binary.i16be(marker)
         if jp2_boxid == 0xFF4F:
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index 49d71aca7..18dd11182 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -36,11 +36,7 @@ class LibTiffTestCase:
         im.load()
         im.getdata()
 
-        try:
-            assert im._compression == "group4"
-        except AttributeError:
-            print("No _compression")
-            print(dir(im))
+        assert im._compression == "group4"
 
         # can we write it back out, in a different form.
         out = str(tmp_path / "temp.png")
diff --git a/Tests/test_image.py b/Tests/test_image.py
index 092bc07f6..fe43cea40 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -189,8 +189,6 @@ class TestImage:
                 if ext == ".jp2" and not features.check_codec("jpg_2000"):
                     pytest.skip("jpg_2000 not available")
                 temp_file = str(tmp_path / ("temp." + ext))
-                if os.path.exists(temp_file):
-                    os.remove(temp_file)
                 im.save(Path(temp_file))
 
     def test_fp_name(self, tmp_path: Path) -> None: