start of moving around image file util

Author: adamtheturtle

tests/mock_vws/fixtures/images.py

@@ -3,47 +3,11 @@
 """
 
 import io
-import random
 
 import pytest
 from _pytest.fixtures import SubRequest
-from PIL import Image
 
-
-def _image_file(
-    file_format: str,
-    color_space: str,
-    width: int,
-    height: int,
-) -> io.BytesIO:
-    """
-    Return an image file in the given format and color space.
-
-    The image file is filled with randomly colored pixels.
-
-    Args:
-        file_format: See
-            http://pillow.readthedocs.io/en/3.1.x/handbook/image-file-formats.html
-        color_space: One of "L", "RGB", or "CMYK". "L" means greyscale.
-        width: The width, in pixels of the image.
-        height: The width, in pixels of the image.
-
-    Returns:
-        An image file in the given format and color space.
-    """
-    image_buffer = io.BytesIO()
-    image = Image.new(color_space, (width, height))
-    pixels = image.load()
-    for i in range(height):
-        for j in range(width):
-            red = random.randint(0, 255)
-            green = random.randint(0, 255)
-            blue = random.randint(0, 255)
-            if color_space != 'L':
-                pixels[j, i] = (red, green, blue)
-    image.save(image_buffer, file_format)
-    image_buffer.seek(0)
-    return image_buffer
+from tests.mock_vws.utils import image_file
 
 
 @pytest.fixture
@@ -52,23 +16,23 @@ def png_rgb_success() -> io.BytesIO:
     Return a PNG file in the RGB color space which is expected to have a
     'success' status when added to a target.
     """
-    return _image_file(file_format='PNG', color_space='RGB', width=5, height=5)
+    return image_file(file_format='PNG', color_space='RGB', width=5, height=5)
 
 
 @pytest.fixture
 def png_rgb() -> io.BytesIO:
     """
     Return a 1x1 PNG file in the RGB color space.
     """
-    return _image_file(file_format='PNG', color_space='RGB', width=1, height=1)
+    return image_file(file_format='PNG', color_space='RGB', width=1, height=1)
 
 
 @pytest.fixture
 def png_greyscale() -> io.BytesIO:
     """
     Return a 1x1 PNG file in the greyscale color space.
     """
-    return _image_file(file_format='PNG', color_space='L', width=1, height=1)
+    return image_file(file_format='PNG', color_space='L', width=1, height=1)
 
 
 @pytest.fixture()
@@ -98,7 +62,7 @@ def jpeg_cmyk() -> io.BytesIO:
     """
     Return a 1x1 JPEG file in the CMYK color space.
     """
-    return _image_file(
+    return image_file(
         file_format='JPEG',
         color_space='CMYK',
         width=1,
@@ -111,7 +75,7 @@ def jpeg_rgb() -> io.BytesIO:
     """
     Return a 1x1 JPEG file in the RGB color space.
     """
-    return _image_file(
+    return image_file(
         file_format='JPEG',
         color_space='RGB',
         width=1,
@@ -127,7 +91,7 @@ def tiff_rgb() -> io.BytesIO:
     This is given as an option which is not supported by Vuforia as Vuforia
     supports only JPEG and PNG files.
     """
-    return _image_file(
+    return image_file(
         file_format='TIFF',
         color_space='RGB',
         width=1,

tests/mock_vws/test_query.py

@@ -8,8 +8,6 @@
 import calendar
 import datetime
 import io
-import math
-import random
 import time
 from typing import Dict, Union
 from urllib.parse import urljoin
@@ -1067,10 +1065,6 @@ class TestMaximumImageSize:
     Tests for maximum image sizes.
     """
 
-    def _png(width: int, height: int):
-        """
-        XXX
-        """
     def test_png(
         self,
         vuforia_database_keys: VuforiaDatabaseKeys,
@@ -1079,28 +1073,14 @@ def test_png(
         See https://github.com/adamtheturtle/vws-python/issues/357 for
         implementing this test.
         """
-        file_format = 'PNG'
-        color_space = 'RGB'
         # 835 no error, 836 error
         width = height = 836
-        width = height = 835
+        # width = height = 835
 
         # # This gives 422 on real, 200 on mock
         # width = 1
         # height = int(max_size / 2)
 
-        image_buffer = io.BytesIO()
-        image = Image.new(color_space, (width, height))
-        pixels = image.load()
-        for i in range(height):
-            for j in range(width):
-                red = random.randint(0, 255)
-                green = random.randint(0, 255)
-                blue = random.randint(0, 255)
-                pixels[j, i] = (red, green, blue)
-        image.save(image_buffer, file_format)
-        image_buffer.seek(0)
-
         image_content = image_buffer.getvalue()
         body = {'image': ('image.jpeg', image_content, 'image/jpeg')}
 

tests/mock_vws/utils/__init__.py

@@ -2,6 +2,9 @@
 Utilities for tests.
 """
 
+import io
+from PIL import Image
+import random
 import json
 from time import sleep
 from typing import Any, Dict
@@ -417,3 +420,39 @@ def query(
     )
 
     return response
+
+
+def image_file(
+    file_format: str,
+    color_space: str,
+    width: int,
+    height: int,
+) -> io.BytesIO:
+    """
+    Return an image file in the given format and color space.
+
+    The image file is filled with randomly colored pixels.
+
+    Args:
+        file_format: See
+            http://pillow.readthedocs.io/en/3.1.x/handbook/image-file-formats.html
+        color_space: One of "L", "RGB", or "CMYK". "L" means greyscale.
+        width: The width, in pixels of the image.
+        height: The width, in pixels of the image.
+
+    Returns:
+        An image file in the given format and color space.
+    """
+    image_buffer = io.BytesIO()
+    image = Image.new(color_space, (width, height))
+    pixels = image.load()
+    for i in range(height):
+        for j in range(width):
+            red = random.randint(0, 255)
+            green = random.randint(0, 255)
+            blue = random.randint(0, 255)
+            if color_space != 'L':
+                pixels[j, i] = (red, green, blue)
+    image.save(image_buffer, file_format)
+    image_buffer.seek(0)
+    return image_buffer