From 21dd1fc9c865a842dd15bfdbfd2fbea2883eff56 Mon Sep 17 00:00:00 2001 From: William Valentin Date: Tue, 29 Jul 2025 16:52:46 -0700 Subject: [PATCH] refactor: Update import statements to include 'src' prefix for module paths --- scripts/test_automated_punch.py | 2 +- scripts/test_date_uniqueness.py | 2 +- scripts/test_delete_functionality.py | 2 +- scripts/test_dose_demonstration.py | 2 +- scripts/test_dose_editing_functionality.py | 4 +- scripts/test_dose_tracking.py | 4 +- scripts/test_edit_functionality.py | 4 +- scripts/test_edit_window_functionality.py | 2 +- scripts/test_edit_window_punch_buttons.py | 2 +- scripts/test_final_verification.py | 2 +- scripts/test_multiple_dose_issue.py | 2 +- scripts/test_multiple_punch_save.py | 2 +- scripts/test_programmatic_punch.py | 2 +- scripts/test_punch_diagnosis.py | 2 +- scripts/test_punch_only.py | 2 +- scripts/test_save_functionality.py | 2 +- scripts/test_scrollable_input.py | 4 +- tests/test_constants.py | 50 +++++++++++----------- tests/test_graph_manager.py | 2 +- tests/test_init.py | 38 ++++++++-------- tests/test_logger.py | 2 +- tests/test_main.py | 2 +- 22 files changed, 68 insertions(+), 68 deletions(-) diff --git a/scripts/test_automated_punch.py b/scripts/test_automated_punch.py index 4de21ea..d8d6e76 100644 --- a/scripts/test_automated_punch.py +++ b/scripts/test_automated_punch.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_automated_multiple_punches(): diff --git a/scripts/test_date_uniqueness.py b/scripts/test_date_uniqueness.py index 2e5d92d..255dc28 100644 --- a/scripts/test_date_uniqueness.py +++ b/scripts/test_date_uniqueness.py @@ -10,7 +10,7 @@ import sys # Add the src directory to the Python path sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) -from data_manager import DataManager +from src.data_manager import DataManager # Set up simple logging logging.basicConfig(level=logging.DEBUG) diff --git a/scripts/test_delete_functionality.py b/scripts/test_delete_functionality.py index b6f927f..d3b9b02 100644 --- a/scripts/test_delete_functionality.py +++ b/scripts/test_delete_functionality.py @@ -10,7 +10,7 @@ import sys # Add the src directory to the path so we can import our modules sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) -from data_manager import DataManager +from src.data_manager import DataManager def test_delete_functionality(): diff --git a/scripts/test_dose_demonstration.py b/scripts/test_dose_demonstration.py index 7589fdc..ac4434b 100644 --- a/scripts/test_dose_demonstration.py +++ b/scripts/test_dose_demonstration.py @@ -14,7 +14,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def demonstrate_multiple_doses(): diff --git a/scripts/test_dose_editing_functionality.py b/scripts/test_dose_editing_functionality.py index 0897fe9..c627651 100644 --- a/scripts/test_dose_editing_functionality.py +++ b/scripts/test_dose_editing_functionality.py @@ -11,7 +11,7 @@ import sys # Add the src directory to the path so we can import our modules sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) -from data_manager import DataManager +from src.data_manager import DataManager def test_dose_editing_functionality(): @@ -100,7 +100,7 @@ def test_dose_editing_functionality(): try: import tkinter as tk - from ui_manager import UIManager + from src.ui_manager import UIManager # Create a temporary UI manager to test the parsing root = tk.Tk() diff --git a/scripts/test_dose_tracking.py b/scripts/test_dose_tracking.py index 5175f11..3808ace 100644 --- a/scripts/test_dose_tracking.py +++ b/scripts/test_dose_tracking.py @@ -9,8 +9,8 @@ from datetime import datetime sys.path.append(os.path.join(os.path.dirname(__file__), "src")) -from data_manager import DataManager -from init import logger +from src.data_manager import DataManager +from src.init import logger def test_dose_tracking(): diff --git a/scripts/test_edit_functionality.py b/scripts/test_edit_functionality.py index 7095e0d..2089e56 100644 --- a/scripts/test_edit_functionality.py +++ b/scripts/test_edit_functionality.py @@ -9,8 +9,8 @@ import sys # Add src to path sys.path.append(os.path.join(os.path.dirname(__file__), "src")) -from data_manager import DataManager -from init import logger +from src.data_manager import DataManager +from src.init import logger def test_edit_functionality(): diff --git a/scripts/test_edit_window_functionality.py b/scripts/test_edit_window_functionality.py index cbe046f..4e63ffd 100644 --- a/scripts/test_edit_window_functionality.py +++ b/scripts/test_edit_window_functionality.py @@ -11,7 +11,7 @@ import sys # Add the src directory to the path so we can import our modules sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) -from data_manager import DataManager +from src.data_manager import DataManager def test_edit_window_functionality(): diff --git a/scripts/test_edit_window_punch_buttons.py b/scripts/test_edit_window_punch_buttons.py index dd7f985..a990e03 100644 --- a/scripts/test_edit_window_punch_buttons.py +++ b/scripts/test_edit_window_punch_buttons.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_edit_window_punch_buttons(): diff --git a/scripts/test_final_verification.py b/scripts/test_final_verification.py index a757d0a..bcc206c 100644 --- a/scripts/test_final_verification.py +++ b/scripts/test_final_verification.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def final_verification_test(): diff --git a/scripts/test_multiple_dose_issue.py b/scripts/test_multiple_dose_issue.py index 7164b3b..b3f0e32 100644 --- a/scripts/test_multiple_dose_issue.py +++ b/scripts/test_multiple_dose_issue.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_parse_dose_text(): diff --git a/scripts/test_multiple_punch_save.py b/scripts/test_multiple_punch_save.py index c6b26ea..b101c69 100644 --- a/scripts/test_multiple_punch_save.py +++ b/scripts/test_multiple_punch_save.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_multiple_punch_and_save(): diff --git a/scripts/test_programmatic_punch.py b/scripts/test_programmatic_punch.py index 64b945b..fa24328 100644 --- a/scripts/test_programmatic_punch.py +++ b/scripts/test_programmatic_punch.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_programmatic_punch(): diff --git a/scripts/test_punch_diagnosis.py b/scripts/test_punch_diagnosis.py index 1bc6ab2..ab8ccaa 100644 --- a/scripts/test_punch_diagnosis.py +++ b/scripts/test_punch_diagnosis.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_punch_button_step_by_step(): diff --git a/scripts/test_punch_only.py b/scripts/test_punch_only.py index 2a4f2ca..09a7038 100644 --- a/scripts/test_punch_only.py +++ b/scripts/test_punch_only.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_punch_button_only(): diff --git a/scripts/test_save_functionality.py b/scripts/test_save_functionality.py index 3cee022..a6a8b5a 100644 --- a/scripts/test_save_functionality.py +++ b/scripts/test_save_functionality.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) import logging -from ui_manager import UIManager +from src.ui_manager import UIManager def test_save_functionality(): diff --git a/scripts/test_scrollable_input.py b/scripts/test_scrollable_input.py index ab2fc0f..2e1140a 100644 --- a/scripts/test_scrollable_input.py +++ b/scripts/test_scrollable_input.py @@ -14,8 +14,8 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "src")) def test_scrollable_input(): """Test the scrollable input frame.""" - from init import logger - from ui_manager import UIManager + from src.init import logger + from src.ui_manager import UIManager # Create a test window root = tk.Tk() diff --git a/tests/test_constants.py b/tests/test_constants.py index bcc4bd1..b3c0992 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -20,9 +20,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_LEVEL == "INFO" + assert src.constants.LOG_LEVEL == "INFO" def test_custom_log_level(self): """Test custom LOG_LEVEL from environment.""" @@ -31,9 +31,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_LEVEL == "DEBUG" + assert src.constants.LOG_LEVEL == "DEBUG" def test_default_log_path(self): """Test default LOG_PATH when not set in environment.""" @@ -42,9 +42,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_PATH == "/tmp/logs/thechart" + assert src.constants.LOG_PATH == "/tmp/logs/thechart" def test_custom_log_path(self): """Test custom LOG_PATH from environment.""" @@ -53,9 +53,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_PATH == "/custom/log/path" + assert src.constants.LOG_PATH == "/custom/log/path" def test_default_log_clear(self): """Test default LOG_CLEAR when not set in environment.""" @@ -64,9 +64,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_CLEAR == "False" + assert src.constants.LOG_CLEAR == "False" def test_custom_log_clear_true(self): """Test LOG_CLEAR when set to true in environment.""" @@ -75,9 +75,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_CLEAR == "True" + assert src.constants.LOG_CLEAR == "True" def test_custom_log_clear_false(self): """Test LOG_CLEAR when set to false in environment.""" @@ -86,9 +86,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_CLEAR == "False" + assert src.constants.LOG_CLEAR == "False" def test_log_level_case_insensitive(self): """Test that LOG_LEVEL is converted to uppercase.""" @@ -97,9 +97,9 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants - assert constants.LOG_LEVEL == "WARNING" + assert src.constants.LOG_LEVEL == "WARNING" def test_dotenv_override(self): """Test that dotenv override parameter is set to True.""" @@ -109,22 +109,22 @@ class TestConstants: if 'constants' in sys.modules: importlib.reload(sys.modules['constants']) else: - import constants + import src.constants mock_load_dotenv.assert_called_once_with(override=True) def test_all_constants_are_strings(self): """Test that all constants are string type.""" - import constants + import src.constants - assert isinstance(constants.LOG_LEVEL, str) - assert isinstance(constants.LOG_PATH, str) - assert isinstance(constants.LOG_CLEAR, str) + assert isinstance(src.constants.LOG_LEVEL, str) + assert isinstance(src.constants.LOG_PATH, str) + assert isinstance(src.constants.LOG_CLEAR, str) def test_constants_not_empty(self): """Test that constants are not empty strings.""" - import constants + import src.constants - assert constants.LOG_LEVEL != "" - assert constants.LOG_PATH != "" - assert constants.LOG_CLEAR != "" + assert src.constants.LOG_LEVEL != "" + assert src.constants.LOG_PATH != "" + assert src.constants.LOG_CLEAR != "" diff --git a/tests/test_graph_manager.py b/tests/test_graph_manager.py index 72590ee..5b0c722 100644 --- a/tests/test_graph_manager.py +++ b/tests/test_graph_manager.py @@ -12,7 +12,7 @@ import matplotlib.pyplot as plt import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src')) -from graph_manager import GraphManager +from src.graph_manager import GraphManager class TestGraphManager: diff --git a/tests/test_init.py b/tests/test_init.py index 4e44f5b..3abb93d 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -24,7 +24,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init mock_mkdir.assert_called_once() @@ -38,7 +38,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init mock_mkdir.assert_not_called() @@ -53,7 +53,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init mock_print.assert_called() @@ -70,7 +70,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init mock_init_logger.assert_called_once_with('init', testing_mode=False) @@ -87,7 +87,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init mock_init_logger.assert_called_once_with('init', testing_mode=True) @@ -98,7 +98,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init expected_files = ( f"{temp_log_dir}/thechart.log", @@ -106,7 +106,7 @@ class TestInit: f"{temp_log_dir}/thechart.error.log", ) - assert init.log_files == expected_files + assert src.init.log_files == expected_files def test_testing_mode_detection(self, temp_log_dir): """Test that testing mode is detected correctly.""" @@ -117,14 +117,14 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init - assert init.testing_mode is True + assert src.init.testing_mode is True # Test with non-DEBUG level with patch('init.LOG_LEVEL', 'INFO'): importlib.reload(sys.modules['init']) - assert init.testing_mode is False + assert src.init.testing_mode is False def test_log_clear_true(self, temp_log_dir): """Test log file clearing when LOG_CLEAR is True.""" @@ -147,7 +147,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init # Check that files were truncated for log_file in log_files: @@ -176,7 +176,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init # Check that files were not truncated for log_file in log_files: @@ -203,7 +203,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init def test_log_clear_permission_error(self, temp_log_dir): """Test handling of permission errors during log clearing.""" @@ -226,7 +226,7 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init def test_module_exports(self, temp_log_dir): """Test that module exports expected objects.""" @@ -235,12 +235,12 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init # Check that expected objects are available - assert hasattr(init, 'logger') - assert hasattr(init, 'log_files') - assert hasattr(init, 'testing_mode') + assert hasattr(src.init, 'logger') + assert hasattr(src.init, 'log_files') + assert hasattr(src.init, 'testing_mode') def test_log_path_printing(self, temp_log_dir): """Test that LOG_PATH is printed when directory is created.""" @@ -253,6 +253,6 @@ class TestInit: if 'init' in sys.modules: importlib.reload(sys.modules['init']) else: - import init + import src.init mock_print.assert_called_with(temp_log_dir + '/new_dir') diff --git a/tests/test_logger.py b/tests/test_logger.py index 2056d2b..7d59050 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -10,7 +10,7 @@ from unittest.mock import patch, Mock import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src')) -from logger import init_logger +from src.logger import init_logger class TestLogger: diff --git a/tests/test_main.py b/tests/test_main.py index 86b2844..2ff4457 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -10,7 +10,7 @@ import pandas as pd import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src')) -from main import MedTrackerApp +from src.main import MedTrackerApp class TestMedTrackerApp: