Tests: Improved parametrization

tests/cli/test_cli.py

@@ -31,14 +31,32 @@ def test_creates_config_dir_not_exists(tmp_path: pathlib.Path) -> None:
     assert tmp_path.exists()
 
 
+class HelpTestFixture(t.NamedTuple):
+    """Test fixture for help command tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+HELP_TEST_FIXTURES: list[HelpTestFixture] = [
+    HelpTestFixture(
+        test_id="help_long_flag",
+        cli_args=["--help"],
+    ),
+    HelpTestFixture(
+        test_id="help_short_flag",
+        cli_args=["-h"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    "cli_args",
-    [
-        (["--help"]),
-        (["-h"]),
-    ],
+    list(HelpTestFixture._fields),
+    HELP_TEST_FIXTURES,
+    ids=[test.test_id for test in HELP_TEST_FIXTURES],
 )
 def test_help(
+    test_id: str,
     cli_args: list[str],
     tmp_path: pathlib.Path,
     monkeypatch: pytest.MonkeyPatch,

tests/cli/test_convert.py

@@ -15,17 +15,44 @@
     import pathlib
 
 
+class ConvertTestFixture(t.NamedTuple):
+    """Test fixture for tmuxp convert command tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+CONVERT_TEST_FIXTURES: list[ConvertTestFixture] = [
+    ConvertTestFixture(
+        test_id="convert_current_dir",
+        cli_args=["convert", "."],
+    ),
+    ConvertTestFixture(
+        test_id="convert_yaml_file",
+        cli_args=["convert", ".tmuxp.yaml"],
+    ),
+    ConvertTestFixture(
+        test_id="convert_yaml_file_auto_confirm",
+        cli_args=["convert", ".tmuxp.yaml", "-y"],
+    ),
+    ConvertTestFixture(
+        test_id="convert_yml_file",
+        cli_args=["convert", ".tmuxp.yml"],
+    ),
+    ConvertTestFixture(
+        test_id="convert_yml_file_auto_confirm",
+        cli_args=["convert", ".tmuxp.yml", "-y"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    "cli_args",
-    [
-        (["convert", "."]),
-        (["convert", ".tmuxp.yaml"]),
-        (["convert", ".tmuxp.yaml", "-y"]),
-        (["convert", ".tmuxp.yml"]),
-        (["convert", ".tmuxp.yml", "-y"]),
-    ],
+    list(ConvertTestFixture._fields),
+    CONVERT_TEST_FIXTURES,
+    ids=[test.test_id for test in CONVERT_TEST_FIXTURES],
 )
 def test_convert(
+    test_id: str,
     cli_args: list[str],
     tmp_path: pathlib.Path,
     monkeypatch: pytest.MonkeyPatch,
@@ -57,15 +84,36 @@ def test_convert(
     assert tmuxp_json.open().read() == json.dumps({"session_name": "hello"}, indent=2)
 
 
+class ConvertJsonTestFixture(t.NamedTuple):
+    """Test fixture for tmuxp convert json command tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+CONVERT_JSON_TEST_FIXTURES: list[ConvertJsonTestFixture] = [
+    ConvertJsonTestFixture(
+        test_id="convert_json_current_dir",
+        cli_args=["convert", "."],
+    ),
+    ConvertJsonTestFixture(
+        test_id="convert_json_file",
+        cli_args=["convert", ".tmuxp.json"],
+    ),
+    ConvertJsonTestFixture(
+        test_id="convert_json_file_auto_confirm",
+        cli_args=["convert", ".tmuxp.json", "-y"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    "cli_args",
-    [
-        (["convert", "."]),
-        (["convert", ".tmuxp.json"]),
-        (["convert", ".tmuxp.json", "-y"]),
-    ],
+    list(ConvertJsonTestFixture._fields),
+    CONVERT_JSON_TEST_FIXTURES,
+    ids=[test.test_id for test in CONVERT_JSON_TEST_FIXTURES],
 )
 def test_convert_json(
+    test_id: str,
     cli_args: list[str],
     tmp_path: pathlib.Path,
     monkeypatch: pytest.MonkeyPatch,

tests/cli/test_freeze.py

@@ -17,23 +17,68 @@
     from libtmux.server import Server
 
 
+class FreezeTestFixture(t.NamedTuple):
+    """Test fixture for tmuxp freeze command tests."""
+
+    test_id: str
+    cli_args: list[str]
+    inputs: list[str]
+
+
+class FreezeOverwriteTestFixture(t.NamedTuple):
+    """Test fixture for tmuxp freeze overwrite command tests."""
+
+    test_id: str
+    cli_args: list[str]
+    inputs: list[str]
+
+
+FREEZE_TEST_FIXTURES: list[FreezeTestFixture] = [
+    FreezeTestFixture(
+        test_id="freeze_named_session",
+        cli_args=["freeze", "myfrozensession"],
+        inputs=["y\n", "./la.yaml\n", "y\n"],
+    ),
+    FreezeTestFixture(
+        test_id="freeze_named_session_exists",
+        cli_args=["freeze", "myfrozensession"],
+        inputs=["y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
+    ),
+    FreezeTestFixture(
+        test_id="freeze_current_session",
+        cli_args=["freeze"],
+        inputs=["y\n", "./la.yaml\n", "y\n"],
+    ),
+    FreezeTestFixture(
+        test_id="freeze_current_session_exists",
+        cli_args=["freeze"],
+        inputs=["y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
+    ),
+]
+
+
+FREEZE_OVERWRITE_TEST_FIXTURES: list[FreezeOverwriteTestFixture] = [
+    FreezeOverwriteTestFixture(
+        test_id="force_overwrite_named_session",
+        cli_args=["freeze", "mysession", "--force"],
+        inputs=["\n", "\n", "y\n", "./exists.yaml\n", "y\n"],
+    ),
+    FreezeOverwriteTestFixture(
+        test_id="force_overwrite_current_session",
+        cli_args=["freeze", "--force"],
+        inputs=["\n", "\n", "y\n", "./exists.yaml\n", "y\n"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    ("cli_args", "inputs"),
-    [
-        (["freeze", "myfrozensession"], ["y\n", "./la.yaml\n", "y\n"]),
-        (  # Exists
-            ["freeze", "myfrozensession"],
-            ["y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
-        ),
-        (  # Imply current session if not entered
-            ["freeze"],
-            ["y\n", "./la.yaml\n", "y\n"],
-        ),
-        (["freeze"], ["y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"]),  # Exists
-    ],
+    list(FreezeTestFixture._fields),
+    FREEZE_TEST_FIXTURES,
+    ids=[test.test_id for test in FREEZE_TEST_FIXTURES],
 )
 def test_freeze(
     server: Server,
+    test_id: str,
     cli_args: list[str],
     inputs: list[str],
     tmp_path: pathlib.Path,
@@ -72,20 +117,13 @@ def test_freeze(
 
 
 @pytest.mark.parametrize(
-    ("cli_args", "inputs"),
-    [
-        (  # Overwrite
-            ["freeze", "mysession", "--force"],
-            ["\n", "\n", "y\n", "./exists.yaml\n", "y\n"],
-        ),
-        (  # Imply current session if not entered
-            ["freeze", "--force"],
-            ["\n", "\n", "y\n", "./exists.yaml\n", "y\n"],
-        ),
-    ],
+    list(FreezeOverwriteTestFixture._fields),
+    FREEZE_OVERWRITE_TEST_FIXTURES,
+    ids=[test.test_id for test in FREEZE_OVERWRITE_TEST_FIXTURES],
 )
 def test_freeze_overwrite(
     server: Server,
+    test_id: str,
     cli_args: list[str],
     inputs: list[str],
     tmp_path: pathlib.Path,

tests/cli/test_import.py

@@ -15,8 +15,28 @@
     import pathlib
 
 
-@pytest.mark.parametrize("cli_args", [(["import"])])
+class ImportTestFixture(t.NamedTuple):
+    """Test fixture for basic tmuxp import command tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+IMPORT_TEST_FIXTURES: list[ImportTestFixture] = [
+    ImportTestFixture(
+        test_id="basic_import",
+        cli_args=["import"],
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    list(ImportTestFixture._fields),
+    IMPORT_TEST_FIXTURES,
+    ids=[test.test_id for test in IMPORT_TEST_FIXTURES],
+)
 def test_import(
+    test_id: str,
     cli_args: list[str],
     tmp_path: pathlib.Path,
     monkeypatch: pytest.MonkeyPatch,
@@ -29,24 +49,40 @@ def test_import(
     assert "teamocil" in result.out
 
 
+class ImportTeamocilTestFixture(t.NamedTuple):
+    """Test fixture for tmuxp import teamocil command tests."""
+
+    test_id: str
+    cli_args: list[str]
+    inputs: list[str]
+
+
+IMPORT_TEAMOCIL_TEST_FIXTURES: list[ImportTeamocilTestFixture] = [
+    ImportTeamocilTestFixture(
+        test_id="import_teamocil_config_file",
+        cli_args=["import", "teamocil", "./.teamocil/config.yaml"],
+        inputs=["\n", "y\n", "./la.yaml\n", "y\n"],
+    ),
+    ImportTeamocilTestFixture(
+        test_id="import_teamocil_config_file_exists",
+        cli_args=["import", "teamocil", "./.teamocil/config.yaml"],
+        inputs=["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
+    ),
+    ImportTeamocilTestFixture(
+        test_id="import_teamocil_config_name",
+        cli_args=["import", "teamocil", "config"],
+        inputs=["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    ("cli_args", "inputs"),
-    [
-        (
-            ["import", "teamocil", "./.teamocil/config.yaml"],
-            ["\n", "y\n", "./la.yaml\n", "y\n"],
-        ),
-        (
-            ["import", "teamocil", "./.teamocil/config.yaml"],
-            ["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
-        ),
-        (
-            ["import", "teamocil", "config"],
-            ["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
-        ),
-    ],
+    list(ImportTeamocilTestFixture._fields),
+    IMPORT_TEAMOCIL_TEST_FIXTURES,
+    ids=[test.test_id for test in IMPORT_TEAMOCIL_TEST_FIXTURES],
 )
 def test_import_teamocil(
+    test_id: str,
     cli_args: list[str],
     inputs: list[str],
     tmp_path: pathlib.Path,
@@ -76,24 +112,40 @@ def test_import_teamocil(
     assert new_config_yaml.exists()
 
 
+class ImportTmuxinatorTestFixture(t.NamedTuple):
+    """Test fixture for tmuxp import tmuxinator command tests."""
+
+    test_id: str
+    cli_args: list[str]
+    inputs: list[str]
+
+
+IMPORT_TMUXINATOR_TEST_FIXTURES: list[ImportTmuxinatorTestFixture] = [
+    ImportTmuxinatorTestFixture(
+        test_id="import_tmuxinator_config_file",
+        cli_args=["import", "tmuxinator", "./.tmuxinator/config.yaml"],
+        inputs=["\n", "y\n", "./la.yaml\n", "y\n"],
+    ),
+    ImportTmuxinatorTestFixture(
+        test_id="import_tmuxinator_config_file_exists",
+        cli_args=["import", "tmuxinator", "./.tmuxinator/config.yaml"],
+        inputs=["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
+    ),
+    ImportTmuxinatorTestFixture(
+        test_id="import_tmuxinator_config_name",
+        cli_args=["import", "tmuxinator", "config"],
+        inputs=["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    ("cli_args", "inputs"),
-    [
-        (
-            ["import", "tmuxinator", "./.tmuxinator/config.yaml"],
-            ["\n", "y\n", "./la.yaml\n", "y\n"],
-        ),
-        (
-            ["import", "tmuxinator", "./.tmuxinator/config.yaml"],
-            ["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
-        ),
-        (
-            ["import", "tmuxinator", "config"],
-            ["\n", "y\n", "./exists.yaml\n", "./la.yaml\n", "y\n"],
-        ),
-    ],
+    list(ImportTmuxinatorTestFixture._fields),
+    IMPORT_TMUXINATOR_TEST_FIXTURES,
+    ids=[test.test_id for test in IMPORT_TMUXINATOR_TEST_FIXTURES],
 )
 def test_import_tmuxinator(
+    test_id: str,
     cli_args: list[str],
     inputs: list[str],
     tmp_path: pathlib.Path,