test(compare-images): use copy_files_to_pyodide

Author: thewtex

packages/compare-images/.gitignore

@@ -1,7 +1,7 @@
 typescript/demo-app/
 typescript/src/version.ts
 dist/
-test/
+test/data
 package-lock.json
 typescript/test/browser/demo-app/public
 pyodide/

packages/compare-images/pixi.toml

@@ -102,6 +102,7 @@ description = "Download Pyodide"
 [feature.python.tasks.test-emscripten]
 cmd = '''mkdir -p dist/pyodide &&
   cp -r ../../pyodide dist/ &&
+  cp -r ../../test/data tests/ &&
   hatch build -t wheel ./dist/pyodide/ &&
   pytest --dist-dir=./dist/pyodide --rt=chrome'''
 cwd = "python/itkwasm-compare-images-emscripten"
@@ -121,6 +122,7 @@ description = "Serve itkwasm-compare-images-emscripten for development"
 [feature.python.tasks.test-dispatch]
 cmd = '''mkdir -p dist/pyodide &&
   cp -r ../../pyodide dist/ &&
+  cp -r ../../test/data tests/ &&
   hatch build -t wheel ./dist/pyodide/ &&
   cp ../itkwasm-compare-images-emscripten/dist/pyodide/itkwasm_compare_images_emscripten*.whl ./dist/pyodide/ &&
   pytest --dist-dir=./dist/pyodide --rt=chrome'''

packages/compare-images/python/itkwasm-compare-images-emscripten/test/fixtures.py

@@ -0,0 +1,24 @@
+import pytest
+import sys
+
+from pathlib import Path
+
+if sys.version_info < (3,10):
+    pytest.skip("Skipping pyodide tests on older Python", allow_module_level=True)
+
+from itkwasm_compare_images_emscripten import __version__ as test_package_version
+
+def package_wheel():
+    wheel_stem = f"itkwasm_compare_images_emscripten-{test_package_version}-py3-none-any.whl"
+    wheel_path = Path(__file__).parent.parent / 'dist' / 'pyodide' / wheel_stem
+    return wheel_path, wheel_stem
+
+def input_data():
+    input_base_path = Path(__file__).parent.parent / 'tests' / 'data'
+    test_files = [f for f in (input_base_path / 'input').rglob('*') if f.is_file()]
+    # Must be unique.
+    # test_files += [f for f in (input_base_path / 'baseline').rglob('*') if f.is_file()]
+    return [(input_base_path / f, f.name) for f in test_files]
+
+def input_file_list():
+    return input_data() + [package_wheel()]

packages/compare-images/python/itkwasm-compare-images-emscripten/test/test_itkwasm_compare_images.py

@@ -1,19 +1,22 @@
+import pytest
 import sys
 
 if sys.version_info < (3,10):
     pytest.skip("Skipping pyodide tests on older Python", allow_module_level=True)
 
 from pytest_pyodide import run_in_pyodide
-from .fixtures import package_wheel, input_data
+from pytest_pyodide.decorator import copy_files_to_pyodide
+from .fixtures import input_file_list
 
+file_list = input_file_list()
+
+@copy_files_to_pyodide(file_list=file_list,install_wheels=True)
 @run_in_pyodide(packages=['micropip', 'numpy'])
-async def test_compare_double_images_async(selenium, package_wheel, input_data):
+async def test_compare_double_images_async(selenium):
     import micropip
-    await micropip.install(package_wheel)
     await micropip.install('itkwasm-image-io-emscripten')
-    def write_input_data_to_fs(input_data, filename):
-        with open(filename, 'wb') as fp:
-            fp.write(input_data[filename])
+
+    from itkwasm_compare_images_emscripten import compare_double_images_async
 
     import numpy as np
     from itkwasm import Image
@@ -22,11 +25,9 @@ def write_input_data_to_fs(input_data, filename):
     from itkwasm_image_io_emscripten import imread_async
 
     test_image_file = 'cake_easy.iwi.cbor'
-    write_input_data_to_fs(input_data, test_image_file)
     test_image = await imread_async(test_image_file)
 
     baseline_image_file = 'cake_hard.iwi.cbor'
-    write_input_data_to_fs(input_data, baseline_image_file)
     baseline_image = await imread_async(baseline_image_file)
 
     metrics, difference_image, difference_image_rendering = await compare_double_images_async(test_image, baseline_images=[baseline_image])
@@ -41,14 +42,11 @@ def write_input_data_to_fs(input_data, filename):
     assert difference_image.imageType.componentType == 'float64'
     assert difference_image_rendering.imageType.componentType == 'uint8'
 
+@copy_files_to_pyodide(file_list=file_list,install_wheels=True)
 @run_in_pyodide(packages=['micropip', 'numpy'])
-async def test_compare_images_async(selenium, package_wheel, input_data):
+async def test_compare_images_async(selenium):
     import micropip
-    await micropip.install(package_wheel)
     await micropip.install('itkwasm-image-io-emscripten')
-    def write_input_data_to_fs(input_data, filename):
-        with open(filename, 'wb') as fp:
-            fp.write(input_data[filename])
 
     from itkwasm_compare_images_emscripten import compare_images_async
     from itkwasm_image_io_emscripten import imread_async
@@ -57,11 +55,9 @@ def write_input_data_to_fs(input_data, filename):
     from itkwasm.pyodide import to_js as itkwasm_to_js
 
     test_image_file = 'cake_easy.iwi.cbor'
-    write_input_data_to_fs(input_data, test_image_file)
     test_image = await imread_async(test_image_file)
 
     baseline_image_file = 'cake_hard.iwi.cbor'
-    write_input_data_to_fs(input_data, baseline_image_file)
     baseline_image = await imread_async(baseline_image_file)
 
     metrics, difference_image, difference_image_rendering = await compare_images_async(test_image, baseline_images=[baseline_image])
@@ -77,11 +73,9 @@ def write_input_data_to_fs(input_data, filename):
     assert difference_image_rendering.imageType.componentType == 'uint8'
 
     test_image_file = 'cake_easy.png'
-    write_input_data_to_fs(input_data, test_image_file)
     test_image = await imread_async(test_image_file)
 
     baseline_image_file = 'cake_hard.png'
-    write_input_data_to_fs(input_data, baseline_image_file)
     baseline_image = await imread_async(baseline_image_file)
 
     metrics, difference_image, difference_image_rendering = await compare_images_async(test_image, baseline_images=[baseline_image])
@@ -97,11 +91,9 @@ def write_input_data_to_fs(input_data, filename):
     assert difference_image_rendering.imageType.componentType == 'uint8'
 
     test_image_file = 'apple.jpg'
-    write_input_data_to_fs(input_data, test_image_file)
     test_image = await imread_async(test_image_file)
 
     baseline_image_file = 'orange.jpg'
-    write_input_data_to_fs(input_data, baseline_image_file)
     baseline_image = await imread_async(baseline_image_file)
 
     metrics, difference_image, difference_image_rendering = await compare_images_async(test_image, baseline_images=[baseline_image])

packages/compare-images/python/itkwasm-compare-images-emscripten/test/__init__.py renamed to packages/compare-images/python/itkwasm-compare-images-emscripten/tests/__init__.py

@@ -0,0 +1,16 @@
+import pytest
+import sys
+
+if sys.version_info < (3,10):
+    pytest.skip("Skipping pyodide tests on older Python", allow_module_level=True)
+
+from pytest_pyodide import run_in_pyodide
+from pytest_pyodide.decorator import copy_files_to_pyodide
+from .fixtures import input_file_list
+
+file_list = input_file_list()
+
+@copy_files_to_pyodide(file_list=file_list,install_wheels=True)
+@run_in_pyodide
+async def test_vector_magnitude_async(selenium):
+    from itkwasm_compare_images_emscripten import vector_magnitude_async