tests updated

Author: prathameshnium

tests/test_fixes.py

@@ -6,22 +6,22 @@ class TestFixes(unittest.TestCase):
 
     @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.sleep', MagicMock())
     @patch('builtins.input', side_effect=['10', '2', 'test_output'])
-    @patch('pyvisa.ResourceManager') # Patch pyvisa.ResourceManager
+    @patch('pymeasure.instruments.keithley.Keithley2400') # Patch Keithley2400 from pymeasure
     @patch('matplotlib.pyplot.show')
     @patch('pandas.DataFrame.to_csv')
-    def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_rm, mock_input):
+    def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_keithley_class, mock_input):
         """
         This test verifies that the Keithley2400 is correctly mocked in the
         IV_K2400_Loop_Backend_v10 script, preventing real hardware calls.
         """
         from Keithley_2400.Backends import IV_K2400_Loop_Backend_v10 as iv_backend
 
         mock_keithley_instance = MagicMock()
-        mock_rm.return_value.open_resource.return_value = mock_keithley_instance
+        mock_keithley_class.return_value = mock_keithley_instance
         mock_keithley_instance.query.return_value = "KEITHLEY INSTRUMENTS INC., MODEL 2400" # Simulate IDN query
 
         iv_backend.main()
-        mock_rm.return_value.open_resource.assert_called_once_with("GPIB::4")
+        mock_keithley_class.assert_called_once_with("GPIB::4")
 
 
     @patch('tkinter.Tk')

tests/test_gui_iv_k2400.py

@@ -23,8 +23,8 @@ def tearDown(self):
         self.root.destroy()
 
     @patch('Keithley_2400.IV_K2400_GUI_v5.Keithley2400_IV_Backend')
-    @patch('Keithley_2400.IV_K2400_GUI_v5.Figure.subplots')
-    def test_start_measurement_logic(self, mock_fig_subplots, MockBackend):
+    @patch('Keithley_2400.IV_K2400_GUI_v5.Figure') # Patch the Figure class itself
+    def test_start_measurement_logic(self, mock_figure_class, MockBackend):
         """
         Tests the core logic of the 'Start' button click.
         Verifies that parameters are read from the UI and passed to the backend correctly.
@@ -33,7 +33,7 @@ def test_start_measurement_logic(self, mock_fig_subplots, MockBackend):
         # Configure the mock for subplots to return two mock axes
         mock_ax_vi = MagicMock()
         mock_ax_ri = MagicMock()
-        mock_fig_subplots.return_value = [mock_ax_vi, mock_ax_ri]
+        mock_figure_class.return_value.subplots.return_value = [mock_ax_vi, mock_ax_ri]
 
         # Instantiate the GUI. This also creates all the tk widgets.
         app = MeasurementAppGUI(self.root)

tests/test_iv_k2400_loop_backend.py

@@ -1,6 +1,5 @@
 import unittest
 from unittest.mock import patch, MagicMock
-import pyvisa
 
 
 # Now we can import the module to be tested
@@ -10,7 +9,7 @@
 class TestIVK2400LoopBackend(unittest.TestCase):
 
     @patch('builtins.input', side_effect=['10', '2', 'test_output'])
-    @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.Keithley2400') # Patch Keithley2400 directly
+    @patch('pymeasure.instruments.keithley.Keithley2400') # Patch Keithley2400 from pymeasure
     @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):
@@ -32,16 +31,6 @@ def voltage_side_effect():
         # so we will use a side effect to track it
         latest_current = [0]
 
-        # Simulate the voltage measurement
-        # Let's return a voltage that is proportional to the current
-        def voltage_side_effect():
-            # A simple linear relationship for testing
-            return mock_keithley_instance.source_current * 10
-
-        # We can't directly access the source_current from ramp_to_current,
-        # so we will use a side effect to track it
-        latest_current = [0]
-
         def ramp_side_effect(current):
             latest_current[0] = current
             # Also update the mock's internal state

tests/test_iv_k6517b_simple_backend.py

@@ -1,15 +1,14 @@
 import unittest
 from unittest.mock import patch, MagicMock, mock_open
 import numpy as np
-# import pyvisa # Removed pyvisa import as it's not needed with direct class patching
 
 # Import the main function from the script we want to test
 from Keithley_6517B.High_Resistance.Backends.IV_K6517B_Simple_Backend_v10 import main as iv_simple_main
 
 class TestIVK6517BSimpleBackend(unittest.TestCase):
     @patch('time.sleep', MagicMock())
     @patch('builtins.input', side_effect=['-10', '10', '5', '0.1', 'test_iv_simple.csv'])
-    @patch('Keithley_6517B.High_Resistance.Backends.IV_K6517B_Simple_Backend_v10.Keithley6517B') # Re-patch Keithley6517B directly
+    @patch('pymeasure.instruments.keithley.Keithley6517B') # Patch Keithley6517B from pymeasure
     @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

@@ -94,7 +94,7 @@ def test_get_user_parameters(self, mock_input):
     @patch('tkinter.filedialog.asksaveasfilename', return_value='test.csv')
     @patch('builtins.input', side_effect=['10', '20', '5', '30'])
     @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.Lakeshore350')
-    @patch('matplotlib.pyplot.subplots') # NEW PATCH
+    @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.plt.subplots') # Patch plt.subplots in the backend module
     @patch('matplotlib.pyplot.show')
     @patch('builtins.open', new_callable=mock_open)
     @patch('time.sleep', MagicMock())