more

Author: sappelhoff

mne_bids/commands/tests/test_cli.py

@@ -95,8 +95,8 @@ def test_raw_to_bids(tmp_path):
         mne_bids_raw_to_bids.run()
 
     # Test EDF files as well
-    edf_data_path = op.join(base_path, "edf", "tests", "data")
-    edf_fname = op.join(edf_data_path, "test.edf")
+    edf_data_path = base_path / "edf" / "tests" / "data"
+    edf_fname = edf_data_path / "test.edf"
     with ArgvSetter(
         (
             "--subject_id",
@@ -125,9 +125,9 @@ def test_raw_to_bids(tmp_path):
 def test_cp(tmp_path):
     """Test mne_bids cp."""
     output_path = str(tmp_path)
-    data_path = op.join(base_path, "brainvision", "tests", "data")
-    raw_fname = op.join(data_path, "test.vhdr")
-    outname = op.join(output_path, "test2.vhdr")
+    data_path = base_path / "brainvision" / "tests" / "data"
+    raw_fname = data_path / "test.vhdr"
+    outname = output_path / "test2.vhdr"
 
     # Check that help is printed
     check_usage(mne_bids_cp)

mne_bids/tests/test_copyfiles.py

@@ -30,8 +30,8 @@
 @testing.requires_testing_data
 def test_get_brainvision_encoding():
     """Test getting the file-encoding from a BrainVision header."""
-    data_path = op.join(base_path, "brainvision", "tests", "data")
-    raw_fname = op.join(data_path, "test.vhdr")
+    data_path = base_path / "brainvision" / "tests" / "data"
+    raw_fname = data_path / "test.vhdr"
 
     with pytest.raises(UnicodeDecodeError):
         with open(raw_fname, encoding="ascii") as f:
@@ -44,11 +44,11 @@ def test_get_brainvision_encoding():
 
 def test_get_brainvision_paths(tmp_path):
     """Test getting the file links from a BrainVision header."""
-    data_path = op.join(base_path, "brainvision", "tests", "data")
-    raw_fname = op.join(data_path, "test.vhdr")
+    data_path = base_path / "brainvision" / "tests" / "data"
+    raw_fname = data_path / "test.vhdr"
 
     with pytest.raises(ValueError):
-        _get_brainvision_paths(op.join(data_path, "test.eeg"))
+        _get_brainvision_paths(data_path / "test.eeg")
 
     # Write some temporary test files
     with open(tmp_path / "test1.vhdr", "w") as f:
@@ -76,10 +76,10 @@ def test_get_brainvision_paths(tmp_path):
 )
 def test_copyfile_brainvision(tmp_path):
     """Test the copying of BrainVision vhdr, vmrk and eeg files."""
-    bids_root = str(tmp_path)
-    data_path = op.join(base_path, "brainvision", "tests", "data")
-    raw_fname = op.join(data_path, "test.vhdr")
-    new_name = op.join(bids_root, "tested_conversion.vhdr")
+    bids_root = tmp_path
+    data_path = base_path / "brainvision" / "tests" / "data"
+    raw_fname = data_path / "test.vhdr"
+    new_name = bids_root / "tested_conversion.vhdr"
 
     # IO error testing
     with pytest.raises(ValueError, match="Need to move data with same"):
@@ -112,18 +112,18 @@ def test_copyfile_edf(tmp_path):
     """Test the anonymization of EDF/BDF files."""
     bids_root = tmp_path / "bids1"
     bids_root.mkdir()
-    data_path = op.join(base_path, "edf", "tests", "data")
+    data_path = base_path / "edf" / "tests" / "data"
 
     # Test regular copying
     for ext in [".edf", ".bdf"]:
-        raw_fname = op.join(data_path, "test" + ext)
-        new_name = op.join(bids_root, "test_copy" + ext)
+        raw_fname = data_path / f"test{ext}"
+        new_name = bids_root / f"test_copy{ext}"
         copyfile_edf(raw_fname, new_name)
 
     # IO error testing
     with pytest.raises(ValueError, match="Need to move data with same"):
-        raw_fname = op.join(data_path, "test.edf")
-        new_name = op.join(bids_root, "test_copy.bdf")
+        raw_fname = data_path / "test.edf"
+        new_name = bids_root / "test_copy.bdf"
         copyfile_edf(raw_fname, new_name)
 
     # Add some subject info to an EDF to test anonymization
@@ -184,7 +184,7 @@ def test_copyfile_edfbdf_uppercase(tmp_path):
     """Test the copying of EDF/BDF files with upper-case extension."""
     bids_root = tmp_path / "bids1"
     bids_root.mkdir()
-    data_path = op.join(base_path, "edf", "tests", "data")
+    data_path = base_path / "edf" / "tests" / "data"
 
     # Test regular copying
     for ext in [".edf", ".bdf"]:
@@ -226,7 +226,7 @@ def test_copyfile_eeglab(tmp_path, fname):
 def test_copyfile_kit(tmp_path):
     """Test copying and renaming KIT files to a new location."""
     output_path = str(tmp_path)
-    data_path = op.join(base_path, "kit", "tests", "data")
+    data_path = base_path / "kit" / "tests" / "data"
     raw_fname = op.join(data_path, "test.sqd")
     hpi_fname = op.join(data_path, "test_mrk.sqd")
     electrode_fname = op.join(data_path, "test.elp")

mne_bids/tests/test_utils.py

@@ -149,7 +149,7 @@ def test_age_on_date():
 def test_infer_eeg_placement_scheme():
     """Test inferring a correct EEG placement scheme."""
     # no eeg channels case (e.g., MEG data)
-    data_path = op.join(base_path, "bti", "tests", "data")
+    data_path = base_path / "bti" / "tests" / "data"
     raw_fname = op.join(data_path, "test_pdf_linux")
     config_fname = op.join(data_path, "test_config_linux")
     headshape_fname = op.join(data_path, "test_hs_linux")
@@ -158,7 +158,7 @@ def test_infer_eeg_placement_scheme():
     assert placement_scheme == "n/a"
 
     # 1020 case
-    data_path = op.join(base_path, "brainvision", "tests", "data")
+    data_path = base_path / "brainvision" / "tests" / "data"
     raw_fname = op.join(data_path, "test.vhdr")
     raw = mne.io.read_raw_brainvision(raw_fname)
     placement_scheme = _infer_eeg_placement_scheme(raw)