refactor(test fixtures): Use basic dataclass

Author: tony

tests/fixtures/structures.py

@@ -0,0 +1,13 @@
+import dataclasses
+import typing as t
+
+
+@dataclasses.dataclass
+class TestConfigData:
+    expand1: t.Any
+    expand2: t.Any
+    expand_blank: t.Any
+    sampleconfig: t.Any
+    shell_command_before: t.Any
+    shell_command_before_session: t.Any
+    trickle: t.Any

tests/test_config.py

@@ -1,6 +1,7 @@
 """Test for tmuxp configuration import, inlining, expanding and export."""
 import os
 import pathlib
+import types
 import typing
 from typing import Union
 
@@ -13,7 +14,7 @@
 from .constants import EXAMPLE_PATH
 
 if typing.TYPE_CHECKING:
-    from .fixtures import config as ConfigFixture
+    from .fixtures.structures import TestConfigData
 
 
 @pytest.fixture
@@ -23,9 +24,16 @@ def config_fixture():
     pytest setup (conftest.py) patches os.environ["HOME"], delay execution of
     os.path.expanduser until here.
     """
-    from .fixtures import config as config_fixture
-
-    return config_fixture
+    from .fixtures import config as test_config_data
+    from .fixtures.structures import TestConfigData
+
+    return TestConfigData(
+        **{
+            k: v
+            for k, v in test_config_data.__dict__.items()
+            if isinstance(v, types.ModuleType)
+        }
+    )
 
 
 def load_yaml(path: Union[str, pathlib.Path]) -> str:
@@ -44,7 +52,7 @@ def load_config(path: Union[str, pathlib.Path]) -> str:
     )
 
 
-def test_export_json(tmp_path: pathlib.Path, config_fixture: "ConfigFixture"):
+def test_export_json(tmp_path: pathlib.Path, config_fixture: "TestConfigData"):
     json_config_file = tmp_path / "config.json"
 
     configparser = kaptan.Kaptan()
@@ -59,7 +67,7 @@ def test_export_json(tmp_path: pathlib.Path, config_fixture: "ConfigFixture"):
     assert config_fixture.sampleconfig.sampleconfigdict == new_config_data
 
 
-def test_export_yaml(tmp_path: pathlib.Path, config_fixture: "ConfigFixture"):
+def test_export_yaml(tmp_path: pathlib.Path, config_fixture: "TestConfigData"):
     yaml_config_file = tmp_path / "config.yaml"
 
     configparser = kaptan.Kaptan()
@@ -103,13 +111,13 @@ def test_scan_config(tmp_path: pathlib.Path):
     assert len(configs) == files
 
 
-def test_config_expand1(config_fixture: "ConfigFixture"):
+def test_config_expand1(config_fixture: "TestConfigData"):
     """Expand shell commands from string to list."""
     test_config = config.expand(config_fixture.expand1.before_config)
     assert test_config == config_fixture.expand1.after_config()
 
 
-def test_config_expand2(config_fixture: "ConfigFixture"):
+def test_config_expand2(config_fixture: "TestConfigData"):
     """Expand shell commands from string to list."""
     unexpanded_dict = load_yaml(config_fixture.expand2.unexpanded_yaml())
     expanded_dict = load_yaml(config_fixture.expand2.expanded_yaml())
@@ -228,7 +236,7 @@ def test_inheritance_config():
     assert config == inheritance_config_after
 
 
-def test_shell_command_before(config_fixture: "ConfigFixture"):
+def test_shell_command_before(config_fixture: "TestConfigData"):
     """Config inheritance for the nested 'start_command'."""
     test_config = config_fixture.shell_command_before.config_unexpanded
     test_config = config.expand(test_config)
@@ -239,7 +247,7 @@ def test_shell_command_before(config_fixture: "ConfigFixture"):
     assert test_config == config_fixture.shell_command_before.config_after()
 
 
-def test_in_session_scope(config_fixture: "ConfigFixture"):
+def test_in_session_scope(config_fixture: "TestConfigData"):
     sconfig = load_yaml(config_fixture.shell_command_before_session.before)
 
     config.validate_schema(sconfig)
@@ -250,7 +258,7 @@ def test_in_session_scope(config_fixture: "ConfigFixture"):
     )
 
 
-def test_trickle_relative_start_directory(config_fixture: "ConfigFixture"):
+def test_trickle_relative_start_directory(config_fixture: "TestConfigData"):
     test_config = config.trickle(config_fixture.trickle.before)
     assert test_config == config_fixture.trickle.expected
 
@@ -273,7 +281,7 @@ def test_trickle_window_with_no_pane_config():
     }
 
 
-def test_expands_blank_panes(config_fixture: "ConfigFixture"):
+def test_expands_blank_panes(config_fixture: "TestConfigData"):
     """Expand blank config into full form.
 
     Handle ``NoneType`` and 'blank'::