Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions tests/bdv/test_define_dataset_auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
from imcflibs.imagej import bdv


def set_default_values(
project_filename, file_path, series_type="Tiles"
):
def set_default_values(project_filename, file_path, series_type="Tiles"):
"""Set the default values for dataset definitions.

Parameters
Expand All @@ -35,7 +33,7 @@ def set_default_values(
+ ".xml"
+ "] "
+ "path=["
+ file_info["path"]
+ file_info["full"]
+ "] "
+ "exclude=10 "
+ "bioformats_series_are?="
Expand Down Expand Up @@ -80,7 +78,7 @@ def test_define_dataset_auto_tile(tmp_path, caplog):
cmd = "Define Multi-View Dataset"

# Set the default values for dataset definitions
options = set_default_values(project_filename, file_path)
options = set_default_values(project_filename, file_info["path"])

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

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

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

# Set the default values for dataset definitions
options = set_default_values(
project_filename, file_path, bf_series_type
)
options = set_default_values(project_filename, file_info["path"], bf_series_type)

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

# Define the dataset using the "Auto-Loader" option
bdv.define_dataset_auto(
project_filename, file_info["path"], bf_series_type
)
bdv.define_dataset_auto(project_filename, file_info["path"], bf_series_type)
# Check if the final call is in the log
assert final_call == caplog.messages[0]
Loading