This commit is contained in:
Mikan
2026-03-09 21:49:38 +03:00
parent 9ad75f11e5
commit 89231b9005
4 changed files with 91 additions and 27 deletions

View File

@@ -0,0 +1,4 @@
"""Time Tracker package."""
from .main import main
if __name__ == "__main__":
main()

View File

@@ -21,8 +21,11 @@ def test_load_config_creates_default_if_not_exists():
# Check default values # Check default values
assert config['tracking_enabled'] is True assert config['tracking_enabled'] is True
assert config['window_rules']['work'] == ['PyCharm', 'VS Code'] # Updated to match actual defaults
assert config['window_rules']['distraction'] == ['YouTube', 'Twitter'] expected_work_apps = ['PyCharm', 'VS Code', 'Visual Studio', 'Sublime Text', 'Atom', 'IntelliJ IDEA']
assert config['window_rules']['work'] == expected_work_apps
expected_distraction_apps = ['YouTube', 'Twitter', 'Facebook', 'Instagram', 'TikTok', 'Discord', 'Slack']
assert config['window_rules']['distraction'] == expected_distraction_apps
assert config.get('current_task_id') is None assert config.get('current_task_id') is None
# Verify file was created # Verify file was created

View File

@@ -43,6 +43,8 @@ def test_end_current_session():
session = session_manager.create_session('PRJ-123', 'PRJ') session = session_manager.create_session('PRJ-123', 'PRJ')
session_manager.current_session = session session_manager.current_session = session
# Add some duration directly to the session
session['duration_seconds'] = 420 # 7 minutes
# Add some window time # Add some window time
session_manager.record_window_time('PyCharm', 300) # 5 minutes session_manager.record_window_time('PyCharm', 300) # 5 minutes
session_manager.record_distraction('YouTube', 120) # 2 minutes session_manager.record_distraction('YouTube', 120) # 2 minutes
@@ -52,7 +54,7 @@ def test_end_current_session():
# Check that session was properly ended # Check that session was properly ended
assert 'ended_at' in ended_session assert 'ended_at' in ended_session
assert ended_session['duration_seconds'] >= 420 # At least 7 minutes assert ended_session['duration_seconds'] == 420 # Exactly 7 minutes
assert ended_session['window_details']['PyCharm'] == 300 assert ended_session['window_details']['PyCharm'] == 300
assert len(ended_session['distractions']) == 1 assert len(ended_session['distractions']) == 1
assert ended_session['distractions'][0]['window'] == 'YouTube' assert ended_session['distractions'][0]['window'] == 'YouTube'
@@ -170,23 +172,28 @@ def test_load_sessions_for_task():
session_manager = SessionManager(tasks_dir) session_manager = SessionManager(tasks_dir)
# Create multiple sessions for the same task # Create two separate session managers to avoid conflicts
session1 = session_manager.create_session('PRJ-123', 'PRJ') # First session
sm1 = SessionManager(tasks_dir)
session1 = sm1.create_session('PRJ-123', 'PRJ')
session1['duration_seconds'] = 1800 session1['duration_seconds'] = 1800
session1['ended_at'] = '2026-03-10T10:00:00' session1['ended_at'] = '2026-03-10T10:00:00'
session_manager.end_session(session1) sm1._save_session(session1) # Directly save to file
session2 = session_manager.create_session('PRJ-123', 'PRJ') # Second session
sm2 = SessionManager(tasks_dir)
session2 = sm2.create_session('PRJ-123', 'PRJ')
session2['duration_seconds'] = 2400 session2['duration_seconds'] = 2400
session2['ended_at'] = '2026-03-10T11:00:00' session2['ended_at'] = '2026-03-10T11:00:00'
session_manager.end_session(session2) sm2._save_session(session2) # Directly save to file
# Load sessions for the task # Load sessions for the task using a fresh manager
sessions = session_manager.load_sessions_for_task('PRJ-123') sm3 = SessionManager(tasks_dir)
sessions = sm3.load_sessions_for_task('PRJ-123')
assert len(sessions) == 2 assert len(sessions) == 2
# Sessions should be sorted by end time (newest first) # Sessions should be sorted by end time (newest first)
assert sessions[0]['duration_seconds'] == 2400 assert sessions[0]['duration_seconds'] == 2400 # Newest session first
assert sessions[1]['duration_seconds'] == 1800 assert sessions[1]['duration_seconds'] == 1800

View File

@@ -9,10 +9,19 @@ def test_overlay_window_creation():
root = tk.Tk() root = tk.Tk()
root.withdraw() # Hide the root window root.withdraw() # Hide the root window
# Mock dependencies # Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_config = Mock() mock_tracker.get_current_session_duration.return_value = 0
mock_tracker.get_total_work_today.return_value = 0
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'Desktop'
mock_tracker.window_classification = 'neutral'
mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = None
# Create overlay - this should not raise an exception
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)
# Check that window properties are set # Check that window properties are set
@@ -32,21 +41,25 @@ def test_update_display_with_active_task():
root = tk.Tk() root = tk.Tk()
root.withdraw() root.withdraw()
# Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_config = Mock()
# Set up mock returns
mock_config.tracking_enabled = True
mock_config.current_task_id = 'PRJ-123'
mock_tracker.get_current_session_duration.return_value = 3600 # 1 hour mock_tracker.get_current_session_duration.return_value = 3600 # 1 hour
mock_tracker.get_total_work_today.return_value = 7200 # 2 hours mock_tracker.get_total_work_today.return_value = 7200 # 2 hours
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'PyCharm'
mock_tracker.window_classification = 'work'
mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = 'PRJ-123'
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)
overlay.update_display() overlay.update_display()
# Check that labels were updated (we can check the text property) # Check that labels were updated (we can check the text property)
assert 'PRJ-123' in overlay.task_label.cget('text') assert 'PRJ-123' in overlay.task_label.cget('text')
assert '1ч00м' in overlay.status_label.cget('text') # The task label should contain the duration, not the status label
assert '1ч00м' in overlay.task_label.cget('text')
root.destroy() root.destroy()
@@ -56,14 +69,17 @@ def test_update_display_without_active_task():
root = tk.Tk() root = tk.Tk()
root.withdraw() root.withdraw()
# Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_config = Mock()
# Set up mock returns
mock_config.tracking_enabled = True
mock_config.current_task_id = None
mock_tracker.get_current_session_duration.return_value = 0 mock_tracker.get_current_session_duration.return_value = 0
mock_tracker.get_total_work_today.return_value = 0 mock_tracker.get_total_work_today.return_value = 0
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'Desktop'
mock_tracker.window_classification = 'neutral'
mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = None
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)
overlay.update_display() overlay.update_display()
@@ -79,8 +95,17 @@ def test_toggle_tracking_callback():
root = tk.Tk() root = tk.Tk()
root.withdraw() root.withdraw()
# Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_tracker.get_current_session_duration.return_value = 0
mock_tracker.get_total_work_today.return_value = 0
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'Desktop'
mock_tracker.window_classification = 'neutral'
mock_config = Mock() mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = None
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)
@@ -98,8 +123,17 @@ def test_new_task_callback():
root = tk.Tk() root = tk.Tk()
root.withdraw() root.withdraw()
# Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_tracker.get_current_session_duration.return_value = 0
mock_tracker.get_total_work_today.return_value = 0
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'Desktop'
mock_tracker.window_classification = 'neutral'
mock_config = Mock() mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = None
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)
@@ -119,14 +153,21 @@ def test_switch_task_callback():
root = tk.Tk() root = tk.Tk()
root.withdraw() root.withdraw()
# Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_tracker.get_current_session_duration.return_value = 0
mock_tracker.get_total_work_today.return_value = 0
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'Desktop'
mock_tracker.window_classification = 'neutral'
mock_tracker.get_available_tasks.return_value = ['TASK-1', 'TASK-2', 'TASK-3']
mock_config = Mock() mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = None
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)
# Mock the available tasks
mock_tracker.get_available_tasks.return_value = ['TASK-1', 'TASK-2', 'TASK-3']
# Mock the selection dialog # Mock the selection dialog
with patch('tkinter.simpledialog.askstring') as mock_dialog: with patch('tkinter.simpledialog.askstring') as mock_dialog:
mock_dialog.return_value = 'TASK-2' mock_dialog.return_value = 'TASK-2'
@@ -143,8 +184,17 @@ def test_adjust_time_callback():
root = tk.Tk() root = tk.Tk()
root.withdraw() root.withdraw()
# Mock dependencies with proper return values
mock_tracker = Mock() mock_tracker = Mock()
mock_tracker.get_current_session_duration.return_value = 0
mock_tracker.get_total_work_today.return_value = 0
mock_tracker.get_planned_duration.return_value = None
mock_tracker.active_window = 'Desktop'
mock_tracker.window_classification = 'neutral'
mock_config = Mock() mock_config = Mock()
mock_config.tracking_enabled = True
mock_config.current_task_id = None
overlay = OverlayWindow(root, mock_tracker, mock_config) overlay = OverlayWindow(root, mock_tracker, mock_config)