diff --git a/test/utils/conftest.py b/test/utils/conftest.py index cc134f8c..4230571b 100644 --- a/test/utils/conftest.py +++ b/test/utils/conftest.py @@ -11,7 +11,7 @@ ALL_IMAGES_LIST = [os.path.join(ASSETS_DIR, f"{i}.jpg") for i in range(1, 6)] @fixture(scope="function") -def empty_opencv_image() -> np.ndarray: +def empty_cv2_image() -> np.ndarray: return np.zeros((128, 128, 3), dtype=np.uint8) diff --git a/test/utils/test_conversion.py b/test/utils/test_conversion.py index fb3d8faf..6ff0c630 100644 --- a/test/utils/test_conversion.py +++ b/test/utils/test_conversion.py @@ -2,28 +2,28 @@ import numpy as np from PIL import Image, ImageChops from supervision.utils.conversion import ( - convert_for_image_processing, cv2_to_pillow, + ensure_cv2_image_for_processing, images_to_cv2, pillow_to_cv2, ) -def test_convert_for_image_processing_when_pillow_image_submitted( - empty_opencv_image: np.ndarray, empty_pillow_image: Image.Image +def test_ensure_cv2_image_for_processing_when_pillow_image_submitted( + empty_cv2_image: np.ndarray, empty_pillow_image: Image.Image ) -> None: # given param_a_value = 3 param_b_value = "some" - @convert_for_image_processing + @ensure_cv2_image_for_processing def my_custom_processing_function( image: np.ndarray, param_a: int, param_b: str, ) -> np.ndarray: assert np.allclose( - image, empty_opencv_image + image, empty_cv2_image ), "Expected conversion to OpenCV image to happen" assert ( param_a == param_a_value @@ -48,21 +48,21 @@ def test_convert_for_image_processing_when_pillow_image_submitted( ) -def test_convert_for_image_processing_when_opencv_image_submitted( - empty_opencv_image: np.ndarray, +def test_ensure_cv2_image_for_processing_when_cv2_image_submitted( + empty_cv2_image: np.ndarray, ) -> None: # given param_a_value = 3 param_b_value = "some" - @convert_for_image_processing + @ensure_cv2_image_for_processing def my_custom_processing_function( image: np.ndarray, param_a: int, param_b: str, ) -> np.ndarray: assert np.allclose( - image, empty_opencv_image + image, empty_cv2_image ), "Expected conversion to OpenCV image to happen" assert ( param_a == param_a_value @@ -74,22 +74,20 @@ def test_convert_for_image_processing_when_opencv_image_submitted( # when result = my_custom_processing_function( - empty_opencv_image, + empty_cv2_image, param_a_value, param_b=param_b_value, ) # then - assert ( - result is empty_opencv_image - ), "Expected to return OpenCV image without changes" + assert result is empty_cv2_image, "Expected to return OpenCV image without changes" def test_cv2_to_pillow( - empty_opencv_image: np.ndarray, empty_pillow_image: Image.Image + empty_cv2_image: np.ndarray, empty_pillow_image: Image.Image ) -> None: # when - result = cv2_to_pillow(image=empty_opencv_image) + result = cv2_to_pillow(image=empty_cv2_image) # then difference = ImageChops.difference(result, empty_pillow_image) @@ -99,14 +97,14 @@ def test_cv2_to_pillow( def test_pillow_to_cv2( - empty_opencv_image: np.ndarray, empty_pillow_image: Image.Image + empty_cv2_image: np.ndarray, empty_pillow_image: Image.Image ) -> None: # when result = pillow_to_cv2(image=empty_pillow_image) # then assert np.allclose( - result, empty_opencv_image + result, empty_cv2_image ), "Conversion to OpenCV image expected not to change the content of image" @@ -119,10 +117,10 @@ def test_images_to_cv2_when_empty_input_provided() -> None: def test_images_to_cv2_when_only_cv2_images_provided( - empty_opencv_image: np.ndarray, + empty_cv2_image: np.ndarray, ) -> None: # given - images = [empty_opencv_image] * 5 + images = [empty_cv2_image] * 5 # when result = images_to_cv2(images=images) @@ -131,13 +129,13 @@ def test_images_to_cv2_when_only_cv2_images_provided( assert len(result) == 5, "Expected the same number of output element as input ones" for result_element in result: assert ( - result_element is empty_opencv_image + result_element is empty_cv2_image ), "Expected CV images not to be touched by conversion" def test_images_to_cv2_when_only_pillow_images_provided( empty_pillow_image: Image.Image, - empty_opencv_image: np.ndarray, + empty_cv2_image: np.ndarray, ) -> None: # given images = [empty_pillow_image] * 5 @@ -149,16 +147,16 @@ def test_images_to_cv2_when_only_pillow_images_provided( assert len(result) == 5, "Expected the same number of output element as input ones" for result_element in result: assert np.allclose( - result_element, empty_opencv_image + result_element, empty_cv2_image ), "Output images expected to be equal to empty OpenCV image" def test_images_to_cv2_when_mixed_input_provided( empty_pillow_image: Image.Image, - empty_opencv_image: np.ndarray, + empty_cv2_image: np.ndarray, ) -> None: # given - images = [empty_pillow_image, empty_opencv_image] + images = [empty_pillow_image, empty_cv2_image] # when result = images_to_cv2(images=images) @@ -166,8 +164,8 @@ def test_images_to_cv2_when_mixed_input_provided( # then assert len(result) == 2, "Expected the same number of output element as input ones" assert np.allclose( - result[0], empty_opencv_image + result[0], empty_cv2_image ), "PIL image should be converted to OpenCV one, equal to example empty image" assert ( - result[1] is empty_opencv_image + result[1] is empty_cv2_image ), "Expected CV images not to be touched by conversion"