tring

Author: prathameshnium

Keithley_2400/Backends/IV_K2400_Loop_Backend_v10.py

@@ -32,7 +32,7 @@ def main():
     Main function to run the I-V sweep measurement.
     """
     # object creation ----------------------------------
-    keithley_2400 = Keithley2400("GPIB::4", adapter_args={"py_library": "@sim"})
+    keithley_2400 = Keithley2400("GPIB::4")
     keithley_2400.disable_buffer()
     sleep(2)
 

Keithley_6517B/High_Resistance/Backends/IV_K6517B_Simple_Backend_v10.py

@@ -89,7 +89,7 @@ def main():
 
         # --- 2. CONNECT TO INSTRUMENT (V5 Logic) ---
         print(f"\nAttempting to connect to instrument at: {VISA_ADDRESS}")
-        keithley = Keithley6517B(VISA_ADDRESS, adapter_args={"py_library": "@sim"})
+        keithley = Keithley6517B(VISA_ADDRESS)
         print(f"Successfully connected to: {keithley.id}")
 
         # --- 3. CONFIGURE MEASUREMENT (V5 Logic) ---

tests/test_fixes.py

@@ -1,35 +1,43 @@
 import unittest
 from unittest.mock import patch, MagicMock, mock_open
+import pyvisa # Added import for pyvisa
 
 class TestFixes(unittest.TestCase):
 
-    @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.sleep', MagicMock())  # Add mock for time.sleep to isolate the test
+    @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.sleep', MagicMock())
     @patch('builtins.input', side_effect=['10', '2', 'test_output'])
-    @patch('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.Keithley2400')
+    @patch('pyvisa.ResourceManager') # Patch pyvisa.ResourceManager
     @patch('matplotlib.pyplot.show')
     @patch('pandas.DataFrame.to_csv')
-    def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_keithley_class, mock_input):
+    def test_iv_k2400_fix(self, mock_to_csv, mock_plt_show, mock_rm, 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_instance.query.return_value = "KEITHLEY INSTRUMENTS INC., MODEL 2400" # Simulate IDN query
+
         iv_backend.main()
-        mock_keithley_class.assert_called_once()
+        mock_rm.return_value.open_resource.assert_called_once_with("GPIB::4")
+
 
     @patch('tkinter.Tk')
     @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('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.pyvisa.ResourceManager') # Patch pyvisa.ResourceManager
     @patch('matplotlib.pyplot.show')
     @patch('builtins.open', new_callable=mock_open)
     @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.time.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):
+    def test_t_control_l350_fix(self, mock_time, mock_open_file, mock_plt_show, mock_rm, mock_input, mock_file_dialog, mock_tk):
         from Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10 import main
-        main()
-        mock_ls_class.assert_called_once()
 
-if __name__ == '__main__':
-    unittest.main()
+        mock_instrument_from_rm = MagicMock()
+        mock_rm.return_value.open_resource.return_value = mock_instrument_from_rm
+        mock_instrument_from_rm.query.return_value = "LSCI,MODEL350,12345,1.0"
+
+        main()
+        mock_rm.return_value.open_resource.assert_called_once_with("GPIB0::13::INSTR")

tests/test_gui_iv_k2400.py

@@ -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_fig_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,5 +1,6 @@
 import unittest
 from unittest.mock import patch, MagicMock
+import pyvisa
 
 
 # Now we can import the module to be tested
@@ -9,7 +10,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('Keithley_2400.Backends.IV_K2400_Loop_Backend_v10.Keithley2400') # Patch Keithley2400 directly
     @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):
@@ -31,6 +32,16 @@ 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
@@ -47,7 +58,7 @@ def ramp_side_effect(current):
 
         # --- ASSERTIONS ---
         # 1. Check instrument initialization
-        mock_keithley_class.assert_called_with("GPIB::4", adapter_args={"py_library": "@sim"})
+        mock_keithley_class.assert_called_once_with("GPIB::4")
         mock_keithley_instance.disable_buffer.assert_called_once()
 
         # 2. Check instrument configuration

tests/test_iv_k6517b_simple_backend.py

@@ -1,14 +1,15 @@
 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')
+    @patch('Keithley_6517B.High_Resistance.Backends.IV_K6517B_Simple_Backend_v10.Keithley6517B') # Re-patch Keithley6517B directly
     @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):
@@ -17,11 +18,12 @@ def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_input):
         """
         # --- Setup Mocks ---
         mock_instrument = MagicMock()
+        mock_keithley_class.return_value = mock_instrument
         # Set a mock ID for the connection message
         mock_instrument.id = "Mocked Keithley 6517B"
         # Simulate resistance measurement
         mock_instrument.resistance = 1.23e9
-        mock_keithley_class.return_value = mock_instrument
+
 
         # --- Run the main function and catch exceptions ---
         try:
@@ -33,7 +35,7 @@ def test_full_run(self, mock_show, mock_file, mock_keithley_class, mock_input):
 
         # --- Assertions ---
         # 1. Was the instrument initialized correctly?
-        mock_keithley_class.assert_called_once_with("GPIB1::27::INSTR", adapter_args={"py_library": "@sim"})
+        mock_keithley_class.assert_called_once_with("GPIB1::27::INSTR")
 
         # 2. Was the zero-check and correction sequence performed?
         mock_instrument.reset.assert_called_once()

tests/test_t_control_l350_backend.py

@@ -94,22 +94,29 @@ 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('matplotlib.pyplot.show')
     @patch('builtins.open', new_callable=mock_open)
     @patch('time.sleep', MagicMock())
     # Simulate time passing
     @patch('time.time', side_effect=[1000, 1002, 1004, 1006, 1008, 1010])
-    @patch('Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10.pyvisa.ResourceManager')
-    def test_main_runs_and_completes(self, mock_rm, mock_time, mock_open_file,
-                                     mock_plt_show, mock_ls_class, mock_input, mock_file_dialog, mock_tk):
+    def test_main_runs_and_completes(self, mock_time, mock_open_file,
+                                     mock_plt_show, mock_plt_subplots, mock_ls_class, mock_input, mock_file_dialog, mock_tk):
         # --- MOCK SETUP ---
-        # Configure mock_rm to return a mock instrument
+        mock_controller = MagicMock()
+        mock_ls_class.return_value = mock_controller
+
+        # Configure the internal pyvisa.ResourceManager within the mocked Lakeshore350 instance
+        mock_rm_inside_ls350 = MagicMock()
+        mock_controller.rm = mock_rm_inside_ls350 # lakeshore350 creates rm = pyvisa.ResourceManager()
         mock_instrument_from_rm = MagicMock()
-        mock_rm.return_value.open_resource.return_value = mock_instrument_from_rm
+        mock_rm_inside_ls350.open_resource.return_value = mock_instrument_from_rm
         mock_instrument_from_rm.query.return_value = "LSCI,MODEL350,12345,1.0" # IDN query
 
-        mock_controller = MagicMock()
-        mock_ls_class.return_value = mock_controller
+        # Configure mock_plt_subplots
+        mock_fig = MagicMock()
+        mock_ax = MagicMock()
+        mock_plt_subplots.return_value = (mock_fig, mock_ax)
 
         # Simulate temperature readings to control the loop
         # Start at 10K, then ramp up to 21K to finish