Progress towards tests

Author: adamtheturtle

tests/mock_vws/test_add_target.py

@@ -15,6 +15,7 @@
 from tests.mock_vws.utils import (
     add_target_to_vws,
     delete_target,
+    make_image_file,
     wait_for_target_processed,
 )
 from tests.mock_vws.utils.assertions import (
@@ -468,63 +469,34 @@ def test_corrupted(
 
         assert_success(response=response)
 
-    def test_jpeg_too_large(
+    def test_image_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,
+        max_bytes = 2 * 1024 * 1024
+        width = height = 835
+        png_not_too_large = make_image_file(
+            file_format='PNG',
+            color_space='RGB',
+            width=width,
+            height=height,
         )
 
-        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 = png_not_too_large.read()
         image_data_encoded = base64.b64encode(image_data).decode('ascii')
 
+        image_content_size = len(image_data)
+        # We check that the image we created is just slightly smaller than the
+        # maximum file size.
+        #
+        # This is just because of the implementation details of ``image_file``.
+        assert image_content_size < max_bytes
+        assert (image_content_size * 1.05) > max_bytes
+
         data = {
             'name': 'example_name',
             'width': 1,

tests/mock_vws/test_query.py

@@ -1095,7 +1095,8 @@ def test_png(
         # We check that the image we created is just slightly smaller than the
         # maximum file size.
         #
-        # This is just because of the implementation details of ``image_file``.
+        # This is just because of the implementation details of
+        # ``make_image_file``.
         assert image_content_size < max_bytes
         assert (image_content_size * 1.05) > max_bytes
 
@@ -1121,7 +1122,8 @@ def test_png(
         # We check that the image we created is just slightly larger than the
         # maximum file size.
         #
-        # This is just because of the implementation details of ``image_file``.
+        # This is just because of the implementation details of
+        # ``make_image_file``.
         assert image_content_size > max_bytes
         assert (image_content_size * 0.95) < max_bytes