tests(refactor): Update tests to use new APIs instead of deprecated ones

why: Tests were using deprecated APIs that now raise exceptions.

what:
- test_dataclasses.py: resize_pane() -> resize()
- test_hooks.py: attached_window/attached_pane -> active_window/active_pane
- test_options.py: split_window() -> split(), test now expects DeprecatedError
- test_pane.py: test_resize_pane -> test_resize, resize_pane() -> resize()
- test_window.py: kill_window() -> kill(), select_pane() -> panes.get().select(),
  set_window_option/show_window_option -> set_option/show_option,
  deprecation tests now expect DeprecatedError instead of warnings

Author: tony

tests/test_dataclasses.py

@@ -65,8 +65,8 @@ def test_pane(
 
     old_pane_size = pane.pane_height
 
-    pane.resize_pane(adjustment_direction=ResizeAdjustmentDirection.Down, adjustment=25)
-    pane.resize_pane(
+    pane.resize(adjustment_direction=ResizeAdjustmentDirection.Down, adjustment=25)
+    pane.resize(
         adjustment_direction=ResizeAdjustmentDirection.Right,
         adjustment=25,
     )

tests/test_hooks.py

@@ -19,8 +19,8 @@ def test_hooks_raw_cmd(
 ) -> None:
     """Raw hook set, show, unset via cmd."""
     session = server.new_session(session_name="test hooks")
-    window = session.attached_window
-    pane = window.attached_pane
+    window = session.active_window
+    pane = window.active_pane
     assert pane is not None
 
     #
@@ -198,8 +198,8 @@ def test_hooks_dataclass(
 ) -> None:
     """Tests for hooks dataclass."""
     session = server.new_session(session_name="test hooks")
-    window = session.attached_window
-    pane = window.attached_pane
+    window = session.active_window
+    pane = window.active_pane
     assert pane is not None
 
     #
@@ -277,8 +277,8 @@ def test_hooks_mixin(
 ) -> None:
     """Tests for hooks."""
     session = server.new_session(session_name="test hooks")
-    window = session.attached_window
-    pane = window.attached_pane
+    window = session.active_window
+    pane = window.active_pane
     assert pane is not None
 
     pane.set_hook("session-renamed[0]", "set -g status-left-style bg=red")

tests/test_options.py

@@ -18,7 +18,7 @@
 from libtmux._internal.sparse_array import SparseArray
 from libtmux.common import has_gte_version
 from libtmux.constants import OptionScope
-from libtmux.exc import OptionError
+from libtmux.exc import DeprecatedError, OptionError
 from libtmux.options import TerminalOverrides, convert_values, explode_arrays
 from libtmux.pane import Pane
 
@@ -33,7 +33,7 @@ def test_options(server: Server) -> None:
     """Test basic options."""
     session = server.new_session(session_name="test")
     window = session.new_window(window_name="test")
-    pane = window.split_window(attach=False)
+    pane = window.split(attach=False)
 
     for obj in [server, session, window, pane]:
         obj._show_options()
@@ -60,7 +60,7 @@ def test_options_server(server: Server) -> None:
     """Test server options."""
     session = server.new_session(session_name="test")
     window = session.new_window(window_name="test")
-    pane = window.split_window(attach=False)
+    pane = window.split(attach=False)
 
     server.set_option("buffer-limit", 100)
     assert server._show_option("buffer-limit") == 100
@@ -122,7 +122,7 @@ def test_options_window(server: Server) -> None:
     """Test window options."""
     session = server.new_session(session_name="test")
     window = session.new_window(window_name="test")
-    window.split_window(attach=False)
+    window.split(attach=False)
 
     window_options_ = window._show_options(scope=OptionScope.Window)
 
@@ -134,7 +134,7 @@ def test_options_pane(server: Server) -> None:
     """Test pane options."""
     session = server.new_session(session_name="test")
     window = session.new_window(window_name="test")
-    pane = window.split_window(attach=False)
+    pane = window.split(attach=False)
 
     pane_options_ = pane._show_options(scope=OptionScope.Pane)
 
@@ -146,7 +146,7 @@ def test_options_grid(server: Server) -> None:
     """Test options against grid."""
     session = server.new_session(session_name="test")
     window = session.new_window(window_name="test")
-    pane = window.split_window(attach=False)
+    pane = window.split(attach=False)
 
     for include_inherited in [True, False]:
         for global_ in [True, False]:
@@ -501,7 +501,7 @@ def test_show_option_pane_fixture(
     """Test Pane.show_option(s)?."""
     session = server.new_session(session_name="test")
     window = session.new_window(window_name="test")
-    pane = window.split_window(attach=False)
+    pane = window.split(attach=False)
 
     monkeypatch.setattr(pane, "cmd", fake_cmd(stdout=mocked_cmd_stdout))
 
@@ -1351,12 +1351,12 @@ def test_convert_values_preserves_sparse_keys() -> None:
     assert result[99] == 100
 
 
-def test_show_option_g_parameter_emits_deprecation_warning(
+def test_show_option_g_parameter_raises_deprecated_error(
     session: Session,
 ) -> None:
-    """Test show_option() emits DeprecationWarning when g parameter is used."""
+    """Test show_option() raises DeprecatedError when g parameter is used."""
     server = session.server
-    with pytest.warns(DeprecationWarning, match=r"g argument is deprecated"):
+    with pytest.raises(DeprecatedError, match=r"g parameter was deprecated"):
         server.show_option("buffer-limit", g=True)
 
 

tests/test_pane.py

@@ -183,10 +183,10 @@ def test_pane_split_window_zoom(
     assert pane_with_zoom.height == pane_with_zoom.window_height
 
 
-def test_resize_pane(
+def test_resize(
     session: Session,
 ) -> None:
-    """Verify resizing window."""
+    """Verify resizing pane."""
     session.cmd("detach-client", "-s")
 
     window = session.active_window
@@ -208,29 +208,29 @@ def test_resize_pane(
 
     # Manual: Height
     pane_height_before = int(pane.pane_height)
-    pane.resize_pane(
+    pane.resize(
         height="50",
     )
     assert int(pane.pane_height) == 50
 
     # Manual: Width
     window.select_layout("main-horizontal")
-    pane.resize_pane(
+    pane.resize(
         width="75",
     )
     assert int(pane.pane_width) == 75
 
     # Manual: Height percentage
     window.select_layout("main-vertical")
     pane_height_before = int(pane.pane_height)
-    pane.resize_pane(
+    pane.resize(
         height="15%",
     )
     assert int(pane.pane_height) == 75
 
     # Manual: Width percentage
     window.select_layout("main-horizontal")
-    pane.resize_pane(
+    pane.resize(
         width="15%",
     )
     assert int(pane.pane_width) == 75
@@ -241,15 +241,15 @@ def test_resize_pane(
 
     # Adjustment: Down
     pane_height_before = int(pane.pane_height)
-    pane.resize_pane(
+    pane.resize(
         adjustment_direction=ResizeAdjustmentDirection.Down,
         adjustment=pane_height_adjustment * 2,
     )
     assert pane_height_before - (pane_height_adjustment * 2) == int(pane.pane_height)
 
     # Adjustment: Up
     pane_height_before = int(pane.pane_height)
-    pane.resize_pane(
+    pane.resize(
         adjustment_direction=ResizeAdjustmentDirection.Up,
         adjustment=pane_height_adjustment,
     )
@@ -258,12 +258,12 @@ def test_resize_pane(
     #
     # Zoom
     #
-    pane.resize_pane(height=50)
+    pane.resize(height=50)
 
     # Zoom
-    pane.resize_pane(height=2)
+    pane.resize(height=2)
     pane_height_before = int(pane.pane_height)
-    pane.resize_pane(
+    pane.resize(
         zoom=True,
     )
     pane_height_expanded = int(pane.pane_height)