From 1a6f015c3653c1415073b5a3770900465a788b8a Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 2 Aug 2023 21:01:54 +0200
Subject: [PATCH] [tests.test_image_utils] Update to support new structure
---
tests/test_image_utils.py | 35 ++++++++++++-----------------------
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git a/tests/test_image_utils.py b/tests/test_image_utils.py
index e02273f9..420fdf04 100644
--- a/tests/test_image_utils.py
+++ b/tests/test_image_utils.py
@@ -6,7 +6,7 @@
import numpy
import PIL.Image
-from ptbench.data.image_utils import RemoveBlackBorders
+from ptbench.data.image_utils import remove_black_borders
def test_remove_black_borders(datadir):
@@ -15,8 +15,7 @@ def test_remove_black_borders(datadir):
raw_with_black_border = PIL.Image.open(data_file)
# Remove the black border
- rbb = RemoveBlackBorders()
- raw_rbb_removed = rbb(raw_with_black_border)
+ raw_rbb_removed = remove_black_borders(raw_with_black_border)
# Get the same sample without black border
data_file_2 = str(datadir / "raw_without_black_border.png")
@@ -29,23 +28,13 @@ def test_remove_black_borders(datadir):
numpy.testing.assert_array_equal(raw_without_black_border, raw_rbb_removed)
-# def test_load_pil_16bit(datadir):
-# # If the ratio is higher 0.5, image is probably clipped
-# Level16to8 = SingleAutoLevel16to8()
-#
-# data_file = str(datadir / "16bits.png")
-# image = numpy.array(Level16to8(load_pil(data_file)))
-#
-# count_pixels = numpy.count_nonzero(image)
-# count_max_value = numpy.count_nonzero(image == image.max())
-#
-# assert count_max_value / count_pixels < 0.5
-#
-# # It should not do anything to an image already in 8 bits
-# data_file = str(datadir / "raw_without_black_border.png")
-# img_loaded = load_pil(data_file)
-#
-# original_8bits = numpy.array(img_loaded)
-# leveled_8bits = numpy.array(Level16to8(img_loaded))
-#
-# numpy.testing.assert_array_equal(original_8bits, leveled_8bits)
+def test_load_pil_16bit(datadir):
+ # If the ratio is higher 0.5, image is probably clipped
+
+ image = PIL.Image.open(datadir / "16bits.png")
+ array = numpy.array(image).astype(numpy.float32) / 65535
+
+ count_pixels = numpy.count_nonzero(array)
+ count_max_value = numpy.count_nonzero(array == array.max())
+
+ assert count_max_value / count_pixels < 0.5
--
GitLab