From b67b3c23edc86549a97e723b8329043984b18775 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 21 Oct 2026 12:01:11 +0200 Subject: [PATCH 1/2] tests: the input capture fixture models #235's cursor recentring #235 made Game::capture read the surface size, warp the pointer to the window's centre and set the HUD cursor, so the fixture's copy of the method no longer compiled and verify failed on main. The fixture now stubs winit's PhysicalPosition/PhysicalSize, Window::inner_size and set_cursor_position, HudBatch and Game's renderer and cursor, and checks the recentring: one warp on grab, two on release, the HUD cursor at the centre, and nothing when releasing an already released pointer. Co-Authored-By: Claude Opus 5.5 --- tests/test_world_input_capture.py | 46 +++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/tests/test_world_input_capture.py b/tests/test_world_input_capture.py index 5b3c71f45..df91e3153 100644 --- a/tests/test_world_input_capture.py +++ b/tests/test_world_input_capture.py @@ -49,9 +49,31 @@ use std::cell::Cell; #[derive(Clone, Copy, PartialEq)] enum Screen { Playing, Paused, Inventory, Chat } enum CursorGrabMode { Locked, Confined, None } +mod winit { + pub mod dpi { + #[derive(Clone, Copy)] + pub struct PhysicalPosition { pub x: T, pub y: T } + impl PhysicalPosition { pub fn new(x: T, y: T) -> Self { Self { x, y } } } + pub struct PhysicalSize { pub width: T, pub height: T } + impl From> for [u32; 2] { + fn from(size: PhysicalSize) -> Self { [size.width, size.height] } + } + } +} +use winit::dpi::{PhysicalPosition, PhysicalSize}; +struct HudBatch { scale: f32 } +impl HudBatch { fn new(_size: [u32; 2]) -> Self { Self { scale: 2.0 } } } +struct Config { width: u32, height: u32 } +struct Renderer { config: Config } #[derive(Default)] -struct Window { grabs: Cell, visible: Cell, fail: bool } +struct Window { grabs: Cell, visible: Cell, fail: bool, warps: Cell, at: Cell<(f64, f64)> } impl Window { + fn inner_size(&self) -> PhysicalSize { PhysicalSize { width: 854, height: 480 } } + fn set_cursor_position(&self, position: PhysicalPosition) -> Result<(), ()> { + self.warps.set(self.warps.get() + 1); + self.at.set((position.x, position.y)); + Ok(()) + } fn set_cursor_grab(&self, mode: CursorGrabMode) -> Result<(), ()> { if !matches!(mode, CursorGrabMode::None) { self.grabs.set(self.grabs.get() + 1); @@ -67,13 +89,14 @@ struct Remote; struct Game { focused: bool, agent_pointer: bool, window: Option, mouse: Mouse, captured: bool, title: Option<()>, screen: Screen, remote: Option, - mining: bool, lan_acting: Option, + mining: bool, lan_acting: Option, renderer: Option, cursor: (f32, f32), } impl Default for Game { fn default() -> Self { Self { focused: true, agent_pointer: false, window: Some(Window::default()), mouse: Mouse::default(), captured: false, title: None, - screen: Screen::Playing, remote: None, mining: false, lan_acting: None } + screen: Screen::Playing, remote: None, mining: false, lan_acting: None, + renderer: None, cursor: (0.0, 0.0) } } } impl Game { @@ -136,6 +159,23 @@ fn main() { assert_eq!(game.window.as_ref().unwrap().grabs.get(), 0); game.remote = None; game.screen = Screen::Playing; + // Grabbing and releasing put the pointer at the window's centre + // (MouseHandler.grabMouse / releaseMouse), in the surface's pixels when it + // has one; releasing an already released pointer leaves it where it is. + game.renderer = Some(Renderer { config: Config { width: 1000, height: 600 } }); + game.capture(true); + assert!(game.captured); + let window = game.window.as_ref().unwrap(); + assert_eq!((window.warps.get(), window.at.get()), (1, (500.0, 300.0))); + game.capture(false); + let window = game.window.as_ref().unwrap(); + assert_eq!(window.warps.get(), 3); + assert_eq!(game.cursor, (250.0, 150.0)); + game.cursor = (1.0, 1.0); + game.capture(false); + assert_eq!(game.window.as_ref().unwrap().warps.get(), 3); + assert_eq!(game.cursor, (1.0, 1.0)); + game.renderer = None; game.window.as_mut().unwrap().fail = true; game.capture_loaded_world(); assert!(!game.captured); From 386cb5203a99db00694ac0707c1b53045b8c1bd7 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 21 Oct 2026 12:11:23 +0200 Subject: [PATCH 2/2] horizon-server tests: settings and config no longer share a temp folder a_stopped_server_saves_and_keeps_comments (settings.rs) and writes_properties_and_syncs_back (config.rs) both used horizon-server-config-, so when they ran at the same time one removed or rewrote the other's horizon.toml and writes_properties_and_syncs_back failed now and then. The settings test now has its own folder. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-server/src/settings.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/horizon-server/src/settings.rs b/crates/horizon-server/src/settings.rs index ed0ec912b..3f5956ffb 100644 --- a/crates/horizon-server/src/settings.rs +++ b/crates/horizon-server/src/settings.rs @@ -287,7 +287,7 @@ mod tests { #[test] fn a_stopped_server_saves_and_keeps_comments() { let dir = - std::env::temp_dir().join(format!("horizon-server-config-{}", std::process::id())); + std::env::temp_dir().join(format!("horizon-server-settings-{}", std::process::id())); let _ = std::fs::remove_dir_all(&dir); std::fs::create_dir_all(&dir).unwrap(); std::fs::write(dir.join(config::FILE), config::TEMPLATE).unwrap();