update

Author: prathameshnium

tests/test_iv_k2400_loop_backend.py

@@ -3,23 +3,19 @@
 
 
 # Now we can import the module to be tested
-# from Keithley_2400.Backends import IV_K2400_Loop_Backend_v10 as iv_backend
+from Keithley_2400.Backends import IV_K2400_Loop_Backend_v10 as iv_backend
 
 
 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):
         """
         Test the main function to ensure it runs through the full I-V sweep process.
         """
-        # --- DYNAMIC IMPORT ---
-        # Import the module here so that the patches are in effect
-        from Keithley_2400.Backends import IV_K2400_Loop_Backend_v10 as iv_backend
-        
         # --- MOCK SETUP ---
         # Mock the instrument instance
         mock_keithley_instance = MagicMock()
@@ -66,7 +62,7 @@ def ramp_side_effect(current):
         # np.linspace(0, 10, int(10/2) + 1) -> linspace(0, 10, 6)
         # The values will be [0., 2., 4., 6., 8., 10.]
         expected_currents_uA = [0., 2., 4., 6., 8., 10.]
-        expected_.calls = [unittest.mock.call(
+        expected_calls = [unittest.mock.call(
             c * 1e-6) for c in expected_currents_uA]
         mock_keithley_instance.ramp_to_current.assert_has_calls(
             expected_calls)

tests/test_t_control_l350_backend.py

@@ -3,9 +3,8 @@
 import pyvisa
 
 
-
 from Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10 import (
-    Lakeshore350, get_user_parameters)
+    Lakeshore350, get_user_parameters, main)
 
 
 class TestLakeshore350Class(unittest.TestCase):
@@ -16,21 +15,15 @@ def setUp(self, mock_rm):
         mock_rm.return_value.open_resource.return_value = self.mock_instrument
         self.mock_instrument.query.return_value = "LSCI,MODEL350,12345,1.0"
 
-        try:
-            # Instantiate the class, which will now use the mock instrument
-            self.controller = Lakeshore350("GPIB0::13::INSTR")
-            # Keep a reference to the mock for assertions
-            self.controller.instrument = self.mock_instrument
-        except (ConnectionError, ValueError):
-            # If the pyvisa backend is not installed, we can't create the real instrument
-            # In that case, we will create a mock object for the tests to pass
-            self.controller = MagicMock()
+        # Instantiate the class, which will now use the mock instrument
+        self.controller = Lakeshore350("GPIB0::13::INSTR")
+        # Keep a reference to the mock for assertions
+        self.controller.instrument = self.mock_instrument
 
     def test_initialization_success(self):
         # Test that the instrument is initialized and queried
-        if self.controller.instrument:
-            self.mock_instrument.query.assert_called_with('*IDN?')
-            self.assertIsNotNone(self.controller.instrument)
+        self.mock_instrument.query.assert_called_with('*IDN?')
+        self.assertIsNotNone(self.controller.instrument)
 
     @patch('pyvisa.ResourceManager')
     def test_initialization_failure(self, mock_rm):
@@ -43,53 +36,45 @@ def test_initialization_failure(self, mock_rm):
     def test_reset_and_clear(self):
         with patch('time.sleep') as mock_sleep:
             self.controller.reset_and_clear()
-            if self.controller.instrument:
-                self.mock_instrument.write.assert_any_call('*RST')
-                self.mock_instrument.write.assert_any_call('*CLS')
-                self.assertEqual(mock_sleep.call_count, 2)
+            self.mock_instrument.write.assert_any_call('*RST')
+            self.mock_instrument.write.assert_any_call('*CLS')
+            self.assertEqual(mock_sleep.call_count, 2)
 
     def test_setup_heater(self):
         self.controller.setup_heater(1, 1, 2)
-        if self.controller.instrument:
-            self.mock_instrument.write.assert_called_with('HTRSET 1,1,2,0,1')
+        self.mock_instrument.write.assert_called_with('HTRSET 1,1,2,0,1')
 
     def test_setup_ramp(self):
         self.controller.setup_ramp(1, 10.0, ramp_on=True)
-        if self.controller.instrument:
-            self.mock_instrument.write.assert_called_with('RAMP 1,1,10.0')
+        self.mock_instrument.write.assert_called_with('RAMP 1,1,10.0')
 
     def test_set_setpoint(self):
         self.controller.set_setpoint(1, 150.0)
-        if self.controller.instrument:
-            self.mock_instrument.write.assert_called_with('SETP 1,150.0')
+        self.mock_instrument.write.assert_called_with('SETP 1,150.0')
 
     def test_set_heater_range(self):
         self.controller.set_heater_range(1, 'high')
-        if self.controller.instrument:
-            self.mock_instrument.write.assert_called_with('RANGE 1,5')
+        self.mock_instrument.write.assert_called_with('RANGE 1,5')
 
     def test_get_temperature(self):
-        if self.controller.instrument:
-            self.mock_instrument.query.return_value = "300.123"
-            temp = self.controller.get_temperature('A')
-            self.mock_instrument.query.assert_called_with('KRDG? A')
-            self.assertAlmostEqual(temp, 300.123)
+        self.mock_instrument.query.return_value = "300.123"
+        temp = self.controller.get_temperature('A')
+        self.mock_instrument.query.assert_called_with('KRDG? A')
+        self.assertAlmostEqual(temp, 300.123)
 
     def test_get_heater_output(self):
-        if self.controller.instrument:
-            self.mock_instrument.query.return_value = "50.5"
-            output = self.controller.get_heater_output(1)
-            self.mock_instrument.query.assert_called_with('HTR? 1')
-            self.assertAlmostEqual(output, 50.5)
+        self.mock_instrument.query.return_value = "50.5"
+        output = self.controller.get_heater_output(1)
+        self.mock_instrument.query.assert_called_with('HTR? 1')
+        self.assertAlmostEqual(output, 50.5)
 
     def test_close(self):
         self.controller.close()
-        if self.controller.instrument:
-            # Checks that heater is turned off
-            self.mock_instrument.write.assert_called_with('RANGE 1,0')
-            # Checks that the instrument connection is closed
-            self.mock_instrument.close.assert_called_once()
-            self.assertIsNone(self.controller.instrument)
+        # Checks that heater is turned off
+        self.mock_instrument.write.assert_called_with('RANGE 1,0')
+        # Checks that the instrument connection is closed
+        self.mock_instrument.close.assert_called_once()
+        self.assertIsNone(self.controller.instrument)
 
 
 class TestMainFunctionAndUserInput(unittest.TestCase):
@@ -117,9 +102,6 @@ def test_get_user_parameters(self, mock_input):
     @patch('time.time', side_effect=[1000, 1002, 1004, 1006, 1008, 1010])
     def test_main_runs_and_completes(self, mock_time, mock_open_file,
                                      mock_plt_show, mock_ls_class, mock_input, mock_file_dialog, mock_tk):
-        # --- DYNAMIC IMPORT ---
-        from Lakeshore_350_340.Backends.T_Control_L350_Simple_Backend_v10 import main
-
         # --- MOCK SETUP ---
         mock_controller = MagicMock()
         mock_ls_class.return_value = mock_controller