test: change test format.

Author: stevenhua0320

tests/conftest.py

@@ -1,24 +1,17 @@
 import json
-import os
 from pathlib import Path
 
-import numpy as np
 import pytest
 
-from diffpy.srxplanar.loadimage import LoadImage
 
-
-# ----------------------------------------------------------------------
-# Filesystem fixture following the structured format
-# ----------------------------------------------------------------------
 @pytest.fixture
 def user_filesystem(tmp_path):
     base_dir = Path(tmp_path)
     input_dir = base_dir / "input_dir"
     home_dir = base_dir / "home_dir"
     test_dir = base_dir / "test_dir"
-    for d in (input_dir, home_dir, test_dir):
-        d.mkdir(parents=True, exist_ok=True)
+    for dir in (input_dir, home_dir, test_dir):
+        dir.mkdir(parents=True, exist_ok=True)
 
     home_config_data = {
         "username": "home_username",
@@ -33,82 +26,3 @@ def user_filesystem(tmp_path):
         "home": home_dir,
         "test": test_dir,
     }
-
-
-# ----------------------------------------------------------------------
-# LoadImage test setup
-# ----------------------------------------------------------------------
-@pytest.fixture(scope="module")
-def example_tif():
-    """Locate the example TIFF file relative to repo root."""
-    tif_path = Path("../docs/examples/KFe2As2-00838.tif").resolve()
-    if not tif_path.exists():
-        pytest.skip(f"Example TIFF not found at {tif_path}")
-    return tif_path
-
-
-@pytest.fixture(scope="module")
-def reference_matrix(example_tif):
-    """Load reference matrix directly from the example TIFF once per
-    session."""
-    cfg = type("Cfg", (), {"fliphorizontal": True, "flipvertical": False})()
-    loader = LoadImage(cfg)
-    return loader.loadImage(example_tif)
-
-
-@pytest.fixture
-def loader():
-    cfg = type("Cfg", (), {"fliphorizontal": True, "flipvertical": False})()
-    return LoadImage(cfg)
-
-
-# ----------------------------------------------------------------------
-# Unified test
-# ----------------------------------------------------------------------
-
-
-def test_load_image_all_cases(
-    loader, example_tif, user_filesystem, monkeypatch
-):
-    home_dir = user_filesystem["home"]
-    test_dir = user_filesystem["test"]
-    monkeypatch.setenv("HOME", str(home_dir))
-
-    # Load once as ground truth
-    expected = loader.loadImage(example_tif)
-
-    # ---- Case 1: absolute path ----
-    abs_tif = home_dir / "diffpy.srxplanar/docs/examples/KFe2As2-00838.tif"
-    abs_tif.parent.mkdir(parents=True, exist_ok=True)
-    abs_tif.write_bytes(example_tif.read_bytes())
-    result_abs = loader.loadImage(abs_tif)
-    assert np.array_equal(result_abs, expected)
-
-    # ---- Case 2 & 3: CWD and relative ----
-    cwd_tif = test_dir / example_tif.name
-    cwd_tif.write_bytes(example_tif.read_bytes())
-
-    rel_dir = test_dir / "diffpy.srxplanar/docs/examples"
-    rel_dir.mkdir(parents=True, exist_ok=True)
-    rel_tif = rel_dir / example_tif.name
-    rel_tif.write_bytes(example_tif.read_bytes())
-
-    cwd = Path.cwd()
-    os.chdir(test_dir)
-    try:
-        result_cwd = loader.loadImage(example_tif.name)
-        assert np.array_equal(result_cwd, expected)
-
-        relative_path = (
-            Path("diffpy.srxplanar/docs/examples") / example_tif.name
-        )
-        result_rel = loader.loadImage(relative_path)
-        assert np.array_equal(result_rel, expected)
-
-        # ---- Case 4: missing file ----
-        result_missing = loader.loadImage("nonexistent_file.tif")
-        assert result_missing.shape == (100, 100)
-        assert np.all(result_missing == 0)
-
-    finally:
-        os.chdir(cwd)

tests/test_loadimage.py

@@ -0,0 +1,77 @@
+import os
+from pathlib import Path
+from unittest import mock
+
+import numpy as np
+import pytest
+
+from diffpy.srxplanar.loadimage import LoadImage
+
+PROJECT_ROOT = Path(__file__).resolve().parents[1]
+
+
+def reference_matrix():
+    """Load reference matrix directly from the example TIFF."""
+    tif_path = PROJECT_ROOT / "docs/examples/KFe2As2-00838.tif"
+    cfg = type("Cfg", (), {"fliphorizontal": True, "flipvertical": False})()
+    image_loader = LoadImage(cfg)
+    return image_loader.loadImage(tif_path)
+
+
+def build_loadimage_path(case_tag, home_dir):
+    """Return the Path object for LoadImage test cases.
+
+    case_tag: one of 'abs', 'rel', 'missing'
+    """
+    if case_tag == "abs":
+        return home_dir / "diffpy.srxplanar/docs/examples/KFe2As2-00838.tif"
+    elif case_tag == "rel":
+        return Path("diffpy.srxplanar/docs/examples/KFe2As2-00838.tif")
+    elif case_tag == "missing":
+        return Path("nonexistent_file.tif")
+
+
+load_image_param = load_image_params = [
+    ("abs", PROJECT_ROOT / "docs/examples/KFe2As2-00838.tif"),
+    ("rel", PROJECT_ROOT / "docs/examples/KFe2As2-00838.tif"),
+    ("missing", PROJECT_ROOT / "docs/examples/KFe2As2-00838.tif"),
+]
+
+
+@pytest.mark.parametrize("case_tag,expected_path", load_image_params)
+def test_load_image_cases(
+    user_filesystem, monkeypatch, case_tag, expected_path
+):
+    home_dir = user_filesystem["home"]
+    test_dir = user_filesystem["test"]
+
+    cfg = type("Cfg", (), {"fliphorizontal": True, "flipvertical": False})()
+    loader = LoadImage(cfg)
+
+    with mock.patch.dict(os.environ, {"HOME": str(home_dir)}):
+        expected = loader.loadImage(expected_path)
+
+    expected = loader.loadImage(expected_path)
+
+    abs_file = home_dir / "diffpy.srxplanar/docs/examples/KFe2As2-00838.tif"
+    abs_file.parent.mkdir(parents=True, exist_ok=True)
+    abs_file.write_bytes(expected_path.read_bytes())
+
+    rel_dir = test_dir / "diffpy.srxplanar/docs/examples"
+    rel_dir.mkdir(parents=True, exist_ok=True)
+    rel_file = rel_dir / "KFe2As2-00838.tif"
+    rel_file.write_bytes(expected_path.read_bytes())
+
+    cwd = Path.cwd()
+    os.chdir(test_dir)
+    try:
+        input_path = build_loadimage_path(case_tag, home_dir)
+        result = loader.loadImage(input_path)
+
+        if case_tag == "missing":
+            assert result.shape == (100, 100)
+            assert np.all(result == 0)
+        else:
+            assert np.array_equal(result, expected)
+    finally:
+        os.chdir(cwd)