Add type more hints to tests.

Author: domdfcoding

tests/test_dates.py

@@ -9,6 +9,7 @@
 # stdlib
 import re
 from datetime import date, datetime, timedelta
+from typing import Union
 
 # 3rd party
 import pytest
@@ -177,7 +178,7 @@ def test_parse_month():
 
 
 @pytest.mark.parametrize("month_idx, month", enumerate(month_full_names))
-def test_get_month_number_from_name(month_idx, month):
+def test_get_month_number_from_name(month_idx: int, month: str):
 	month_idx += 1  # to make 1-indexed
 
 	for i in range(3, len(month)):
@@ -189,7 +190,7 @@ def test_get_month_number_from_name(month_idx, month):
 
 
 @count(13, 1)
-def test_get_month_number_from_no(count):
+def test_get_month_number_from_no(count: int):
 	assert dates.get_month_number(count) == count
 
 
@@ -205,7 +206,7 @@ def test_get_month_number_from_no(count):
 				("13", "The given month ('13') is not recognised."),
 				]
 		)
-def test_get_month_number_errors(value, match):
+def test_get_month_number_errors(value: Union[str, int], match: str):
 	with pytest.raises(ValueError, match=re.escape(match)):
 		dates.get_month_number(value)
 

tests/test_paths.py

@@ -612,7 +612,7 @@ def test_load_json(tmpdir):
 	assert tmp_file.load_json() == {"key": "value", "int": 1234, "float": 12.34}
 
 
-def test_in_directory(tmp_pathplus):
+def test_in_directory(tmp_pathplus: PathPlus):
 	cwd = os.getcwd()
 
 	with in_directory(tmp_pathplus):
@@ -638,7 +638,7 @@ def test_in_directory(tmp_pathplus):
 				("foo/bar/baz/foo.yml", "foo/bar/baz"),
 				]
 		)
-def test_traverse_to_file(tmp_pathplus, location, expected):
+def test_traverse_to_file(tmp_pathplus: PathPlus, location: str, expected: str):
 	(tmp_pathplus / location).parent.maybe_make(parents=True)
 	(tmp_pathplus / location).touch()
 	assert traverse_to_file(tmp_pathplus / "foo" / "bar" / "baz", "foo.yml") == tmp_pathplus / expected
@@ -647,7 +647,7 @@ def test_traverse_to_file(tmp_pathplus, location, expected):
 # TODO: height
 
 
-def test_traverse_to_file_errors(tmp_pathplus):
+def test_traverse_to_file_errors(tmp_pathplus: PathPlus):
 	(tmp_pathplus / "foo/bar/baz").parent.maybe_make(parents=True)
 	if os.sep == '/':
 		with pytest.raises(FileNotFoundError, match="'foo.yml' not found in .*/foo/bar/baz"):
@@ -702,7 +702,7 @@ def test_iterchildren_match(data_regression: DataRegressionFixture):
 	data_regression.check(child_paths)
 
 
-def test_iterchildren_no_exclusions(tmp_pathplus):
+def test_iterchildren_no_exclusions(tmp_pathplus: PathPlus):
 	(tmp_pathplus / ".git").mkdir()
 	(tmp_pathplus / "venv").mkdir()
 	(tmp_pathplus / ".venv").mkdir()
@@ -800,5 +800,5 @@ def test_iterchildren_no_exclusions(tmp_pathplus):
 				("domdf_python_tools/**/*.py", "domdf_python_tools/domdf_python_tools/pagesizes/units.py", True),
 				]
 		)
-def test_globpath(pattern, filename, match: bool):
+def test_globpath(pattern: str, filename: str, match: bool):
 	assert matchglob(filename, pattern) is match

tests/test_paths_stdlib.py

@@ -69,7 +69,7 @@ def symlink_skip_reason():
 
 
 @pytest.fixture()
-def BASE(tmp_pathplus):
+def BASE(tmp_pathplus: PathPlus):
 	top_dir = tmp_pathplus
 	tmp_pathplus = top_dir / "a/b/c/d"
 	tmp_pathplus.maybe_make(parents=True)
@@ -276,7 +276,7 @@ def test_link_to_not_implemented(BASE):
 		p.link_to(q)
 
 
-def test_rename(BASE, tmp_pathplus):
+def test_rename(BASE, tmp_pathplus: PathPlus):
 	P = PathPlus(BASE)
 	p = P / "fileA"
 	size = p.stat().st_size
@@ -558,15 +558,15 @@ def test_is_socket_false(BASE):
 	assert not (P / "fileA" / "bah").is_socket()
 
 
-def test_is_block_device_false(tmp_pathplus):
+def test_is_block_device_false(tmp_pathplus: PathPlus):
 	P = tmp_pathplus.resolve() / TESTFN
 	assert not (P / "fileA").is_block_device()
 	assert not (P / "dirA").is_block_device()
 	assert not (P / "non-existing").is_block_device()
 	assert not (P / "fileA" / "bah").is_block_device()
 
 
-def test_is_char_device_false(tmp_pathplus):
+def test_is_char_device_false(tmp_pathplus: PathPlus):
 	P = tmp_pathplus.resolve() / TESTFN
 	assert not (P / "fileA").is_char_device()
 	assert not (P / "dirA").is_char_device()
@@ -609,7 +609,7 @@ def test_unsupported_flavour():
 			pathlib.WindowsPath()
 
 
-def test_glob_empty_pattern(tmp_pathplus):
+def test_glob_empty_pattern(tmp_pathplus: PathPlus):
 	p = tmp_pathplus
 	with pytest.raises(ValueError, match="Unacceptable pattern"):
 		list(p.glob(''))

tests/test_testing.py

@@ -210,15 +210,12 @@ def test_only_macos():
 		assert False  # noqa: PT015
 
 
-pytest_plugins = ("domdf_python_tools.testing", )
-
-
-def test_tmp_pathplus(tmp_pathplus):
+def test_tmp_pathplus(tmp_pathplus: PathPlus):
 	assert isinstance(tmp_pathplus, PathPlus)
 	assert tmp_pathplus.exists()
 
 
-def test_check_file_output(tmp_pathplus, file_regression: FileRegressionFixture):
+def test_check_file_output(tmp_pathplus: PathPlus, file_regression: FileRegressionFixture):
 	with pytest.raises(FileNotFoundError, match="No such file or directory: '.*'"):
 		check_file_output(tmp_pathplus / "file.txt", file_regression)
 
@@ -248,7 +245,7 @@ def test_fixed_datetime(fixed_datetime):
 				pytest.param(datetime.datetime(2020, 7, 4, 10, 00), datetime.datetime(2020, 7, 4), id='1'),
 				]
 		)
-def test_with_fixed_datetime(fake_datetime, expected_date):
+def test_with_fixed_datetime(fake_datetime, expected_date: datetime.datetime):
 
 	with with_fixed_datetime(fake_datetime):
 		assert datetime.datetime.today() == expected_date

tests/test_words.py

@@ -3,6 +3,7 @@
 import pathlib
 import random
 import string
+from typing import List
 
 # 3rd party
 import pytest
@@ -24,7 +25,7 @@
 				(500, ["tuning", "knowledgestorm", "backing", "motivation", "calculated"]),
 				],
 		)
-def test_get_random_word(seed, expected_values):
+def test_get_random_word(seed: int, expected_values: List[str]):
 	random.seed(seed)
 
 	for i in range(5):