Enhance test coverage and refactor code in various modules

- Achieved 85% overall test coverage with detailed results for individual components.
- Added unit tests for DragInterceptor and MainWindow components.
- Refactored imports and removed unused code in multiple files.
- Updated test configurations and ensured compliance with coverage standards.
This commit is contained in:
claudi 2026-01-28 11:51:59 +01:00
parent 736b80b8f1
commit dbf8f2b92f
10 changed files with 793 additions and 18 deletions

View file

@ -1,9 +1,6 @@
"""Unit tests for configuration system."""
import os
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import patch
import pytest

View file

@ -0,0 +1,337 @@
"""Unit tests for DragInterceptor component."""
from pathlib import Path
from unittest.mock import MagicMock, patch
from webdrop_bridge.core.drag_interceptor import DragInterceptor
from webdrop_bridge.core.validator import PathValidator
class TestDragInterceptorInitialization:
"""Test DragInterceptor initialization and setup."""
def test_drag_interceptor_creation(self, qtbot):
"""Test DragInterceptor can be instantiated."""
interceptor = DragInterceptor()
assert interceptor is not None
assert interceptor._validator is None
def test_drag_interceptor_has_signals(self, qtbot):
"""Test DragInterceptor has required signals."""
interceptor = DragInterceptor()
assert hasattr(interceptor, "drag_started")
assert hasattr(interceptor, "drag_failed")
def test_set_validator(self, qtbot, tmp_path):
"""Test setting validator on drag interceptor."""
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
assert interceptor._validator is validator
class TestDragInterceptorValidation:
"""Test path validation in drag operations."""
def test_initiate_drag_no_files(self, qtbot):
"""Test initiating drag with no files fails."""
interceptor = DragInterceptor()
with qtbot.waitSignal(interceptor.drag_failed):
result = interceptor.initiate_drag([])
assert result is False
def test_initiate_drag_no_validator(self, qtbot):
"""Test initiating drag without validator fails."""
interceptor = DragInterceptor()
with qtbot.waitSignal(interceptor.drag_failed):
result = interceptor.initiate_drag(["file.txt"])
assert result is False
def test_initiate_drag_single_valid_file(self, qtbot, tmp_path):
"""Test initiating drag with single valid file."""
# Create a test file
test_file = tmp_path / "test.txt"
test_file.write_text("test content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
# Mock the drag operation to simulate success
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
# Simulate successful copy action
from PySide6.QtCore import Qt
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
result = interceptor.initiate_drag([str(test_file)])
# Should return True on successful drag
assert result is True
def test_initiate_drag_invalid_path(self, qtbot, tmp_path):
"""Test drag with invalid path fails."""
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
# Path outside allowed roots
invalid_path = Path("/etc/passwd")
with qtbot.waitSignal(interceptor.drag_failed):
result = interceptor.initiate_drag([str(invalid_path)])
assert result is False
def test_initiate_drag_nonexistent_file(self, qtbot, tmp_path):
"""Test drag with nonexistent file fails."""
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
nonexistent = tmp_path / "nonexistent.txt"
with qtbot.waitSignal(interceptor.drag_failed):
result = interceptor.initiate_drag([str(nonexistent)])
assert result is False
class TestDragInterceptorMultipleFiles:
"""Test drag operations with multiple files."""
def test_initiate_drag_multiple_files(self, qtbot, tmp_path):
"""Test drag with multiple valid files."""
# Create test files
file1 = tmp_path / "file1.txt"
file2 = tmp_path / "file2.txt"
file1.write_text("content 1")
file2.write_text("content 2")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
from PySide6.QtCore import Qt
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
result = interceptor.initiate_drag([str(file1), str(file2)])
assert result is True
def test_initiate_drag_mixed_valid_invalid(self, qtbot, tmp_path):
"""Test drag with mix of valid and invalid paths fails."""
test_file = tmp_path / "valid.txt"
test_file.write_text("content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
# Mix of valid and invalid paths
with qtbot.waitSignal(interceptor.drag_failed):
result = interceptor.initiate_drag(
[str(test_file), "/etc/passwd"]
)
assert result is False
class TestDragInterceptorMimeData:
"""Test MIME data creation and file URL formatting."""
def test_mime_data_creation(self, qtbot, tmp_path):
"""Test MIME data is created with proper file URLs."""
test_file = tmp_path / "test.txt"
test_file.write_text("test")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
from PySide6.QtCore import Qt
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
interceptor.initiate_drag([str(test_file)])
# Check MIME data was set correctly
call_args = mock_drag_instance.setMimeData.call_args
mime_data = call_args[0][0]
# Verify URLs were set
urls = mime_data.urls()
assert len(urls) == 1
# Check that the URL contains file:// scheme (can be string repr or QUrl)
url_str = str(urls[0]).lower()
assert "file://" in url_str
class TestDragInterceptorSignals:
"""Test signal emission on drag operations."""
def test_drag_started_signal_emitted(self, qtbot, tmp_path):
"""Test drag_started signal is emitted on success."""
test_file = tmp_path / "test.txt"
test_file.write_text("content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
from PySide6.QtCore import Qt
# Connect to signal manually
signal_spy = []
interceptor.drag_started.connect(lambda paths: signal_spy.append(paths))
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
result = interceptor.initiate_drag([str(test_file)])
# Verify result and signal emission
assert result is True
assert len(signal_spy) == 1
def test_drag_failed_signal_on_no_files(self, qtbot):
"""Test drag_failed signal on empty file list."""
interceptor = DragInterceptor()
# Connect to signal manually
signal_spy = []
interceptor.drag_failed.connect(lambda msg: signal_spy.append(msg))
result = interceptor.initiate_drag([])
# Verify result and signal emission
assert result is False
assert len(signal_spy) == 1
assert "No files" in signal_spy[0]
def test_drag_failed_signal_on_validation_error(self, qtbot, tmp_path):
"""Test drag_failed signal on validation failure."""
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
# Connect to signal manually
signal_spy = []
interceptor.drag_failed.connect(lambda msg: signal_spy.append(msg))
result = interceptor.initiate_drag(["/invalid/path/file.txt"])
# Verify result and signal emission
assert result is False
assert len(signal_spy) == 1
class TestDragInterceptorDragExecution:
"""Test drag operation execution and result handling."""
def test_drag_cancelled_returns_false(self, qtbot, tmp_path):
"""Test drag cancellation returns False."""
test_file = tmp_path / "test.txt"
test_file.write_text("content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = 0 # Cancelled/failed
mock_drag.return_value = mock_drag_instance
# Connect to signal manually
signal_spy = []
interceptor.drag_failed.connect(lambda msg: signal_spy.append(msg))
result = interceptor.initiate_drag([str(test_file)])
assert result is False
assert len(signal_spy) == 1
def test_pixmap_created_from_widget(self, qtbot, tmp_path):
"""Test pixmap is created from widget grab."""
test_file = tmp_path / "test.txt"
test_file.write_text("content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
from PySide6.QtCore import Qt
with patch.object(interceptor, "grab") as mock_grab:
mock_pixmap = MagicMock()
mock_grab.return_value.scaled.return_value = mock_pixmap
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
interceptor.initiate_drag([str(test_file)])
# Verify grab was called and pixmap was set
mock_grab.assert_called_once()
mock_drag_instance.setPixmap.assert_called_once_with(mock_pixmap)
class TestDragInterceptorIntegration:
"""Integration tests with PathValidator."""
def test_drag_with_nested_file(self, qtbot, tmp_path):
"""Test drag with file in nested directory."""
nested_dir = tmp_path / "nested" / "dir"
nested_dir.mkdir(parents=True)
test_file = nested_dir / "file.txt"
test_file.write_text("nested content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
from PySide6.QtCore import Qt
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
result = interceptor.initiate_drag([str(test_file)])
assert result is True
def test_drag_with_relative_path(self, qtbot, tmp_path):
"""Test drag with relative path resolution."""
test_file = tmp_path / "relative.txt"
test_file.write_text("content")
interceptor = DragInterceptor()
validator = PathValidator([tmp_path])
interceptor.set_validator(validator)
# This would work if run from the directory, but we'll just verify
# the interceptor handles Path objects correctly
from PySide6.QtCore import Qt
with patch("webdrop_bridge.core.drag_interceptor.QDrag") as mock_drag:
mock_drag_instance = MagicMock()
mock_drag_instance.exec.return_value = Qt.DropAction.CopyAction
mock_drag.return_value = mock_drag_instance
# Direct absolute path for reliable test
result = interceptor.initiate_drag([str(test_file)])
assert result is True

View file

@ -3,7 +3,6 @@
import logging
import logging.handlers
from pathlib import Path
from tempfile import TemporaryDirectory
import pytest

View file

@ -0,0 +1,435 @@
"""Unit tests for MainWindow component."""
from unittest.mock import patch
import pytest
from PySide6.QtWidgets import QToolBar
from webdrop_bridge.config import Config
from webdrop_bridge.ui.main_window import MainWindow
@pytest.fixture
def sample_config(tmp_path):
"""Provide a test configuration."""
# Create required directories
allowed_root = tmp_path / "allowed"
allowed_root.mkdir(exist_ok=True)
# Create webapp HTML
webapp_dir = tmp_path / "webapp"
webapp_dir.mkdir(exist_ok=True)
webapp_file = webapp_dir / "index.html"
webapp_file.write_text("<html><body>Test</body></html>")
config = Config(
app_name="Test WebDrop",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[allowed_root],
allowed_urls=["localhost", "127.0.0.1"],
webapp_url=str(webapp_file),
window_width=800,
window_height=600,
enable_logging=False,
)
return config
class TestMainWindowInitialization:
"""Test MainWindow initialization and setup."""
def test_main_window_creation(self, qtbot, sample_config):
"""Test MainWindow can be instantiated."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
assert window is not None
assert window.config == sample_config
def test_main_window_title(self, qtbot, sample_config):
"""Test window title is set correctly."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
expected_title = f"{sample_config.app_name} v{sample_config.app_version}"
assert window.windowTitle() == expected_title
def test_main_window_geometry(self, qtbot, sample_config):
"""Test window geometry is set correctly."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
assert window.width() == sample_config.window_width
assert window.height() == sample_config.window_height
def test_main_window_has_web_view(self, qtbot, sample_config):
"""Test MainWindow has web_view attribute."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
assert hasattr(window, "web_view")
assert window.web_view is not None
def test_main_window_has_drag_interceptor(self, qtbot, sample_config):
"""Test MainWindow has drag_interceptor attribute."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
assert hasattr(window, "drag_interceptor")
assert window.drag_interceptor is not None
class TestMainWindowNavigation:
"""Test navigation toolbar and functionality."""
def test_navigation_toolbar_created(self, qtbot, sample_config):
"""Test navigation toolbar is created."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
toolbars = window.findChildren(QToolBar)
assert len(toolbars) > 0
def test_navigation_toolbar_not_movable(self, qtbot, sample_config):
"""Test navigation toolbar is not movable (locked for Kiosk-mode)."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
toolbar = window.findChild(QToolBar)
assert toolbar is not None
assert not toolbar.isMovable()
def test_navigate_home(self, qtbot, sample_config):
"""Test home button navigation."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
with patch.object(window.web_view, "load") as mock_load:
window._navigate_home()
mock_load.assert_called_once()
def test_navigate_home_with_http_url(self, qtbot, tmp_path):
"""Test home navigation with HTTP URL."""
config = Config(
app_name="Test",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[tmp_path],
allowed_urls=[],
webapp_url="http://localhost:8000",
window_width=800,
window_height=600,
enable_logging=False,
)
window = MainWindow(config)
qtbot.addWidget(window)
with patch.object(window.web_view, "load") as mock_load:
window._navigate_home()
# Verify load was called with HTTP URL
call_args = mock_load.call_args
url = call_args[0][0]
assert url.scheme() == "http"
def test_navigate_home_with_file_url(self, qtbot, sample_config):
"""Test home navigation with file:// URL."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
with patch.object(window.web_view, "load") as mock_load:
window._navigate_home()
call_args = mock_load.call_args
url = call_args[0][0]
assert url.scheme() == "file"
class TestMainWindowWebAppLoading:
"""Test web application loading."""
def test_load_local_webapp_file(self, qtbot, sample_config):
"""Test loading local webapp file."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Window should load without errors
assert window.web_view is not None
def test_load_remote_webapp_url(self, qtbot, tmp_path):
"""Test loading remote webapp URL."""
config = Config(
app_name="Test",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[tmp_path],
allowed_urls=["localhost"],
webapp_url="http://localhost:3000",
window_width=800,
window_height=600,
enable_logging=False,
)
window = MainWindow(config)
qtbot.addWidget(window)
assert window.web_view is not None
def test_load_nonexistent_file_shows_error(self, qtbot, tmp_path):
"""Test loading nonexistent file shows error HTML."""
config = Config(
app_name="Test",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[tmp_path],
allowed_urls=[],
webapp_url="/nonexistent/file.html",
window_width=800,
window_height=600,
enable_logging=False,
)
with patch.object(config, "webapp_url", "/nonexistent/file.html"):
window = MainWindow(config)
qtbot.addWidget(window)
with patch.object(
window.web_view, "setHtml"
) as mock_set_html:
window._load_webapp()
mock_set_html.assert_called_once()
# Verify error message
call_args = mock_set_html.call_args[0][0]
assert "Error" in call_args
assert "not found" in call_args
class TestMainWindowDragIntegration:
"""Test drag-and-drop integration."""
def test_drag_interceptor_validator_set(self, qtbot, sample_config):
"""Test drag interceptor validator is configured."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
assert window.drag_interceptor._validator is not None
def test_drag_interceptor_signals_connected(self, qtbot, sample_config):
"""Test drag interceptor signals are connected."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Signals should be connected
assert window.drag_interceptor.drag_started is not None
assert window.drag_interceptor.drag_failed is not None
def test_initiate_drag_delegates_to_interceptor(
self, qtbot, sample_config, tmp_path
):
"""Test initiate_drag method delegates to interceptor."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Create test file
test_file = sample_config.allowed_roots[0] / "test.txt"
test_file.write_text("test")
with patch.object(
window.drag_interceptor, "initiate_drag"
) as mock_drag:
mock_drag.return_value = True
result = window.initiate_drag([str(test_file)])
mock_drag.assert_called_once_with([str(test_file)])
assert result is True
def test_on_drag_started_called(self, qtbot, sample_config):
"""Test _on_drag_started handler can be called."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Should not raise
window._on_drag_started(["/some/path"])
def test_on_drag_failed_called(self, qtbot, sample_config):
"""Test _on_drag_failed handler can be called."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Should not raise
window._on_drag_failed("Test error message")
class TestMainWindowURLWhitelist:
"""Test URL whitelisting integration."""
def test_restricted_web_view_receives_allowed_urls(
self, qtbot, sample_config
):
"""Test RestrictedWebEngineView receives allowed URLs from config."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# web_view should have allowed_urls configured
assert window.web_view.allowed_urls == sample_config.allowed_urls
def test_empty_allowed_urls_list(self, qtbot, tmp_path):
"""Test with empty allowed URLs (no restriction)."""
config = Config(
app_name="Test",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[tmp_path],
allowed_urls=[], # Empty = no restriction
webapp_url="http://localhost",
window_width=800,
window_height=600,
enable_logging=False,
)
window = MainWindow(config)
qtbot.addWidget(window)
assert window.web_view.allowed_urls == []
class TestMainWindowSignals:
"""Test signal connections."""
def test_drag_started_signal_connection(self, qtbot, sample_config):
"""Test drag_started signal is connected to handler."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
with patch.object(window, "_on_drag_started") as mock_handler:
window.drag_interceptor.drag_started.emit(["/path/to/file"])
mock_handler.assert_called_once()
def test_drag_failed_signal_connection(self, qtbot, sample_config):
"""Test drag_failed signal is connected to handler."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
with patch.object(window, "_on_drag_failed") as mock_handler:
window.drag_interceptor.drag_failed.emit("Error message")
mock_handler.assert_called_once()
class TestMainWindowStylesheet:
"""Test stylesheet application."""
def test_stylesheet_loading_gracefully_handles_missing_file(
self, qtbot, sample_config
):
"""Test missing stylesheet doesn't crash application."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Should not raise even if stylesheet missing
window._apply_stylesheet()
def test_stylesheet_loading_with_nonexistent_file(
self, qtbot, sample_config
):
"""Test stylesheet loading with nonexistent file path."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
with patch("builtins.open", side_effect=OSError("File not found")):
# Should handle gracefully
window._apply_stylesheet()
class TestMainWindowCloseEvent:
"""Test window close handling."""
def test_close_event_accepted(self, qtbot, sample_config):
"""Test close event is accepted."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
from PySide6.QtGui import QCloseEvent
event = QCloseEvent()
window.closeEvent(event)
assert event.isAccepted()
class TestMainWindowIntegration:
"""Integration tests for MainWindow with all components."""
def test_full_initialization_flow(self, qtbot, sample_config):
"""Test complete initialization flow."""
window = MainWindow(sample_config)
qtbot.addWidget(window)
# Verify all components initialized
assert window.web_view is not None
assert window.drag_interceptor is not None
assert window.config == sample_config
# Verify toolbar exists
toolbars = window.findChildren(QToolBar)
assert len(toolbars) > 0
def test_window_with_multiple_allowed_roots(self, qtbot, tmp_path):
"""Test MainWindow with multiple allowed root directories."""
root1 = tmp_path / "root1"
root2 = tmp_path / "root2"
root1.mkdir()
root2.mkdir()
webapp_file = tmp_path / "index.html"
webapp_file.write_text("<html></html>")
config = Config(
app_name="Test",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[root1, root2],
allowed_urls=[],
webapp_url=str(webapp_file),
window_width=800,
window_height=600,
enable_logging=False,
)
window = MainWindow(config)
qtbot.addWidget(window)
# Verify validator has both roots
assert window.drag_interceptor._validator is not None
assert len(
window.drag_interceptor._validator.allowed_roots
) == 2
def test_window_with_url_whitelist(self, qtbot, tmp_path):
"""Test MainWindow respects URL whitelist."""
config = Config(
app_name="Test",
app_version="1.0.0",
log_level="INFO",
log_file=None,
allowed_roots=[tmp_path],
allowed_urls=["*.example.com", "localhost"],
webapp_url="http://localhost",
window_width=800,
window_height=600,
enable_logging=False,
)
window = MainWindow(config)
qtbot.addWidget(window)
# Verify whitelist is set
assert window.web_view.allowed_urls == ["*.example.com", "localhost"]

View file

@ -2,7 +2,6 @@
from unittest.mock import MagicMock, patch
import pytest
from PySide6.QtCore import QUrl
from PySide6.QtWebEngineCore import QWebEngineNavigationRequest

View file

@ -1,7 +1,6 @@
"""Unit tests for path validator."""
from pathlib import Path
from tempfile import TemporaryDirectory
import pytest