From 4182e5497250a724fa346b3280ba8a57f0fa2936 Mon Sep 17 00:00:00 2001
From: dutcu <dru.ttc@gmail.com>
Date: Thu, 20 Jun 2024 11:58:16 +0200
Subject: [PATCH 1/2] test changes

---
 Tests/test_frombytes_image.py |  8 ++++----
 Tests/test_image_frombytes.py |  1 +
 Tests/test_new_imagemerge.py  | 30 ++++++++++++++++++++++++++++++
 conftest.py                   |  1 -
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 Tests/test_new_imagemerge.py

diff --git a/Tests/test_frombytes_image.py b/Tests/test_frombytes_image.py
index 68fd1a465..77e3363a1 100644
--- a/Tests/test_frombytes_image.py
+++ b/Tests/test_frombytes_image.py
@@ -27,7 +27,7 @@ class TestFromBytes(unittest.TestCase):
         image = Image.frombytes("L", (2, 1), data)
         self.assertEqual(image.size, (2, 1))
         self.assertEqual(image.getpixel((0, 0)), 0)
-        self.assertEqual(image.getpixel((1, 0)), 255)
+        # self.assertEqual(image.getpixel((1, 0)), 255)
 
         # Test case 5: Zero width
         data = b""
@@ -48,8 +48,8 @@ class TestFromBytes(unittest.TestCase):
         # Test case 8: s[1] == 0
         data = b"\x00\x00\xFF\xFF\x00\x00"
         s = (2, 0)
-        with self.assertRaises(ValueError):
-            Image.frombytes("RGB", s, data)
+        # with self.assertRaises(ValueError):
+        #     Image.frombytes("RGB", s, data)
 
         # Test case 5: Different size
         data = b"\x00\x00\xFF\xFF\x00\x00\xFF\xFF\x00\x00"
@@ -57,7 +57,7 @@ class TestFromBytes(unittest.TestCase):
         self.assertEqual(image.size, (3, 1))
         self.assertEqual(image.getpixel((0, 0)), (0, 0, 255))
         self.assertEqual(image.getpixel((1, 0)), (255, 0, 0))
-        self.assertEqual(image.getpixel((2, 0)), (255, 0, 0))
+        # self.assertEqual(image.getpixel((2, 0)), (255, 0, 0))
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Tests/test_image_frombytes.py b/Tests/test_image_frombytes.py
index c191c0a6f..bfdb02685 100644
--- a/Tests/test_image_frombytes.py
+++ b/Tests/test_image_frombytes.py
@@ -17,3 +17,4 @@ def test_sanity(data_type: str) -> None:
     im2 = Image.frombytes(im1.mode, im1.size, data)
 
     assert_image_equal(im1, im2)
+    
\ No newline at end of file
diff --git a/Tests/test_new_imagemerge.py b/Tests/test_new_imagemerge.py
new file mode 100644
index 000000000..21b8a1bfd
--- /dev/null
+++ b/Tests/test_new_imagemerge.py
@@ -0,0 +1,30 @@
+import pytest
+
+from PIL import Image
+
+def calculate_branch_coverage():
+    b = Image.Branches
+    print("Branches covered:", sum(b.values()))
+
+
+def test_merge_wrong_number_of_bands():
+    R = Image.new('L', (100, 100), color=255)
+    G = Image.new('L', (100, 100), color=128)
+    with pytest.raises(ValueError, match="wrong number of bands"):
+        Image.merge('RGB', [R, G]) 
+
+def test_merge_mode_mismatch():
+    R = Image.new('L', (100, 100), color=255)
+    G = Image.new('L', (100, 100), color=128)
+    B = Image.new('1', (100, 100))  # Incorrect mode
+    with pytest.raises(ValueError, match="mode mismatch"):
+        Image.merge('RGB', [R, G, B])
+
+def test_merge_size_mismatch():
+    R = Image.new('L', (100, 100), color=255)
+    G = Image.new('L', (200, 100), color=128)  # Different size
+    B = Image.new('L', (100, 100), color=0)
+    with pytest.raises(ValueError, match="size mismatch"):
+        Image.merge('RGB', [R, G, B])
+
+
diff --git a/conftest.py b/conftest.py
index ff3fe1d2c..57a5a80db 100644
--- a/conftest.py
+++ b/conftest.py
@@ -25,7 +25,6 @@ def calculate_coverage(test_name):
         print(f"{name} - Total branches: {num_branches}")
         print(f"{name} - BRANCH COVERAGE: {coverage}%\n")
 
-
     return all_branches["branches1"]
 
 

From e03bcea4fb0dd350e79bf853af25682d2f27aebc Mon Sep 17 00:00:00 2001
From: dutcu <dru.ttc@gmail.com>
Date: Thu, 20 Jun 2024 12:04:54 +0200
Subject: [PATCH 2/2] sorry

---
 Tests/test_frombytes_image.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Tests/test_frombytes_image.py b/Tests/test_frombytes_image.py
index 77e3363a1..68fd1a465 100644
--- a/Tests/test_frombytes_image.py
+++ b/Tests/test_frombytes_image.py
@@ -27,7 +27,7 @@ class TestFromBytes(unittest.TestCase):
         image = Image.frombytes("L", (2, 1), data)
         self.assertEqual(image.size, (2, 1))
         self.assertEqual(image.getpixel((0, 0)), 0)
-        # self.assertEqual(image.getpixel((1, 0)), 255)
+        self.assertEqual(image.getpixel((1, 0)), 255)
 
         # Test case 5: Zero width
         data = b""
@@ -48,8 +48,8 @@ class TestFromBytes(unittest.TestCase):
         # Test case 8: s[1] == 0
         data = b"\x00\x00\xFF\xFF\x00\x00"
         s = (2, 0)
-        # with self.assertRaises(ValueError):
-        #     Image.frombytes("RGB", s, data)
+        with self.assertRaises(ValueError):
+            Image.frombytes("RGB", s, data)
 
         # Test case 5: Different size
         data = b"\x00\x00\xFF\xFF\x00\x00\xFF\xFF\x00\x00"
@@ -57,7 +57,7 @@ class TestFromBytes(unittest.TestCase):
         self.assertEqual(image.size, (3, 1))
         self.assertEqual(image.getpixel((0, 0)), (0, 0, 255))
         self.assertEqual(image.getpixel((1, 0)), (255, 0, 0))
-        # self.assertEqual(image.getpixel((2, 0)), (255, 0, 0))
+        self.assertEqual(image.getpixel((2, 0)), (255, 0, 0))
 
 if __name__ == "__main__":
     unittest.main()