chore: use consistent test data path

Author: Test481352

tests/helper.py

@@ -126,12 +126,14 @@ def run_ni_example():
 
 
 def run_multi_contribution_example():
-    ciffile_ni = Path(__file__).parent / "data/ni.cif"
-    ciffile_si = Path(__file__).parent / "data/si.cif"
-    xdata_ni = Path(__file__).parent / "data/ni-q27r60-xray.gr"
-    ndata_ni = Path(__file__).parent / "data/ni-q27r100-neutron.gr"
-    xdata_si = Path(__file__).parent / "data/si-q27r60-xray.gr"
-    xdata_sini = Path(__file__).parent / "data/si90ni10-q27r60-xray.gr"
+    ciffile_ni = str(Path(__file__).parent / "data" / "ni.cif")
+    ciffile_si = str(Path(__file__).parent / "data" / "si.cif")
+    xdata_ni = str(Path(__file__).parent / "data" / "ni-q27r60-xray.gr")
+    ndata_ni = str(Path(__file__).parent / "data" / "ni-q27r100-neutron.gr")
+    xdata_si = str(Path(__file__).parent / "data" / "si-q27r60-xray.gr")
+    xdata_sini = str(
+        Path(__file__).parent / "data" / "si90ni10-q27r60-xray.gr"
+    )
 
     def makeProfile(datafile):
         profile = Profile()

tests/test_parametric_model.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import numpy
 import pytest
 
@@ -10,6 +12,8 @@
 )
 from diffpy.srfit.pdf import PDFParser
 
+_DATA_DIR = Path(__file__).parent / "data"
+
 
 def test_parametric_model_graph():
     # C1: Create a nested parametric model
@@ -59,14 +63,14 @@ def test_parametric_model_evaluation(nested_sine_model, A, a, x, expected):
 def test_parametric_pdf_model_parameters():
     # C1: Create a ParametricModelPDF for Ni
     # Expect the model to be initialized correctly with all parameters
-    profile_path = "tests/data/Ni.gr"
+    profile_path = str(_DATA_DIR / "Ni.gr")
     profile = Profile()
     parser = PDFParser()
     parser.parse_file(profile_path)
     profile.load_parsed_data(parser)
     profile.set_calculation_range(xmax=20)
     pdf_model = ParametricModelPDF(
-        "ni", structure_file_path="tests/data/Ni.cif"
+        "ni", structure_file_path=str(_DATA_DIR / "Ni.cif")
     )
     parameter_names = [
         "ni.phase.lattice.a",

tests/test_refinement_server.py

@@ -1,10 +1,14 @@
+from pathlib import Path
+
 import numpy
 import pytest
 from helper import run_ni_example
 from mcp import Client
 
 from diffpy.apps.refinebase.refinement_server import mcp
 
+_DATA_DIR = Path(__file__).parent / "data"
+
 
 @pytest.fixture
 def anyio_backend():
@@ -22,7 +26,7 @@ async def test_refine_sine():
             "add_profile_from_file",
             {
                 "profile_name": "sine_profile",
-                "profile_path": "tests/data/sine.dat",
+                "profile_path": str(_DATA_DIR / "sine.dat"),
             },
         )
         assert "sine_profile" in session.profiles_dict
@@ -67,7 +71,7 @@ async def test_refine_ni():
             "add_profile_from_file",
             {
                 "profile_name": "ni_profile",
-                "profile_path": "tests/data/Ni.gr",
+                "profile_path": str(_DATA_DIR / "Ni.gr"),
             },
         )
         await mcp_client.call_tool(
@@ -90,7 +94,7 @@ async def test_refine_ni():
             "add_pdf_model",
             {
                 "model_name": "pdf",
-                "structure_file_path": "tests/data/Ni.cif",
+                "structure_file_path": str(_DATA_DIR / "Ni.cif"),
             },
         )
         await mcp_client.call_tool(

tests/test_refinement_session.py

@@ -1,7 +1,11 @@
+from pathlib import Path
+
 import numpy
-from helper import run_multi_contribution_example, run_ni_example
 
 from diffpy.apps.refinebase.refinement_session import RefinementSession
+from helper import run_multi_contribution_example, run_ni_example
+
+_DATA_DIR = Path(__file__).parent / "data"
 
 
 def test_refine_sine(sine_profile):
@@ -42,7 +46,7 @@ def test_refine_ni():
     #  obtained using diffpy.srfit script
     session = RefinementSession()
     session.add_profile_from_file(
-        profile_name="ni_profile", profile_path="tests/data/Ni.gr"
+        profile_name="ni_profile", profile_path=str(_DATA_DIR / "Ni.gr")
     )
     session.set_profile_calculation_range(
         profile_name="ni_profile",
@@ -56,7 +60,7 @@ def test_refine_ni():
     )
     session.add_pdf_model(
         model_name="pdf",
-        structure_file_path="tests/data/Ni.cif",
+        structure_file_path=str(_DATA_DIR / "Ni.cif"),
     )
     session.constrain_pdf_model_space_group_symmetry(
         model_name="pdf", space_group="Fm-3m"
@@ -149,29 +153,28 @@ def test_refine_ni():
 def test_refine_multi_contribution():
     session = RefinementSession()
     session.add_profile_from_file(
-        profile_path="tests/data/ni-q27r60-xray.gr",
+        profile_path=str(_DATA_DIR / "ni-q27r60-xray.gr"),
         profile_name="ni_xray",
     )
     session.add_profile_from_file(
-        profile_path="tests/data/ni-q27r100-neutron.gr",
+        profile_path=str(_DATA_DIR / "ni-q27r100-neutron.gr"),
         profile_name="ni_neutron",
     )
     session.add_profile_from_file(
-        profile_path="tests/data/si-q27r60-xray.gr",
+        profile_path=str(_DATA_DIR / "si-q27r60-xray.gr"),
         profile_name="si_xray",
     )
     session.add_profile_from_file(
-        profile_path="tests/data/si90ni10-q27r60-xray.gr",
+        profile_path=str(_DATA_DIR / "si90ni10-q27r60-xray.gr"),
         profile_name="total_xray",
     )
     session.set_profile_calculation_range(profile_name="ni_xray", xmax=20)
     session.set_profile_calculation_range(profile_name="ni_neutron", xmax=20)
     session.set_profile_calculation_range(profile_name="si_xray", xmax=20)
     session.set_profile_calculation_range(profile_name="total_xray", xmax=20)
     session.add_pdf_model(
-        structure_file_path="tests/data/ni.cif",
+        structure_file_path=str(_DATA_DIR / "Ni.cif"),
         model_name="pdf_ni",
-        # structure_lib="PyObjcryst",
     )
     session.constrain_pdf_model_space_group_symmetry("pdf_ni")
     session.add_pdf_model(
@@ -183,7 +186,7 @@ def test_refine_multi_contribution():
         model_name="pdf_ni_partial",
     )
     session.add_pdf_model(
-        structure_file_path="tests/data/si.cif",
+        structure_file_path=str(_DATA_DIR / "si.cif"),
         model_name="pdf_si",
         structure_lib="PyObjcryst",
     )