From 27c7ac4dadf950418e21883ef7f9b9a209a7b481 Mon Sep 17 00:00:00 2001
From: dutcu <dru.ttc@gmail.com>
Date: Wed, 19 Jun 2024 21:22:31 +0200
Subject: [PATCH] conftest coverage tool fix and pdfparser function coverage

---
 conftest.py          | 28 ++++++++++++++++++----------
 src/PIL/Image.py     | 15 +++++++--------
 src/PIL/PdfParser.py | 12 ++++++++++++
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/conftest.py b/conftest.py
index 9fb8731fb..ff3fe1d2c 100644
--- a/conftest.py
+++ b/conftest.py
@@ -3,22 +3,30 @@ import pytest
 import sys
 
 from PIL import Image
+from PIL import PdfParser
 
 pytest_plugins = ["Tests.helper"]
 
 
 def calculate_coverage(test_name):
-    branch = Image.branches
-    branches = Image.branches
-    num_branches = len(branches)
-    branch_covered = {key: value for key, value in branches.items() if value is True}
-    sum_branches = len(branch_covered)
-    coverage = (sum_branches/num_branches) * 100
-    print(f"\nBranches covered: {sum_branches}")
-    print(f"\nTotal branches: {num_branches}")
-    print("\nBRANCH COVERAGE:", coverage, "%\n")
-    return coverage
+    all_branches = {
+        "branches1": Image.branches,
+        "branches2": PdfParser.XrefTable.branches,
+        # Add more
+    }
 
+    for name, branches in all_branches.items():
+        num_branches = len(branches)
+        branch_covered = {key: value for key, value in branches.items() if value is True}
+        sum_branches = len(branch_covered)
+        coverage = (sum_branches / num_branches) * 100
+
+        print(f"\n{name} - Branches covered: {sum_branches}")
+        print(f"{name} - Total branches: {num_branches}")
+        print(f"{name} - BRANCH COVERAGE: {coverage}%\n")
+
+
+    return all_branches["branches1"]
 
 
 @pytest.hookimpl(tryfirst=True)
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 315b65851..98f9ed981 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -67,6 +67,13 @@ except ImportError:
 
 logger = logging.getLogger(__name__)
 
+branches = {
+    "1": False,
+    "2": False,
+    "3": False,
+    "4": False,
+    "5": False,
+    }
 
 class DecompressionBombWarning(RuntimeWarning):
     pass
@@ -537,14 +544,6 @@ class Image:
         self.pyaccess = None
         self._exif = None
 
-    branches = {
-        "1": False,
-        "2": False,
-        "3": False,
-        "4": False,
-        "5": False,
-        }
-
     @property
     def width(self) -> int:
         return self.size[0]
diff --git a/src/PIL/PdfParser.py b/src/PIL/PdfParser.py
index 93d677e89..11649f1c2 100644
--- a/src/PIL/PdfParser.py
+++ b/src/PIL/PdfParser.py
@@ -112,6 +112,14 @@ class IndirectObjectDef(IndirectReference):
 
 
 class XrefTable:
+
+    branches = {
+        "1": False,
+        "2": False,
+        "3": False,
+        "4": False,
+        }
+
     def __init__(self):
         self.existing_entries = {}  # object ID => (offset, generation)
         self.new_entries = {}  # object ID => (offset, generation)
@@ -134,15 +142,19 @@ class XrefTable:
 
     def __delitem__(self, key):
         if key in self.new_entries:
+            XrefTable.branches["1"] = True
             generation = self.new_entries[key][1] + 1
             del self.new_entries[key]
             self.deleted_entries[key] = generation
         elif key in self.existing_entries:
+            XrefTable.branches["2"] = True
             generation = self.existing_entries[key][1] + 1
             self.deleted_entries[key] = generation
         elif key in self.deleted_entries:
+            XrefTable.branches["3"] = True
             generation = self.deleted_entries[key]
         else:
+            XrefTable.branches["4"] = True
             msg = f"object ID {key} cannot be deleted because it doesn't exist"
             raise IndexError(msg)