Remove dodgy fixture

Author: adamtheturtle

tests/mock_vws/fixtures/images.py

@@ -50,28 +50,6 @@ def png_greyscale() -> io.BytesIO:
     )
 
 
-@pytest.fixture()
-def png_large(
-    png_rgb: io.BytesIO,  # pylint: disable=redefined-outer-name
-) -> io.BytesIO:
-    """
-    Return a PNG file of the maximum allowed file size.
-
-    https://library.vuforia.com/articles/Training/Cloud-Recognition-Guide
-    describes that the maximum allowed file size of an image is 2 MB.
-    However, tests using this fixture demonstrate that the maximum allowed
-    size is actually slightly greater than that.
-    """
-    png_size = len(png_rgb.getbuffer())
-    max_size = 2359293
-    filler_length = max_size - png_size
-    filler_data = b'\x00' * int(filler_length)
-    original_data = png_rgb.getvalue()
-    longer_data = original_data.replace(b'IEND', filler_data + b'IEND')
-    png = io.BytesIO(longer_data)
-    return png
-
-
 @pytest.fixture
 def jpeg_cmyk() -> io.BytesIO:
     """
@@ -114,7 +92,7 @@ def tiff_rgb() -> io.BytesIO:
     )
 
 
-@pytest.fixture(params=['png_rgb', 'jpeg_rgb', 'png_greyscale', 'png_large'])
+@pytest.fixture(params=['png_rgb', 'jpeg_rgb', 'png_greyscale'])
 def image_file(request: SubRequest) -> io.BytesIO:
     """
     Return an image file which is expected to work on Vuforia.

tests/mock_vws/test_add_target.py

@@ -410,7 +410,7 @@ def test_image_valid(
 
         assert_success(response=response)
 
-    def test_bad_image(
+    def test_bad_image_format_or_color_space(
         self,
         bad_image_file: io.BytesIO,
         vuforia_database_keys: VuforiaDatabaseKeys,
@@ -440,7 +440,7 @@ def test_bad_image(
             result_code=ResultCodes.BAD_IMAGE,
         )
 
-    def test_too_large(
+    def test_corrupted(
         self,
         vuforia_database_keys: VuforiaDatabaseKeys,
         png_large: io.BytesIO,
@@ -476,6 +476,117 @@ def test_too_large(
             result_code=ResultCodes.IMAGE_TOO_LARGE,
         )
 
+    def test_jpeg_too_large(
+        self,
+        vuforia_database_keys: VuforiaDatabaseKeys,
+        png_large: io.BytesIO,
+    ) -> None:
+        """
+        foobar todo update docstring
+        An `ImageTooLarge` result is returned if the image is above a certain
+        threshold.
+
+        This threshold is documented as being 2 MB but it is actually
+        slightly larger. See the `png_large` fixture for more details.
+        """
+        original_data = png_large.getvalue()
+        longer_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
+        too_large_file = io.BytesIO(longer_data)
+
+        image_data = too_large_file.read()
+        image_data_encoded = base64.b64encode(image_data).decode('ascii')
+
+        data = {
+            'name': 'example_name',
+            'width': 1,
+            'image': image_data_encoded,
+        }
+
+        response = add_target_to_vws(
+            vuforia_database_keys=vuforia_database_keys,
+            data=data,
+        )
+
+        assert_vws_failure(
+            response=response,
+            status_code=codes.UNPROCESSABLE_ENTITY,
+            result_code=ResultCodes.IMAGE_TOO_LARGE,
+        )
+
+    def test_png_too_large(
+        self,
+        vuforia_database_keys: VuforiaDatabaseKeys,
+        png_large: io.BytesIO,
+    ) -> None:
+        """
+        foobar todo update docstring
+        An `ImageTooLarge` result is returned if the image is above a certain
+        threshold.
+
+        This threshold is documented as being 2 MB but it is actually
+        slightly larger. See the `png_large` fixture for more details.
+        """
+        original_data = png_large.getvalue()
+        longer_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
+        too_large_file = io.BytesIO(longer_data)
+
+        image_data = too_large_file.read()
+        image_data_encoded = base64.b64encode(image_data).decode('ascii')
+
+        data = {
+            'name': 'example_name',
+            'width': 1,
+            'image': image_data_encoded,
+        }
+
+        response = add_target_to_vws(
+            vuforia_database_keys=vuforia_database_keys,
+            data=data,
+        )
+
+        assert_vws_failure(
+            response=response,
+            status_code=codes.UNPROCESSABLE_ENTITY,
+            result_code=ResultCodes.IMAGE_TOO_LARGE,
+        )
+
+    def test_corrupted_and_too_large(
+        self,
+        vuforia_database_keys: VuforiaDatabaseKeys,
+        png_large: io.BytesIO,
+    ) -> None:
+        """
+        foobar todo update docstring
+        An `ImageTooLarge` result is returned if the image is above a certain
+        threshold.
+
+        This threshold is documented as being 2 MB but it is actually
+        slightly larger. See the `png_large` fixture for more details.
+        """
+        original_data = png_large.getvalue()
+        longer_data = original_data.replace(b'IEND', b'\x00' + b'IEND')
+        too_large_file = io.BytesIO(longer_data)
+
+        image_data = too_large_file.read()
+        image_data_encoded = base64.b64encode(image_data).decode('ascii')
+
+        data = {
+            'name': 'example_name',
+            'width': 1,
+            'image': image_data_encoded,
+        }
+
+        response = add_target_to_vws(
+            vuforia_database_keys=vuforia_database_keys,
+            data=data,
+        )
+
+        assert_vws_failure(
+            response=response,
+            status_code=codes.UNPROCESSABLE_ENTITY,
+            result_code=ResultCodes.IMAGE_TOO_LARGE,
+        )
+
     def test_not_base64_encoded(
         self,
         vuforia_database_keys: VuforiaDatabaseKeys,