✅ Refactor tests, consolidate into a single test file for multiple variants

tests/test_advanced/test_decimal/test_tutorial001.py

@@ -1,9 +1,11 @@
+import importlib
+import types
 from decimal import Decimal
-from unittest.mock import patch
 
+import pytest
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import PrintMock, needs_py310  # Import PrintMock for type hint
 
 expected_calls = [
     [
@@ -30,15 +32,20 @@
 ]
 
 
-def test_tutorial():
-    from docs_src.advanced.decimal import tutorial001 as mod
-
-    mod.sqlite_url = "sqlite://"
-    mod.engine = create_engine(mod.sqlite_url)
-    calls = []
+@pytest.fixture(
+    name="module",
+    params=[
+        "tutorial001",
+        pytest.param("tutorial001_py310", marks=needs_py310),
+    ],
+)
+def get_module(request: pytest.FixtureRequest):
+    module_name = request.param
+    return importlib.import_module(f"docs_src.advanced.decimal.{module_name}")
 
-    new_print = get_testing_print_function(calls)
 
-    with patch("builtins.print", new=new_print):
-        mod.main()
-    assert calls == expected_calls
+def test_tutorial(print_mock: PrintMock, module: types.ModuleType):
+    module.sqlite_url = "sqlite://"
+    module.engine = create_engine(module.sqlite_url)
+    module.main()
+    assert print_mock.calls == expected_calls  # Use .calls instead of .mock_calls

tests/test_advanced/test_uuid/test_tutorial001.py

@@ -1,31 +1,42 @@
-from unittest.mock import patch
+import importlib
+import types
 
+import pytest
 from dirty_equals import IsUUID
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import PrintMock, needs_py310
 
 
-def test_tutorial() -> None:
-    from docs_src.advanced.uuid import tutorial001 as mod
+@pytest.fixture(
+    name="module",
+    params=[
+        "tutorial001",
+        pytest.param("tutorial001_py310", marks=needs_py310),
+    ],
+)
+def get_module(request: pytest.FixtureRequest):
+    module_name = request.param
+    return importlib.import_module(f"docs_src.advanced.uuid.{module_name}")
 
-    mod.sqlite_url = "sqlite://"
-    mod.engine = create_engine(mod.sqlite_url)
-    calls = []
 
-    new_print = get_testing_print_function(calls)
+def test_tutorial(print_mock: PrintMock, module: types.ModuleType) -> None:
+    module.sqlite_url = "sqlite://"
+    module.engine = create_engine(module.sqlite_url)
 
-    with patch("builtins.print", new=new_print):
-        mod.main()
-    first_uuid = calls[1][0]["id"]
+    module.main()
+
+    # Extract UUIDs from actual calls recorded by print_mock
+    first_uuid = print_mock.calls[1][0]["id"]
     assert first_uuid == IsUUID(4)
 
-    second_uuid = calls[7][0]["id"]
+    second_uuid = print_mock.calls[7][0]["id"]
     assert second_uuid == IsUUID(4)
 
     assert first_uuid != second_uuid
 
-    assert calls == [
+    # Construct expected_calls using the extracted UUIDs
+    expected_calls = [
         ["The hero before saving in the DB"],
         [
             {
@@ -69,3 +80,4 @@ def test_tutorial() -> None:
         ["Selected hero ID:"],
         [second_uuid],
     ]
+    assert print_mock.calls == expected_calls

tests/test_advanced/test_uuid/test_tutorial002.py

@@ -1,31 +1,42 @@
-from unittest.mock import patch
+import importlib
+import types
 
+import pytest
 from dirty_equals import IsUUID
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import PrintMock, needs_py310
 
 
-def test_tutorial() -> None:
-    from docs_src.advanced.uuid import tutorial002 as mod
+@pytest.fixture(
+    name="module",
+    params=[
+        "tutorial002",
+        pytest.param("tutorial002_py310", marks=needs_py310),
+    ],
+)
+def get_module(request: pytest.FixtureRequest):
+    module_name = request.param
+    return importlib.import_module(f"docs_src.advanced.uuid.{module_name}")
 
-    mod.sqlite_url = "sqlite://"
-    mod.engine = create_engine(mod.sqlite_url)
-    calls = []
 
-    new_print = get_testing_print_function(calls)
+def test_tutorial(print_mock: PrintMock, module: types.ModuleType) -> None:
+    module.sqlite_url = "sqlite://"
+    module.engine = create_engine(module.sqlite_url)
 
-    with patch("builtins.print", new=new_print):
-        mod.main()
-    first_uuid = calls[1][0]["id"]
+    module.main()
+
+    # Extract UUIDs from actual calls recorded by print_mock
+    first_uuid = print_mock.calls[1][0]["id"]
     assert first_uuid == IsUUID(4)
 
-    second_uuid = calls[7][0]["id"]
+    second_uuid = print_mock.calls[7][0]["id"]
     assert second_uuid == IsUUID(4)
 
     assert first_uuid != second_uuid
 
-    assert calls == [
+    # Construct expected_calls using the extracted UUIDs
+    expected_calls = [
         ["The hero before saving in the DB"],
         [
             {
@@ -69,3 +80,4 @@ def test_tutorial() -> None:
         ["Selected hero ID:"],
         [second_uuid],
     ]
+    assert print_mock.calls == expected_calls