Refactor test files to replace any import pytest with from pytest import ... for improved consistency

Author: chrimaho

src/tests/test_bools.py

@@ -14,8 +14,8 @@
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
-import pytest
 from parameterized import parameterized
+from pytest import raises
 
 # ## Local First Party Imports ----
 from tests.setup import name_func_nested_list
@@ -44,5 +44,5 @@ def test_strtobool(self, _expected: bool, _input: str) -> None:
 
     def test_strtobool_raises(self) -> None:
         _input = 5
-        with pytest.raises(ValueError):
+        with raises(ValueError):
             _output: bool = strtobool(_input)

src/tests/test_checkers.py

@@ -15,8 +15,8 @@
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
-import pytest
 from parameterized import parameterized
+from pytest import raises
 
 # ## Local First Party Imports ----
 from tests.setup import (
@@ -137,7 +137,7 @@ def test_is_value_of_type(
             assert_type(_val, _typ)
             assert_value_of_type(_val, _typ)
         else:
-            with pytest.raises(TypeError):
+            with raises(TypeError):
                 assert_type(_val, _typ)
                 assert_value_of_type(_val, _typ)
 
@@ -187,7 +187,7 @@ def test_is_all_values_of_type(
             assert_all_values_of_type(_vals, _typ)
             assert_all_type(_vals, _typ)
         else:
-            with pytest.raises(TypeError):
+            with raises(TypeError):
                 assert_all_values_of_type(_vals, _typ)
                 assert_all_type(_vals, _typ)
 
@@ -237,7 +237,7 @@ def test_is_any_values_of_type(
             assert_any_values_of_type(_vals, _typ)
             assert_any_type(_vals, _typ)
         else:
-            with pytest.raises(TypeError):
+            with raises(TypeError):
                 assert_any_values_of_type(_vals, _typ)
                 assert_any_type(_vals, _typ)
 
@@ -295,27 +295,27 @@ def test_is_any_values_in_iterable(self, _nam: str, _vals: Any) -> None:
         assert_any_in(_val, _vals)
 
     def test_raises_assert_value_of_type(self) -> None:
-        with pytest.raises(TypeError):
+        with raises(TypeError):
             assert_value_of_type(5, str)
             assert_value_of_type("5", int)
 
     def test_raises_all_values_of_type(self) -> None:
-        with pytest.raises(TypeError):
+        with raises(TypeError):
             assert_all_values_of_type((1, 2, 3, 4, 5), str)
             assert_all_values_of_type(("1", "2", "3", "4", "5"), int)
 
     def test_raises_assert_value_in_iterable(self) -> None:
-        with pytest.raises(LookupError):
+        with raises(LookupError):
             assert_value_in_iterable("a", (1, 2, 3))
             assert_value_in_iterable(1, ("a", "b", "c"))
 
     def test_raises_assert_any_values_in_iterable(self) -> None:
-        with pytest.raises(LookupError):
+        with raises(LookupError):
             assert_any_values_in_iterable(("a", "b"), (1, 2, 3))
             assert_any_values_in_iterable((1, 2), ("a", "b", "c"))
 
     def test_raises_assert_all_values_in_iterable(self) -> None:
-        with pytest.raises(LookupError):
+        with raises(LookupError):
             assert_all_values_in_iterable(("a", "d"), ("a", "b", "c"))
 
 
@@ -449,9 +449,9 @@ def test_assert_is_valid(self, _val: Any, _op: str, _targ: Any) -> None:
         name_func=name_func_flat_list,
     )
     def test_assert_not_is_valid(self, _val: Any, _op: str, _targ: Any) -> None:
-        with pytest.raises(ValueError):
+        with raises(ValueError):
             assert_is_valid(_val, _op, _targ)
 
     def test_assert_is_valid_unknown_operator(self) -> None:
-        with pytest.raises(ValueError):
+        with raises(ValueError):
             assert_is_valid(5, "unknown", 10)

src/tests/test_defaults.py

@@ -14,8 +14,8 @@
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
-import pytest
 from parameterized import parameterized
+from pytest import raises
 
 # ## Local First Party Imports ----
 from tests.setup import name_func_nested_list
@@ -75,9 +75,9 @@ def test_defaults_cast_strings(self, cast_type, cast_value) -> None:
         assert _output == _expected
 
     def test_defaults_invalid_cast(self) -> None:
-        with pytest.raises(AttributeError):
+        with raises(AttributeError):
             defaults(value="next", cast="bad_type")
 
     def test_defaults_all_blank(self) -> None:
-        with pytest.raises(AttributeError):
+        with raises(AttributeError):
             defaults(value=None, default=None)

src/tests/test_dictionaries.py

@@ -15,7 +15,7 @@
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
-import pytest
+from pytest import raises
 
 # ## Local First Party Imports ----
 from toolbox_python.checkers import assert_type
@@ -113,7 +113,7 @@ def test_reverse_dict_iterables_with_duplicates(self) -> None:
             r"Full `output_dict` so far:\n"
             r"{'1': 'a', '2': 'a', '3': 'a', '4': 'b'}"
         )
-        with pytest.raises(KeyError) as execinfo:
+        with raises(KeyError) as execinfo:
             _output = dict_reverse_keys_and_values(_input)
         assert str(execinfo.value) == f'"{_expected}"'
 
@@ -166,7 +166,7 @@ def test_dict_init(self) -> None:
     def test_dict_values(self) -> None:
         assert self.dot_dict.version == 1.0
         assert self.dot_dict.title == "Sample Dictionary"
-        with pytest.raises(AttributeError):
+        with raises(AttributeError):
             assert self.dot_dict.missing == "Missing Key"
 
     def test_dict_nested_values(self) -> None:
@@ -204,9 +204,9 @@ def test_dict_add_new_key(self) -> None:
         self.dot_dict["key_two"] = "New Value"
         assert self.dot_dict["key_two"] == "New Value"
         del self.dot_dict["key_two"]
-        with pytest.raises(KeyError):
+        with raises(KeyError):
             del self.dot_dict["missing_key"]
-        with pytest.raises(AttributeError):
+        with raises(AttributeError):
             del self.dot_dict.missing_key
 
     def test_convert_to_dict(self) -> None:
@@ -215,7 +215,7 @@ def test_convert_to_dict(self) -> None:
         assert dict_from_dotdict == self.test_dict
         assert dict_from_dotdict["user"]["name"] == "John"
         assert dict_from_dotdict["list_objects"][0]["name"] == "Item 1"
-        with pytest.raises(AttributeError):
+        with raises(AttributeError):
             dict_from_dotdict.version
             dict_from_dotdict.title
 

src/tests/test_output.py

@@ -18,9 +18,9 @@
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
-import pytest
 import requests
 from parameterized import parameterized
+from pytest import CaptureFixture, LogCaptureFixture, fixture, raises
 from typeguard import TypeCheckError
 
 # ## Local First Party Imports ----
@@ -42,12 +42,10 @@ def setUpClass(cls) -> None:
         cls.message = "Message for:"
         cls.log: logging.Logger = logging.getLogger(__name__)
 
-    @pytest.fixture(autouse=True)
-    def _pass_fixtures(
-        self, capsys: pytest.CaptureFixture, caplog: pytest.LogCaptureFixture
-    ) -> None:
-        self.capsys: pytest.CaptureFixture = capsys
-        self.caplog: pytest.LogCaptureFixture = caplog
+    @fixture(autouse=True)
+    def _pass_fixtures(self, capsys: CaptureFixture, caplog: LogCaptureFixture) -> None:
+        self.capsys: CaptureFixture = capsys
+        self.caplog: LogCaptureFixture = caplog
         self.caplog.set_level("notset".upper())
 
     def test_print_output(self) -> None:
@@ -114,14 +112,14 @@ def test_log_critical_output(self) -> None:
         self.caplog.clear()
 
     def test_invalid_input(self) -> None:
-        with pytest.raises(TypeCheckError):
+        with raises(TypeCheckError):
             print_or_log_output(
                 message=f"{self.message} none",
                 print_or_log="invalid",
             )
 
     def test_raises_type_error(self) -> None:
-        with pytest.raises(TypeError):
+        with raises(TypeError):
             print_or_log_output(
                 message=f"{self.message} error",
                 print_or_log="log",
@@ -130,7 +128,7 @@ def test_raises_type_error(self) -> None:
             )
 
     def test_raises_value_error(self) -> None:
-        with pytest.raises(ValueError):
+        with raises(ValueError):
             print_or_log_output(
                 message=f"{self.message} error",
                 print_or_log="log",
@@ -139,7 +137,7 @@ def test_raises_value_error(self) -> None:
             )
 
     def test_invalid_input_01(self) -> None:
-        with pytest.raises(TypeCheckError):
+        with raises(TypeCheckError):
             print_or_log_output(
                 message=1,
                 print_or_log="log",
@@ -148,7 +146,7 @@ def test_invalid_input_01(self) -> None:
             )
 
     def test_invalid_input_02(self) -> None:
-        with pytest.raises(TypeCheckError):
+        with raises(TypeCheckError):
             print_or_log_output(
                 message=self.message,
                 print_or_log="invalid",
@@ -157,7 +155,7 @@ def test_invalid_input_02(self) -> None:
             )
 
     def test_invalid_input_03(self) -> None:
-        with pytest.raises(TypeCheckError):
+        with raises(TypeCheckError):
             print_or_log_output(
                 message=self.message,
                 print_or_log="log",
@@ -166,7 +164,7 @@ def test_invalid_input_03(self) -> None:
             )
 
     def test_invalid_input_04(self) -> None:
-        with pytest.raises(TypeCheckError):
+        with raises(TypeCheckError):
             print_or_log_output(
                 message=self.message,
                 print_or_log="log",
@@ -180,9 +178,9 @@ class TestListColumnsOutput(TestCase):
     def setUp(self) -> None:
         pass
 
-    @pytest.fixture(autouse=True)
-    def _pass_fixtures(self, capsys: pytest.CaptureFixture) -> None:
-        self.capsys: pytest.CaptureFixture = capsys
+    @fixture(autouse=True)
+    def _pass_fixtures(self, capsys: CaptureFixture) -> None:
+        self.capsys: CaptureFixture = capsys
 
     @staticmethod
     @lru_cache

src/tests/test_retry.py

@@ -15,7 +15,7 @@
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
-import pytest
+from pytest import CaptureFixture, LogCaptureFixture, fixture
 
 # ## Local First Party Imports ----
 from toolbox_python.retry import retry
@@ -53,10 +53,12 @@ class TestRetryDecorator(TestCase):
     def setUp(self) -> None:
         pass
 
-    @pytest.fixture(autouse=True)
-    def _pass_fixtures(self, capsys, caplog) -> None:
-        self.capsys: pytest.CaptureFixture = capsys
-        self.caplog: pytest.LogCaptureFixture = caplog
+    @fixture(autouse=True)
+    def _pass_fixtures(
+        self, capsys: CaptureFixture[str], caplog: LogCaptureFixture
+    ) -> None:
+        self.capsys: CaptureFixture = capsys
+        self.caplog: LogCaptureFixture = caplog
         self.caplog.set_level("notset".upper())
 
     @staticmethod