Refactoring tests.

Author: domdfcoding

requirements.txt

@@ -1,7 +1,7 @@
 attr_utils
 attrs
 chemistry_tools[formulae]
-domdf_python_tools>=0.4.8
+domdf_python_tools>=0.4.9
 enum_tools
 lxml
 pandas

tests/common.py

@@ -8,6 +8,7 @@
 # 3rd party
 import pytest
 from _pytest.mark import MarkDecorator
+from domdf_python_tools.testing import testing_boolean_values
 from domdf_python_tools.utils import Len
 
 whitespace = " \t\n\r"
@@ -28,37 +29,7 @@ def count(stop: int, start: int = 0, step: int = 1) -> MarkDecorator:
 	return pytest.mark.parametrize("count", range(start, stop, step))
 
 
-true_false_strings = [
-		(True, True),
-		("True", True),
-		("true", True),
-		("tRUe", True),
-		('y', True),
-		('Y', True),
-		("YES", True),
-		("yes", True),
-		("Yes", True),
-		("yEs", True),
-		("ON", True),
-		("on", True),
-		('1', True),
-		(1, True),
-		(-1, True),
-		(False, False),
-		("False", False),
-		("false", False),
-		("falSE", False),
-		('n', False),
-		('N', False),
-		("NO", False),
-		("no", False),
-		("nO", False),
-		("OFF", False),
-		("off", False),
-		("oFF", False),
-		('0', False),
-		(0, False),
-		]
+true_false_strings = testing_boolean_values(extra_truthy=[-1]).mark.args[1]
 
 _test_strings = [
 		("foo", "foo"),

tests/test_utils.py

@@ -3,10 +3,10 @@
 
 # 3rd party
 import pytest
+from domdf_python_tools.testing import count, testing_boolean_values, whitespace_perms
 
 # this package
 from mh_utils.utils import as_path, camel_to_snake, element_to_bool
-from tests.common import count, true_false_strings, whitespace_perms
 
 
 class TestAsPath:
@@ -65,12 +65,9 @@ def test_as_path_no_whitespace(
 
 class TestElementToBool:
 
-	@pytest.mark.parametrize(
-			"obj, expects",
-			true_false_strings,
-			)
-	def test_element_to_bool(self, obj, expects):
-		assert element_to_bool(obj) == expects
+	@testing_boolean_values(extra_truthy=[-1])
+	def test_element_to_bool(self, boolean_string, expected_boolean):
+		assert element_to_bool(boolean_string) == expected_boolean
 
 	@pytest.mark.parametrize(
 			"obj, expects",

tests/test_worklist_parser/test_attribute.py

@@ -6,32 +6,6 @@
 from mh_utils.worklist_parser.enums import AttributeType
 
 
-def test_creation():
-	data = Attribute(
-			attribute_id=42,
-			attribute_type=AttributeType.SystemDefined,
-			field_type=7,
-			system_name="  the system_name",
-			header_name="the header_name  ",
-			data_type=1,
-			default_data_value="  the default_data_value\t",
-			reorder_id=22,
-			show_hide_status="False",  # type: ignore
-			column_width=250,
-			)
-
-	assert data.attribute_id == 42
-	assert data.attribute_type == AttributeType.SystemDefined
-	assert data.field_type == 7
-	assert data.system_name == "the system_name"
-	assert data.header_name == "the header_name"
-	assert data.data_type == 1
-	assert data.default_data_value == "the default_data_value"
-	assert data.reorder_id == 22
-	assert data.show_hide_status is False
-	assert data.column_width == 250
-
-
 class FakeXMLElement:
 
 	def __init__(self):
@@ -47,9 +21,30 @@ def __init__(self):
 		self.ColumnWidth = "250"
 
 
-def test_from_xml():
-	element = FakeXMLElement()
-	data = Attribute.from_xml(element)
+data_from_init = Attribute(
+		attribute_id=42,
+		attribute_type=AttributeType.SystemDefined,
+		field_type=7,
+		system_name="  the system_name",
+		header_name="the header_name  ",
+		data_type=1,
+		default_data_value="  the default_data_value\t",
+		reorder_id=22,
+		show_hide_status="False",  # type: ignore
+		column_width=250,
+		)
+
+element = FakeXMLElement()
+data_from_element = data = Attribute.from_xml(element)
+
+
+@pytest.mark.parametrize(
+		"data", [
+				pytest.param(data_from_init, id="from init"),
+				pytest.param(data_from_element, id="from element"),
+				]
+		)
+def test_attribute(data):
 
 	assert data.attribute_id == 42
 	assert data.attribute_type == AttributeType.SystemDefined

tests/test_worklist_parser/test_job_data.py

@@ -1,40 +1,48 @@
 # stdlib
 from uuid import UUID
 
+# 3rd party
+import pytest
+
 # this package
 from mh_utils.worklist_parser.classes import JobData
 from tests.test_worklist_parser.test_parser import FakeSampleElement
 
 
-def test_creation():
+@pytest.mark.parametrize(
+		"id, job_type, run_status",
+		[
+				("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}", 7, 1),
+				("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}", 7, 1),
+				(UUID("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}"), "7", "1"),
+				]
+		)
+def test_creation(id, job_type, run_status):
 	data = JobData(
-			id="{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}",
-			job_type=7,
-			run_status=1,
+			id=id,
+			job_type=job_type,
+			run_status=run_status,
 			)
 
 	assert data.id == UUID("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}")
 	assert data.job_type == 7
 	assert data.run_status == 1
 	assert data.sample_info == {}
 
-	data = JobData(
-			id="{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}",
-			job_type=7,
-			run_status=1,
-			sample_info={"foo": "a string"},
-			)
-
-	assert data.id == UUID("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}")
-	assert data.job_type == 7
-	assert data.run_status == 1
-	assert data.sample_info == {"foo": "a string"}
 
+@pytest.mark.parametrize(
+		"id, job_type, run_status, sample_info",
+		[
+				("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}", 7, 1, {"foo": "a string"}),
+				(UUID("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}"), "7", "1", {"foo": "a string"}),
+				]
+		)
+def test_creation_sample_info(id, job_type, run_status, sample_info):
 	data = JobData(
-			id=UUID("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}"),
-			job_type="7",  # type: ignore
-			run_status="1",  # type: ignore
-			sample_info={"foo": "a string"},
+			id=id,
+			job_type=job_type,
+			run_status=run_status,
+			sample_info=sample_info,
 			)
 
 	assert data.id == UUID("{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}")
@@ -65,40 +73,36 @@ def test_from_xml():
 	assert data.run_status == 1
 
 
-def test_dict():
-	data = JobData(
+@pytest.fixture()
+def sample_jobdata():
+	return JobData(
 			id="{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}",
 			job_type=7,
 			run_status=1,
 			sample_info={"foo": "a string"},
 			)
 
-	assert dict(data) == {
+
+def test_dict(sample_jobdata):
+	assert dict(sample_jobdata) == {
 			"id": "B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C".lower(),
 			"job_type": 7,
 			"run_status": 1,
 			"sample_info": {"foo": "a string"},
 			}
 
 
-def test_repr():
-	data = JobData(
-			id="{B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C}",
-			job_type=7,
-			run_status=1,
-			sample_info={"foo": "a string"},
-			)
-
-	assert str(data).startswith("JobData(")
-	assert str(data).endswith(")")
-	assert str(data) == (
+def test_repr(sample_jobdata):
+	assert str(sample_jobdata).startswith("JobData(")
+	assert str(sample_jobdata).endswith(")")
+	assert str(sample_jobdata) == (
 			"JobData("
 			f"id='{'B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C'.lower()}', "
 			"job_type=7, run_status=1)"
 			)
-	assert repr(data).startswith("JobData(")
-	assert repr(data).endswith(")")
-	assert repr(data) == (
+	assert repr(sample_jobdata).startswith("JobData(")
+	assert repr(sample_jobdata).endswith(")")
+	assert repr(sample_jobdata) == (
 			"JobData("
 			f"id='{'B1F6E4D5-A300-40DF-8FB0-2A26FD8B8C0C'.lower()}', "
 			"job_type=7, run_status=1)"

tests/test_worklist_parser/test_macro.py

@@ -5,8 +5,9 @@
 from mh_utils.worklist_parser.classes import Macro
 
 
-def test_creation():
-	data = Macro(
+@pytest.fixture()
+def sample_macro():
+	return Macro(
 			project_name="the project_name",
 			procedure_name="the procedure_name",
 			input_parameter="the input_parameter",
@@ -15,12 +16,15 @@ def test_creation():
 			display_string="the display_string",
 			)
 
-	assert data.project_name == "the project_name"
-	assert data.procedure_name == "the procedure_name"
-	assert data.input_parameter == "the input_parameter"
-	assert data.output_data_type == 42
-	assert data.output_parameter == "the output_parameter"
-	assert data.display_string == "the display_string"
+
+def test_creation(sample_macro):
+
+	assert sample_macro.project_name == "the project_name"
+	assert sample_macro.procedure_name == "the procedure_name"
+	assert sample_macro.input_parameter == "the input_parameter"
+	assert sample_macro.output_data_type == 42
+	assert sample_macro.output_parameter == "the output_parameter"
+	assert sample_macro.display_string == "the display_string"
 
 
 class FakeXMLElement:
@@ -46,18 +50,11 @@ def test_from_xml():
 	assert data.display_string == "the display_string"
 
 
-def test_undefined_and_repr():
-	macro = Macro(
-			project_name="the project_name",
-			procedure_name="the procedure_name",
-			input_parameter="the input_parameter",
-			output_data_type=42,
-			output_parameter="the output_parameter",
-			display_string="the display_string",
-			)
-	assert not macro.undefined
+def test_undefined_and_repr(sample_macro):
+
+	assert not sample_macro.undefined
 
-	assert str(macro) == (
+	assert str(sample_macro) == (
 			"Macro("
 			"project_name='the project_name', "
 			"procedure_name='the procedure_name', "
@@ -67,7 +64,7 @@ def test_undefined_and_repr():
 			"display_string='the display_string')"
 			)
 
-	assert repr(macro) == (
+	assert repr(sample_macro) == (
 			"Macro("
 			"project_name='the project_name', "
 			"procedure_name='the procedure_name', "

tests/test_worklist_parser/test_parser.py

@@ -5,12 +5,13 @@
 
 # 3rd party
 import pytest
+from domdf_python_tools.testing import count, whitespace_perms
 
 # this package
 from mh_utils.utils import camel_to_snake
 from mh_utils.worklist_parser.classes import Macro
 from mh_utils.worklist_parser.parser import parse_datetime, parse_params, parse_sample_info
-from tests.common import _test_strings, count, true_false_strings, whitespace_perms
+from tests.common import _test_strings, true_false_strings
 
 
 class FakeMacroElement:
@@ -82,7 +83,7 @@ class __TestParseParams_str:
 	def test_parse_params(self, value, expects):
 		e = FakeParamsElement()
 		setattr(e, self.param_under_test, value)
-		params = parse_params(e)
+		params = parse_params(e)  # type: ignore
 		assert params[self.param_dict_name] == expects
 		assert isinstance(params[self.param_dict_name], self.param_type)
 
@@ -427,14 +428,7 @@ def test_whitespace(self, char: str, count: int):
 	@count(100)
 	@whitespace_perms()
 	@dates
-	def test(
-			self,
-			whitespace_pos,
-			count,
-			char,
-			date,
-			expects,
-			):
+	def test(self, whitespace_pos, count, char, date, expects):
 
 		if whitespace_pos == "left":
 			with_whitespace = f"{char * count}{date}"