tests fixes

Author: prathameshnium

tests/test_deep_simulation.py

@@ -5,37 +5,44 @@
 import signal
 from unittest.mock import MagicMock, patch, mock_open
 
-# -------------------------------------------------------------------------
-# 1. GLOBAL MOCKS
-# -------------------------------------------------------------------------
-# Mock GUI elements
-sys.modules['tkinter'] = MagicMock()
-sys.modules['tkinter.ttk'] = MagicMock()
-sys.modules['tkinter.messagebox'] = MagicMock()
-sys.modules['tkinter.filedialog'] = MagicMock()
-
-# Mock Multiprocessing to prevent Queue.get() hangs
-mock_mp = MagicMock()
-sys.modules['multiprocessing'] = mock_mp
-sys.modules['multiprocessing.queues'] = MagicMock()
-
-# Mock Matplotlib
-mock_plt = MagicMock()
-mock_fig = MagicMock()
-mock_ax = MagicMock()
-mock_line = MagicMock()
-mock_ax.plot.return_value = [mock_line]
-mock_plt.subplots.return_value = (mock_fig, mock_ax)
-sys.modules['matplotlib'] = MagicMock()
-sys.modules['matplotlib.pyplot'] = mock_plt
-sys.modules['matplotlib.figure'] = MagicMock()
-sys.modules['matplotlib.backends'] = MagicMock()
-sys.modules['matplotlib.backends.backend_tkagg'] = MagicMock()
-
-
 class TestDeepSimulation(unittest.TestCase):
 
     def setUp(self):
+        # Mock GUI elements
+        self.tkinter_patch = patch.dict('sys.modules', {
+            'tkinter': MagicMock(),
+            'tkinter.ttk': MagicMock(),
+            'tkinter.messagebox': MagicMock(),
+            'tkinter.filedialog': MagicMock(),
+        })
+        self.tkinter_patch.start()
+        self.addCleanup(self.tkinter_patch.stop)
+
+        # Mock Multiprocessing to prevent Queue.get() hangs
+        self.mp_patch = patch.dict('sys.modules', {
+            'multiprocessing': MagicMock(),
+            'multiprocessing.queues': MagicMock(),
+        })
+        self.mp_patch.start()
+        self.addCleanup(self.mp_patch.stop)
+
+        # Mock Matplotlib
+        mock_plt = MagicMock()
+        mock_fig = MagicMock()
+        mock_ax = MagicMock()
+        mock_line = MagicMock()
+        mock_ax.plot.return_value = [mock_line]
+        mock_plt.subplots.return_value = (mock_fig, mock_ax)
+        self.matplotlib_patch = patch.dict('sys.modules', {
+            'matplotlib': MagicMock(),
+            'matplotlib.pyplot': mock_plt,
+            'matplotlib.figure': MagicMock(),
+            'matplotlib.backends': MagicMock(),
+            'matplotlib.backends.backend_tkagg': MagicMock(),
+        })
+        self.matplotlib_patch.start()
+        self.addCleanup(self.matplotlib_patch.stop)
+        
         self.root_dir = os.path.abspath(
             os.path.join(os.path.dirname(__file__), '..'))
         if self.root_dir not in sys.path:

tests/test_fixes.py

@@ -3,8 +3,8 @@
 
 class TestFixes(unittest.TestCase):
 
-    @patch('time.sleep', MagicMock())  # Add mock for time.sleep to isolate the test
-    @patch('builtins.input', side_effect=['10', '2', 'test_output']) 
+    @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.sleep', MagicMock())  # Add mock for time.sleep to isolate the test
+    @patch('builtins.input', side_effect=['10', '2', 'test_output'])
     @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.Keithley2400')
     @patch('matplotlib.pyplot.show')
     @patch('pandas.DataFrame.to_csv')
@@ -23,7 +23,7 @@ def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_keithley_class, moc
     @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.Lakeshore350')
     @patch('matplotlib.pyplot.show')
     @patch('builtins.open', new_callable=mock_open)
-    @patch('time.sleep', MagicMock())
+    @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.sleep', MagicMock())
     @patch('time.time', side_effect=[1000, 1002, 1004, 1006, 1008, 1010])
     def test_t_control_l350_fix(self, mock_time, mock_open_file,
                                      mock_plt_show, mock_ls_class, mock_input, mock_file_dialog, mock_tk):

tests/test_iv_k2400_loop_backend.py

@@ -9,7 +9,7 @@
 class TestIVK2400LoopBackend(unittest.TestCase):
 
     @patch('builtins.input', side_effect=['10', '2', 'test_output'])
-    @patch('pymeasure.instruments.keithley.Keithley2400')
+    @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.Keithley2400')
     @patch('matplotlib.pyplot.show')
     @patch('pandas.DataFrame.to_csv')
     def test_main_full_run(self, mock_to_csv, mock_plt_show, mock_keithley_class, mock_input):

tests/test_iv_k6517b_simple_backend.py

@@ -8,7 +8,7 @@
 class TestIVK6517BSimpleBackend(unittest.TestCase):
     @patch('time.sleep', MagicMock())
     @patch('builtins.input', side_effect=['-10', '10', '5', '0.1', 'test_iv_simple.csv'])
-    @patch('pymeasure.instruments.keithley.Keithley6517B')
+    @patch('Keithley_6517B.High_Resistance.Backends.IV_K6517B_Simple_Backend_v10.Keithley6517B')
     @patch('builtins.open', new_callable=mock_open)
     @patch('matplotlib.pyplot.show')
     def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_input):

tests/test_t_control_l350_backend.py

@@ -116,7 +116,7 @@ def test_main_runs_and_completes(self, mock_time, mock_open_file,
 
         # --- ASSERTIONS ---
         # Check initialization
-        mock_ls_class.assert_called_once_with("GPIB0::12::INSTR", adapter_args={"py_library": "@sim"})
+        mock_ls_class.assert_called_once_with("GPIB0::13::INSTR")
         mock_controller.reset_and_clear.assert_called_once()
         mock_controller.setup_heater.assert_called_once()