Skip to content

Commit cb0a651

Browse files
committed
Migrated 'number_from_name' test to its own test module
1 parent ff3a3ab commit cb0a651

2 files changed

Lines changed: 21 additions & 19 deletions

File tree

tests/client/contexts/test_fib.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
FIBImage,
1515
_file_transferred_to,
1616
_get_source,
17-
_number_from_name,
1817
_parse_boolean,
1918
)
2019
from murfey.util.models import LamellaSiteInfo
@@ -392,24 +391,6 @@ def fib_maps_images(visit_dir: Path):
392391
# -------------------------------------------------------------------------------------
393392

394393

395-
@pytest.mark.parametrize(
396-
"test_params",
397-
( # File name | Expected number
398-
# AutoTEM examples
399-
("Lamella", 1),
400-
("Lamella (2)", 2),
401-
("Lamella (12)", 12),
402-
# Maps examples
403-
("Electron Snapshot", 1),
404-
("Electron Snapshot (3)", 3),
405-
("Electron Snapshot (21)", 21),
406-
),
407-
)
408-
def test_number_from_name(test_params: tuple[str, int]):
409-
name, number = test_params
410-
assert _number_from_name(name) == number
411-
412-
413394
@pytest.mark.parametrize(
414395
"test_params",
415396
( # Input | Expected output

tests/util/test_fib_util.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import pytest
2+
3+
from murfey.util.fib import number_from_name
4+
5+
6+
@pytest.mark.parametrize(
7+
"test_params",
8+
( # File name | Expected number
9+
# AutoTEM examples
10+
("Lamella", 1),
11+
("Lamella (2)", 2),
12+
("Lamella (12)", 12),
13+
# Maps examples
14+
("Electron Snapshot", 1),
15+
("Electron Snapshot (3)", 3),
16+
("Electron Snapshot (21)", 21),
17+
),
18+
)
19+
def test_number_from_name(test_params: tuple[str, int]):
20+
name, number = test_params
21+
assert number_from_name(name) == number

0 commit comments

Comments
 (0)