Skip to content

Commit

Permalink
Update tests (#348)
Browse files Browse the repository at this point in the history
* Remove unused test data dir

* Remove another unused test data directory

* Register custom pytest marker

* lint

* Add coverage

---------

Co-authored-by: Will Graham <32364977+willGraham01@users.noreply.github.com>
Co-authored-by: willGraham01 <1willgraham@gmail.com>
  • Loading branch information
3 people committed Jan 4, 2024
1 parent 84784e2 commit d94a73b
Show file tree
Hide file tree
Showing 297 changed files with 37 additions and 1,604 deletions.
4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ include = ["cellfinder*"]

[tool.setuptools_scm]

[tool.pytest.ini_options]
addopts = "--cov=cellfinder"
markers = ["slow: marks tests as slow (deselect with '-m \"not slow\"')"]

[tool.tox]
legacy_tox_ini = """
# For more information about tox, see https://tox.readthedocs.io/en/latest/
Expand Down
4 changes: 2 additions & 2 deletions tests/core/test_unit/test_tools/test_IO.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from cellfinder.core.tools import IO

BRAIN_DIR = "tests/data/brain"
BRAIN_PATHS = f"{BRAIN_DIR}/brain_paths.txt"
BRAIN_DIR = "tests/data/background"
BRAIN_PATHS = f"{BRAIN_DIR}/background_paths.txt"


def test_read_with_dask_txt():
Expand Down
10 changes: 5 additions & 5 deletions tests/core/test_unit/test_tools/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@

def test_get_subdirectories():
subdirs = system.get_subdirectories(data_dir)
assert len(subdirs) == 9
assert len(subdirs) == 7
assert Path(data_dir / "cells") in subdirs
assert Path(data_dir / "brain") in subdirs
assert Path(data_dir / "background") in subdirs

subdir_names = system.get_subdirectories(data_dir, names_only=True)
assert len(subdir_names) == 9
assert len(subdir_names) == 7
assert "cells" in subdir_names
assert "brain" in subdir_names
assert "background" in subdir_names


def test_get_number_of_files_in_dir():
assert system.get_number_of_files_in_dir(background_im_dir) == 26
assert system.get_number_of_files_in_dir(background_im_dir) == 27


def write_file_single_size(directory, file_size):
Expand Down
26 changes: 26 additions & 0 deletions tests/data/background/background_paths.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
tests/data/background/background_ch010010.tif
tests/data/background/background_ch010023.tif
tests/data/background/background_ch010019.tif
tests/data/background/background_ch010022.tif
tests/data/background/background_ch010015.tif
tests/data/background/background_ch010002.tif
tests/data/background/background_ch010005.tif
tests/data/background/background_ch010021.tif
tests/data/background/background_ch010000.tif
tests/data/background/background_ch010008.tif
tests/data/background/background_ch010007.tif
tests/data/background/background_ch010006.tif
tests/data/background/background_ch010004.tif
tests/data/background/background_ch010014.tif
tests/data/background/background_ch010011.tif
tests/data/background/background_ch010017.tif
tests/data/background/background_ch010003.tif
tests/data/background/background_ch010018.tif
tests/data/background/background_ch010020.tif
tests/data/background/background_ch010025.tif
tests/data/background/background_ch010013.tif
tests/data/background/background_ch010009.tif
tests/data/background/background_ch010016.tif
tests/data/background/background_ch010012.tif
tests/data/background/background_ch010001.tif
tests/data/background/background_ch010024.tif
270 changes: 0 additions & 270 deletions tests/data/brain/brain_paths.txt

This file was deleted.

Binary file removed tests/data/brain/image_0000.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0001.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0002.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0003.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0004.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0005.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0006.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0007.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0008.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0009.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0010.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0011.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0012.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0013.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0014.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0015.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0016.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0017.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0018.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0019.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0020.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0021.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0022.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0023.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0024.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0025.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0026.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0027.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0028.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0029.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0030.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0031.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0032.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0033.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0034.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0035.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0036.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0037.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0038.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0039.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0040.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0041.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0042.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0043.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0044.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0045.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0046.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0047.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0048.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0049.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0050.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0051.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0052.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0053.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0054.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0055.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0056.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0057.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0058.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0059.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0060.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0061.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0062.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0063.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0064.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0065.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0066.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0067.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0068.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0069.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0070.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0071.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0072.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0073.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0074.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0075.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0076.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0077.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0078.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0079.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0080.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0081.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0082.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0083.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0084.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0085.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0086.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0087.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0088.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0089.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0090.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0091.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0092.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0093.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0094.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0095.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0096.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0097.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0098.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0099.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0100.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0101.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0102.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0103.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0104.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0105.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0106.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0107.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0108.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0109.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0110.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0111.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0112.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0113.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0114.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0115.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0116.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0117.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0118.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0119.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0120.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0121.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0122.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0123.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0124.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0125.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0126.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0127.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0128.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0129.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0130.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0131.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0132.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0133.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0134.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0135.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0136.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0137.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0138.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0139.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0140.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0141.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0142.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0143.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0144.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0145.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0146.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0147.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0148.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0149.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0150.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0151.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0152.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0153.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0154.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0155.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0156.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0157.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0158.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0159.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0160.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0161.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0162.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0163.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0164.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0165.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0166.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0167.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0168.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0169.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0170.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0171.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0172.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0173.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0174.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0175.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0176.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0177.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0178.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0179.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0180.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0181.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0182.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0183.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0184.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0185.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0186.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0187.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0188.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0189.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0190.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0191.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0192.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0193.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0194.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0195.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0196.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0197.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0198.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0199.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0200.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0201.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0202.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0203.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0204.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0205.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0206.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0207.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0208.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0209.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0210.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0211.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0212.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0213.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0214.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0215.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0216.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0217.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0218.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0219.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0220.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0221.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0222.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0223.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0224.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0225.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0226.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0227.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0228.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0229.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0230.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0231.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0232.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0233.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0234.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0235.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0236.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0237.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0238.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0239.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0240.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0241.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0242.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0243.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0244.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0245.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0246.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0247.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0248.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0249.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0250.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0251.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0252.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0253.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0254.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0255.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0256.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0257.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0258.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0259.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0260.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0261.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0262.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0263.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0264.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0265.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0266.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0267.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0268.tif
Binary file not shown.
Binary file removed tests/data/brain/image_0269.tif
Binary file not shown.
Binary file removed tests/data/registration_output/Linux/boundaries.tiff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit d94a73b

Please sign in to comment.