Merge pull request #676 from adamtheturtle/corrupted-fixture

 Use a fixture for corrupted image

Author: adamtheturtle

tests/mock_vws/fixtures/images.py

@@ -37,6 +37,22 @@ def png_rgb() -> io.BytesIO:
     )
 
 
+@pytest.fixture
+def corrupted_image_file() -> io.BytesIO:
+    """
+    Return an image file which is corrupted.
+    """
+    original_image = make_image_file(
+        file_format='PNG',
+        color_space='RGB',
+        width=1,
+        height=1,
+    )
+    original_data = original_image.getvalue()
+    corrupted_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
+    return io.BytesIO(corrupted_data)
+
+
 @pytest.fixture
 def image_file_failed_state() -> io.BytesIO:
     """

tests/mock_vws/test_add_target.py

@@ -441,16 +441,12 @@ def test_bad_image_format_or_color_space(
     def test_corrupted(
         self,
         vuforia_database_keys: VuforiaDatabaseKeys,
-        png_rgb: io.BytesIO,
+        corrupted_image_file: io.BytesIO,
     ) -> None:
         """
         No error is returned when the given image is corrupted.
         """
-        original_data = png_rgb.getvalue()
-        corrupted_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
-        corrupted_file = io.BytesIO(corrupted_data)
-
-        image_data = corrupted_file.read()
+        image_data = corrupted_image_file.getvalue()
         image_data_encoded = base64.b64encode(image_data).decode('ascii')
 
         data = {

tests/mock_vws/test_query.py

@@ -1024,13 +1024,12 @@ class TestBadImage:
     def test_corrupted(
         self,
         vuforia_database_keys: VuforiaDatabaseKeys,
-        png_rgb: io.BytesIO,
+        corrupted_image_file: io.BytesIO,
     ) -> None:
         """
         A "BadImage" result is returned when a corrupted image is given.
         """
-        original_data = png_rgb.getvalue()
-        corrupted_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
+        corrupted_data = corrupted_image_file.getvalue()
 
         body = {'image': ('image.jpeg', corrupted_data, 'image/jpeg')}
 

tests/mock_vws/test_update_target.py

@@ -766,16 +766,14 @@ def test_bad_image_format_or_color_space(
     def test_corrupted(
         self,
         vuforia_database_keys: VuforiaDatabaseKeys,
-        png_rgb: io.BytesIO,
+        corrupted_image_file: io.BytesIO,
         target_id: str,
     ) -> None:
         """
         No error is returned when the given image is corrupted.
         """
-        original_data = png_rgb.getvalue()
-        corrupted_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
-
-        image_data_encoded = base64.b64encode(corrupted_data).decode('ascii')
+        image_data = corrupted_image_file.getvalue()
+        image_data_encoded = base64.b64encode(image_data).decode('ascii')
 
         wait_for_target_processed(
             vuforia_database_keys=vuforia_database_keys,