Skip to content

Commit 02b89ed

Browse files
authored
Merge pull request #73 from lguerard/issues/32
Fix path with BDV test
2 parents c42af0a + ebb5e96 commit 02b89ed

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

tests/bdv/test_define_dataset_auto.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
from imcflibs.imagej import bdv
77

88

9-
def set_default_values(
10-
project_filename, file_path, series_type="Tiles"
11-
):
9+
def set_default_values(project_filename, file_path, series_type="Tiles"):
1210
"""Set the default values for dataset definitions.
1311
1412
Parameters
@@ -35,7 +33,7 @@ def set_default_values(
3533
+ ".xml"
3634
+ "] "
3735
+ "path=["
38-
+ file_info["path"]
36+
+ file_info["full"]
3937
+ "] "
4038
+ "exclude=10 "
4139
+ "bioformats_series_are?="
@@ -80,7 +78,7 @@ def test_define_dataset_auto_tile(tmp_path, caplog):
8078
cmd = "Define Multi-View Dataset"
8179

8280
# Set the default values for dataset definitions
83-
options = set_default_values(project_filename, file_path)
81+
options = set_default_values(project_filename, file_info["path"])
8482

8583
# Construct the options for dataset definitions
8684
options = (
@@ -106,9 +104,7 @@ def test_define_dataset_auto_tile(tmp_path, caplog):
106104
final_call = "IJ.run(cmd=[%s], params=[%s])" % (cmd, options)
107105

108106
# Define the dataset using the "Auto-Loader" option
109-
bdv.define_dataset_auto(
110-
project_filename, file_info["path"], bf_series_type
111-
)
107+
bdv.define_dataset_auto(project_filename, file_info["path"], bf_series_type)
112108
# Check if the final call is in the log
113109
assert final_call == caplog.messages[0]
114110

@@ -146,9 +142,7 @@ def test_define_dataset_auto_angle(tmp_path, caplog):
146142
cmd = "Define Multi-View Dataset"
147143

148144
# Set the default values for dataset definitions
149-
options = set_default_values(
150-
project_filename, file_path, bf_series_type
151-
)
145+
options = set_default_values(project_filename, file_info["path"], bf_series_type)
152146

153147
# Construct the options for dataset definitions
154148
options = (
@@ -175,8 +169,6 @@ def test_define_dataset_auto_angle(tmp_path, caplog):
175169
final_call = "IJ.run(cmd=[%s], params=[%s])" % (cmd, options)
176170

177171
# Define the dataset using the "Auto-Loader" option
178-
bdv.define_dataset_auto(
179-
project_filename, file_info["path"], bf_series_type
180-
)
172+
bdv.define_dataset_auto(project_filename, file_info["path"], bf_series_type)
181173
# Check if the final call is in the log
182174
assert final_call == caplog.messages[0]

0 commit comments

Comments
 (0)