From 5747267eb39961101d8ed6f18e77cefc1fc5c4b8 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:52:56 +0300
Subject: [PATCH] Fix PT018: Assert only one thing

---
 Tests/test_file_jpeg.py        | 9 ++++++---
 Tests/test_imagechops.py       | 3 ++-
 Tests/test_imagemorph.py       | 3 ++-
 Tests/test_tiff_ifdrational.py | 4 ++--
 pyproject.toml                 | 1 -
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index df589e24a..8e6221750 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -1019,13 +1019,16 @@ class TestFileJpeg:
 
         # SOI, EOI
         for marker in b"\xff\xd8", b"\xff\xd9":
-            assert marker in data[1] and marker in data[2]
+            assert marker in data[1]
+            assert marker in data[2]
         # DHT, DQT
         for marker in b"\xff\xc4", b"\xff\xdb":
-            assert marker in data[1] and marker not in data[2]
+            assert marker in data[1]
+            assert marker not in data[2]
         # SOF0, SOS, APP0 (JFIF header)
         for marker in b"\xff\xc0", b"\xff\xda", b"\xff\xe0":
-            assert marker not in data[1] and marker in data[2]
+            assert marker not in data[1]
+            assert marker in data[2]
 
         with Image.open(BytesIO(data[0])) as interchange_im:
             with Image.open(BytesIO(data[1] + data[2])) as combined_im:
diff --git a/Tests/test_imagechops.py b/Tests/test_imagechops.py
index 4fc28cdb9..4309214f5 100644
--- a/Tests/test_imagechops.py
+++ b/Tests/test_imagechops.py
@@ -398,7 +398,8 @@ def test_logical() -> None:
             for y in (a, b):
                 imy = Image.new("1", (1, 1), y)
                 value = op(imx, imy).getpixel((0, 0))
-                assert not isinstance(value, tuple) and value is not None
+                assert not isinstance(value, tuple)
+                assert value is not None
                 out.append(value)
         return out
 
diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py
index 4363f456e..80d8c3815 100644
--- a/Tests/test_imagemorph.py
+++ b/Tests/test_imagemorph.py
@@ -46,7 +46,8 @@ def img_to_string(im: Image.Image) -> str:
         line = ""
         for c in range(im.width):
             value = im.getpixel((c, r))
-            assert not isinstance(value, tuple) and value is not None
+            assert not isinstance(value, tuple)
+            assert value is not None
             line += chars[value > 0]
         result.append(line)
     return "\n".join(result)
diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py
index 9d06a9332..13f1f9c80 100644
--- a/Tests/test_tiff_ifdrational.py
+++ b/Tests/test_tiff_ifdrational.py
@@ -54,8 +54,8 @@ def test_nonetype() -> None:
     assert xres.denominator is not None
     assert yres._val is not None
 
-    assert xres and 1
-    assert xres and yres
+    assert xres
+    assert yres
 
 
 @pytest.mark.parametrize(
diff --git a/pyproject.toml b/pyproject.toml
index b42ad7424..9e53d4bfe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -127,7 +127,6 @@ lint.ignore = [
   "PT012",  # pytest-raises-with-multiple-statements
   "PT016",  # pytest-fail-without-message
   "PT017",  # pytest-assert-in-except
-  "PT018",  # pytest-composite-assertion
   "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10
   "PYI034", # flake8-pyi: typing.Self added in Python 3.11
 ]