All checks were successful
Zapret source guards / validate (push) Successful in 10s
- кнопки уведомлений («Продолжить запуск», «Отключить прокси» и др.) идут очередью: второе нажатие больше не отменяет первое и не глушит его итог — раньше после конфликта запуска DPI мог так и не стартовать; - «О программе», «Поддержка» и панель управления: ошибка открытия первой ссылки показывается, даже если в очереди уже следующая; - выключенный «Акцент из Windows» больше не получает цвет Windows, который дочитался после выключения; - фоновая запись размера окна, начатая до закрытия, не затирает размер, записанный при закрытии (без ожидания потока). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
268 lines
13 KiB
Python
268 lines
13 KiB
Python
from __future__ import annotations
|
|
|
|
import inspect
|
|
import sys
|
|
import unittest
|
|
from pathlib import Path
|
|
from types import SimpleNamespace
|
|
from unittest.mock import Mock, patch
|
|
|
|
|
|
PROJECT_SRC = Path(__file__).resolve().parents[1] / "src"
|
|
if str(PROJECT_SRC) not in sys.path:
|
|
sys.path.insert(0, str(PROJECT_SRC))
|
|
|
|
|
|
class WindowGeometryWorkerTests(unittest.TestCase):
|
|
def test_geometry_save_loaded_callback_accepts_runtime_request_id(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._cleanup_in_progress = False
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=7)
|
|
geometry_runtime._last_persisted_maximized = None
|
|
geometry_runtime._last_persisted_geometry = None
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=7)
|
|
|
|
runtime.WindowGeometryRuntime._on_geometry_save_finished(
|
|
geometry_runtime,
|
|
7,
|
|
(10, 20, 800, 600),
|
|
True,
|
|
)
|
|
|
|
self.assertEqual(geometry_runtime._last_persisted_geometry, (10, 20, 800, 600))
|
|
self.assertTrue(geometry_runtime._last_persisted_maximized)
|
|
|
|
def test_stale_geometry_save_loaded_callback_is_ignored(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._last_persisted_maximized = False
|
|
geometry_runtime._last_persisted_geometry = (1, 2, 300, 200)
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=8)
|
|
|
|
runtime.WindowGeometryRuntime._on_geometry_save_finished(
|
|
geometry_runtime,
|
|
7,
|
|
(10, 20, 800, 600),
|
|
True,
|
|
)
|
|
|
|
self.assertEqual(geometry_runtime._last_persisted_geometry, (1, 2, 300, 200))
|
|
self.assertFalse(geometry_runtime._last_persisted_maximized)
|
|
|
|
def test_regular_window_geometry_saves_run_through_worker(self) -> None:
|
|
import main.window_lifecycle_setup as lifecycle_setup
|
|
from app.feature_facades.window_geometry import WindowGeometryFeature
|
|
import ui.window_geometry_runtime as runtime
|
|
import app.window_geometry_workers as worker_module
|
|
|
|
self.assertTrue(hasattr(worker_module, "WindowGeometrySaveWorker"))
|
|
|
|
worker_init_source = inspect.getsource(worker_module.WindowGeometrySaveWorker.__init__)
|
|
worker_source = inspect.getsource(worker_module.WindowGeometrySaveWorker.run)
|
|
feature_source = inspect.getsource(WindowGeometryFeature)
|
|
lifecycle_source = inspect.getsource(lifecycle_setup.attach_window_lifecycle)
|
|
runtime_source = inspect.getsource(runtime.WindowGeometryRuntime)
|
|
persist_source = inspect.getsource(runtime.WindowGeometryRuntime._persist_geometry_now)
|
|
state_change_source = inspect.getsource(runtime.WindowGeometryRuntime.on_window_state_change)
|
|
sync_source = inspect.getsource(runtime.WindowGeometryRuntime._persist_geometry_sync)
|
|
request_source = inspect.getsource(runtime.WindowGeometryRuntime._request_geometry_save)
|
|
start_source = inspect.getsource(runtime.WindowGeometryRuntime._start_geometry_save_worker)
|
|
|
|
self.assertIn("set_window_geometry=self.set_window_geometry", feature_source)
|
|
self.assertIn("get_window_geometry=self.get_window_geometry", feature_source)
|
|
self.assertIn("features.window_geometry.create_geometry_save_worker", lifecycle_source)
|
|
self.assertIn("request_id", worker_init_source)
|
|
self.assertIn("self._request_id", worker_init_source)
|
|
self.assertIn("create_geometry_save_worker", runtime_source)
|
|
self.assertIn("_geometry_save_runtime = OneShotWorkerRuntime()", runtime_source)
|
|
self.assertNotIn("ui.window_geometry_worker", runtime_source)
|
|
self.assertNotIn("settings_store", worker_source)
|
|
self.assertIn("_persist_geometry_sync", persist_source)
|
|
self.assertIn("_request_geometry_save", persist_source)
|
|
self.assertIn("_schedule_geometry_save", state_change_source)
|
|
self.assertIn("_stop_geometry_save_worker_for_sync", sync_source)
|
|
self.assertIn("_geometry_save_state_obj", request_source)
|
|
self.assertIn("_geometry_save_runtime", request_source)
|
|
self.assertIn("start_qthread_worker", start_source)
|
|
self.assertNotIn("worker.start()", start_source)
|
|
self.assertNotIn("worker.deleteLater()", runtime_source)
|
|
self.assertNotIn("self.store.save_geometry", persist_source)
|
|
# синхронные записи в store разрешены только внутри _persist_geometry_sync
|
|
self.assertEqual(runtime_source.count("self.store.save_geometry"), 1)
|
|
self.assertEqual(runtime_source.count("self.store.save_maximized"), 1)
|
|
self.assertIn("self.store.save_geometry", sync_source)
|
|
self.assertIn("self.store.save_maximized", sync_source)
|
|
|
|
def test_geometry_save_pending_uses_shared_latest_worker_state(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
runtime_source = inspect.getsource(runtime.WindowGeometryRuntime)
|
|
init_source = inspect.getsource(runtime.WindowGeometryRuntime.__init__)
|
|
|
|
self.assertIn("LatestValueWorkerState", runtime_source)
|
|
self.assertIn("_geometry_save_state_obj", runtime_source)
|
|
self.assertNotIn(
|
|
"self._geometry_save_pending: tuple[tuple[int, int, int, int] | None, bool] | None = None",
|
|
init_source,
|
|
)
|
|
self.assertNotIn("self._geometry_save_start_scheduled = False", init_source)
|
|
|
|
def test_pending_geometry_save_restarts_after_event_loop_turn(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._cleanup_in_progress = False
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=1)
|
|
geometry_runtime._geometry_save_pending = ((10, 20, 800, 600), True)
|
|
geometry_runtime._start_geometry_save_worker = Mock()
|
|
single_shot = Mock(side_effect=lambda _delay, _callback: None)
|
|
|
|
with patch.object(runtime, "QTimer", SimpleNamespace(singleShot=single_shot), create=True):
|
|
runtime.WindowGeometryRuntime._on_geometry_save_worker_finished(
|
|
geometry_runtime,
|
|
object(),
|
|
)
|
|
|
|
single_shot.assert_called_once()
|
|
self.assertEqual(single_shot.call_args.args[0], 0)
|
|
geometry_runtime._start_geometry_save_worker.assert_not_called()
|
|
|
|
single_shot.call_args.args[1]()
|
|
|
|
geometry_runtime._start_geometry_save_worker.assert_called_once_with(((10, 20, 800, 600), True))
|
|
|
|
def test_empty_geometry_save_queue_does_not_start_worker(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._cleanup_in_progress = False
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=1)
|
|
geometry_runtime._geometry_save_state = runtime.LatestValueWorkerState(
|
|
geometry_runtime._geometry_save_runtime,
|
|
empty_value=None,
|
|
)
|
|
geometry_runtime._geometry_save_state.start_scheduled = True
|
|
geometry_runtime._start_geometry_save_worker = Mock()
|
|
|
|
runtime.WindowGeometryRuntime._run_scheduled_geometry_save_worker_start(geometry_runtime)
|
|
|
|
geometry_runtime._start_geometry_save_worker.assert_not_called()
|
|
|
|
def test_stale_geometry_save_worker_finished_does_not_restart_pending_save(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._cleanup_in_progress = False
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=2)
|
|
geometry_runtime._geometry_save_pending = ((10, 20, 800, 600), True)
|
|
geometry_runtime._start_geometry_save_worker = Mock()
|
|
single_shot = Mock()
|
|
|
|
with patch.object(runtime, "QTimer", SimpleNamespace(singleShot=single_shot), create=True):
|
|
runtime.WindowGeometryRuntime._on_geometry_save_worker_finished(
|
|
geometry_runtime,
|
|
SimpleNamespace(_request_id=1),
|
|
)
|
|
|
|
single_shot.assert_not_called()
|
|
geometry_runtime._start_geometry_save_worker.assert_not_called()
|
|
self.assertEqual(geometry_runtime._geometry_save_pending, ((10, 20, 800, 600), True))
|
|
|
|
def test_stale_geometry_save_worker_object_finished_does_not_restart_pending_save(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
old_worker = object()
|
|
current_worker = object()
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._cleanup_in_progress = False
|
|
geometry_runtime._geometry_save_runtime = SimpleNamespace(request_id=2, worker=current_worker)
|
|
geometry_runtime._geometry_save_pending = ((10, 20, 800, 600), True)
|
|
geometry_runtime._start_geometry_save_worker = Mock()
|
|
single_shot = Mock()
|
|
|
|
with patch.object(runtime, "QTimer", SimpleNamespace(singleShot=single_shot), create=True):
|
|
runtime.WindowGeometryRuntime._on_geometry_save_worker_finished(
|
|
geometry_runtime,
|
|
old_worker,
|
|
)
|
|
|
|
single_shot.assert_not_called()
|
|
geometry_runtime._start_geometry_save_worker.assert_not_called()
|
|
self.assertEqual(geometry_runtime._geometry_save_pending, ((10, 20, 800, 600), True))
|
|
|
|
def test_force_sync_geometry_save_does_not_wait_for_worker(self) -> None:
|
|
import ui.window_geometry_runtime as runtime
|
|
|
|
worker_runtime = SimpleNamespace(stop=Mock(), cancel=Mock())
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._geometry_save_pending = ((10, 20, 800, 600), False)
|
|
geometry_runtime._geometry_save_start_scheduled = True
|
|
geometry_runtime._geometry_save_runtime = worker_runtime
|
|
|
|
runtime.WindowGeometryRuntime._stop_geometry_save_worker_for_sync(geometry_runtime)
|
|
|
|
self.assertIsNone(geometry_runtime._geometry_save_pending)
|
|
self.assertFalse(geometry_runtime._geometry_save_start_scheduled)
|
|
worker_runtime.stop.assert_called_once_with(
|
|
blocking=False,
|
|
wait_timeout_ms=1000,
|
|
log_fn=runtime.log,
|
|
warning_prefix="window geometry save worker",
|
|
)
|
|
worker_runtime.cancel.assert_called_once_with()
|
|
|
|
def test_background_save_started_before_close_does_not_overwrite_close_save(self) -> None:
|
|
import threading
|
|
|
|
import ui.window_geometry_runtime as runtime
|
|
from app.window_geometry_workers import WindowGeometrySaveWorker
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._geometry_write_lock = threading.Lock()
|
|
geometry_runtime._geometry_write_generation = 0
|
|
writes: list[tuple] = []
|
|
worker = WindowGeometrySaveWorker(
|
|
1,
|
|
geometry=(10, 20, 800, 600),
|
|
maximized=False,
|
|
get_window_geometry=lambda: {},
|
|
set_window_geometry=lambda **kwargs: writes.append(("old", kwargs["width"])),
|
|
write_guard=geometry_runtime._geometry_write_guard(),
|
|
)
|
|
|
|
# Окно закрывается и пишет свежий размер раньше, чем фоновая запись дошла до диска.
|
|
with runtime.WindowGeometryRuntime._geometry_write_guard_for_sync(geometry_runtime):
|
|
writes.append(("close", 1024))
|
|
worker.run()
|
|
|
|
self.assertEqual(writes, [("close", 1024)])
|
|
|
|
def test_background_save_writes_when_nothing_newer_was_saved(self) -> None:
|
|
import threading
|
|
|
|
import ui.window_geometry_runtime as runtime
|
|
from app.window_geometry_workers import WindowGeometrySaveWorker
|
|
|
|
geometry_runtime = runtime.WindowGeometryRuntime.__new__(runtime.WindowGeometryRuntime)
|
|
geometry_runtime._geometry_write_lock = threading.Lock()
|
|
geometry_runtime._geometry_write_generation = 0
|
|
writes: list[int] = []
|
|
worker = WindowGeometrySaveWorker(
|
|
1,
|
|
geometry=(10, 20, 800, 600),
|
|
maximized=False,
|
|
get_window_geometry=lambda: {},
|
|
set_window_geometry=lambda **kwargs: writes.append(kwargs["width"]),
|
|
write_guard=geometry_runtime._geometry_write_guard(),
|
|
)
|
|
|
|
worker.run()
|
|
|
|
self.assertEqual(writes, [800])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|