diff --git a/conf/testing.py b/conf/testing.py index a089ccc5bfb1739c0f0ded49c09821d020f0ea63..59d642b831a3ce3e6b7a4217fc5dd18731331ded 100644 --- a/conf/testing.py +++ b/conf/testing.py @@ -12,6 +12,16 @@ czifile = { 'z': 1, } +filename = 'test_img.png' +pngfile = { + 'filename': filename, + 'path': root / filename, + 'w': 64, + 'h': 128, + 'c': 3, + 'z': 1 +} + filename = 'zmask-test-stack.tif' tifffile = { 'filename': filename, diff --git a/tests/test_accessors.py b/tests/test_accessors.py index da39610adc212662ab4c5bf4c2e696c8103ed6fb..426afa078acffce2320b3000979ac913ef1def09 100644 --- a/tests/test_accessors.py +++ b/tests/test_accessors.py @@ -2,8 +2,8 @@ import unittest import numpy as np -from conf.testing import czifile, output_path, tifffile -from model_server.accessors import CziImageFileAccessor, DataShapeError, generate_file_accessor, InMemoryDataAccessor, write_accessor_data_to_file, TifSingleSeriesFileAccessor +from conf.testing import czifile, output_path, pngfile, tifffile +from model_server.accessors import CziImageFileAccessor, DataShapeError, generate_file_accessor, InMemoryDataAccessor, PngFileAccessor, write_accessor_data_to_file, TifSingleSeriesFileAccessor class TestCziImageFileAccess(unittest.TestCase): @@ -98,3 +98,9 @@ class TestCziImageFileAccess(unittest.TestCase): se = fh.series[0] fh_shape_dict = {se.axes[i]: se.shape[i] for i in range(0, len(se.shape))} self.assertEqual(fh_shape_dict, acc.shape_dict, 'Axes are not preserved in TIF output') + + def test_read_rgb_png(self): + acc = PngFileAccessor(pngfile['path']) + self.assertEqual(acc.hw, (pngfile['h'], pngfile['w'])) + self.assertEqual(acc.chroma, 3) + self.assertEqual(acc.nz, 1)