Code Reivew Changes

Author: rahulr-NI

generated/nifake/nifake/unit_tests/test_library_interpreter.py

@@ -844,12 +844,9 @@ def test_import_attribute_configuration_buffer_str(self):
         self.patched_library.niFake_ImportAttributeConfigurationBuffer.assert_called_once_with(_matchers.ViSessionMatcher(SESSION_NUM_FOR_TEST), _matchers.ViInt32Matcher(len(configuration)), _matchers.ViInt8BufferMatcher(expected_list))
 
     def test_write_waveform_numpy_complex128_valid_input(self):
-        import ctypes
-        import numpy as np
-
         from nifake._complextype import NIComplexNumber
 
-        waveform_data = np.full(1000, 0.707 + 0.707j, dtype=np.complex128)
+        waveform_data = numpy.full(1000, 0.707 + 0.707j, dtype=numpy.complex128)
         number_of_samples = len(waveform_data)
 
         waveform_data_ctypes = (NIComplexNumber * number_of_samples)(
@@ -866,12 +863,9 @@ def test_write_waveform_numpy_complex128_valid_input(self):
         )
 
     def test_write_waveform_numpy_complexi16_valid_input(self):
-        import ctypes
-        import numpy as np
-
         from nifake._complextype import NIComplexI16
 
-        waveform_data = np.array([32767, 0] * 1000, dtype=np.int16)
+        waveform_data = numpy.array([32767, 0] * 1000, dtype=numpy.int16)
         number_of_samples = len(waveform_data) // 2
         waveform_data_ctypes = (NIComplexI16 * number_of_samples)(
             *[NIComplexI16(real=32767, imag=0) for _ in range(number_of_samples)]

generated/nifake/nifake/unit_tests/test_session.py

@@ -837,6 +837,24 @@ def test_return_timedeltas(self):
             assert returned_timedeltas == expected_timedeltas
             self.patched_library_interpreter.return_list_of_durations_in_seconds.assert_called_once_with(len(time_values))
 
+    def test_session_write_waveform_complex_f32_invalid_dtype(self):
+        invalid_waveform_data = numpy.full(10, 1.0 + 1.0j, dtype=numpy.complex128)
+        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=complex64, is complex128"
+        import pytest
+        with nifake.Session('dev1') as session:
+            with pytest.raises(TypeError) as exc_info:
+                session.write_waveform_complex_f32(invalid_waveform_data)
+            assert str(exc_info.value) == expected_error_message
+
+    def test_session_write_waveform_complex_i16_invalid_dtype(self):
+        invalid_waveform_data = numpy.full(10, 1.0 + 1.0j, dtype=numpy.complex64)
+        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=int16, is complex64"
+        import pytest
+        with nifake.Session('dev1') as session:
+            with pytest.raises(TypeError) as exc_info:
+                session.write_waveform_numpy_complex_i16(invalid_waveform_data)
+            assert str(exc_info.value) == expected_error_message
+
 
 class TestGrpcSession:
 
@@ -926,26 +944,6 @@ def test_export_attribute_configuration_buffer(self):
             assert actual_configuration == bytes(expected_buffer)
         self.patched_grpc_interpreter.export_attribute_configuration_buffer.assert_called_once_with()
 
-    def test_session_write_waveform_complex_f32_invalid_dtype(self):
-        import numpy as np
-        invalid_waveform_data = np.full(10, 1.0 + 1.0j, dtype=np.complex128)
-        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=complex64, is complex128"
-        import pytest
-        with nifake.Session('dev1', grpc_options=nifake.GrpcSessionOptions(object(), '')) as session:
-            with pytest.raises(TypeError) as exc_info:
-                session.write_waveform_complex_f32(invalid_waveform_data)
-            assert str(exc_info.value) == expected_error_message
-
-    def test_session_write_waveform_complex_i16_invalid_dtype(self):
-        import numpy as np
-        invalid_waveform_data = np.full(10, 1.0 + 1.0j, dtype=np.complex64)
-        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=int16, is complex64"
-        import pytest
-        with nifake.Session('dev1', grpc_options=nifake.GrpcSessionOptions(object(), '')) as session:
-            with pytest.raises(TypeError) as exc_info:
-                session.write_waveform_numpy_complex_i16(invalid_waveform_data)
-            assert str(exc_info.value) == expected_error_message
-
     # Attributes
 
     def test_get_attribute_int32(self):

src/nifake/unit_tests/test_library_interpreter.py

@@ -844,12 +844,9 @@ def test_import_attribute_configuration_buffer_str(self):
         self.patched_library.niFake_ImportAttributeConfigurationBuffer.assert_called_once_with(_matchers.ViSessionMatcher(SESSION_NUM_FOR_TEST), _matchers.ViInt32Matcher(len(configuration)), _matchers.ViInt8BufferMatcher(expected_list))
 
     def test_write_waveform_numpy_complex128_valid_input(self):
-        import ctypes
-        import numpy as np
-
         from nifake._complextype import NIComplexNumber
 
-        waveform_data = np.full(1000, 0.707 + 0.707j, dtype=np.complex128)
+        waveform_data = numpy.full(1000, 0.707 + 0.707j, dtype=numpy.complex128)
         number_of_samples = len(waveform_data)
 
         waveform_data_ctypes = (NIComplexNumber * number_of_samples)(
@@ -866,12 +863,9 @@ def test_write_waveform_numpy_complex128_valid_input(self):
         )
 
     def test_write_waveform_numpy_complexi16_valid_input(self):
-        import ctypes
-        import numpy as np
-
         from nifake._complextype import NIComplexI16
 
-        waveform_data = np.array([32767, 0] * 1000, dtype=np.int16)
+        waveform_data = numpy.array([32767, 0] * 1000, dtype=numpy.int16)
         number_of_samples = len(waveform_data) // 2
         waveform_data_ctypes = (NIComplexI16 * number_of_samples)(
             *[NIComplexI16(real=32767, imag=0) for _ in range(number_of_samples)]

src/nifake/unit_tests/test_session.py

@@ -837,6 +837,24 @@ def test_return_timedeltas(self):
             assert returned_timedeltas == expected_timedeltas
             self.patched_library_interpreter.return_list_of_durations_in_seconds.assert_called_once_with(len(time_values))
 
+    def test_session_write_waveform_complex_f32_invalid_dtype(self):
+        invalid_waveform_data = numpy.full(10, 1.0 + 1.0j, dtype=numpy.complex128)
+        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=complex64, is complex128"
+        import pytest
+        with nifake.Session('dev1') as session:
+            with pytest.raises(TypeError) as exc_info:
+                session.write_waveform_complex_f32(invalid_waveform_data)
+            assert str(exc_info.value) == expected_error_message
+
+    def test_session_write_waveform_complex_i16_invalid_dtype(self):
+        invalid_waveform_data = numpy.full(10, 1.0 + 1.0j, dtype=numpy.complex64)
+        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=int16, is complex64"
+        import pytest
+        with nifake.Session('dev1') as session:
+            with pytest.raises(TypeError) as exc_info:
+                session.write_waveform_numpy_complex_i16(invalid_waveform_data)
+            assert str(exc_info.value) == expected_error_message
+
 
 class TestGrpcSession:
 
@@ -926,26 +944,6 @@ def test_export_attribute_configuration_buffer(self):
             assert actual_configuration == bytes(expected_buffer)
         self.patched_grpc_interpreter.export_attribute_configuration_buffer.assert_called_once_with()
 
-    def test_session_write_waveform_complex_f32_invalid_dtype(self):
-        import numpy as np
-        invalid_waveform_data = np.full(10, 1.0 + 1.0j, dtype=np.complex128)
-        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=complex64, is complex128"
-        import pytest
-        with nifake.Session('dev1', grpc_options=nifake.GrpcSessionOptions(object(), '')) as session:
-            with pytest.raises(TypeError) as exc_info:
-                session.write_waveform_complex_f32(invalid_waveform_data)
-            assert str(exc_info.value) == expected_error_message
-
-    def test_session_write_waveform_complex_i16_invalid_dtype(self):
-        import numpy as np
-        invalid_waveform_data = np.full(10, 1.0 + 1.0j, dtype=np.complex64)
-        expected_error_message = "waveform_data_array must be numpy.ndarray of dtype=int16, is complex64"
-        import pytest
-        with nifake.Session('dev1', grpc_options=nifake.GrpcSessionOptions(object(), '')) as session:
-            with pytest.raises(TypeError) as exc_info:
-                session.write_waveform_numpy_complex_i16(invalid_waveform_data)
-            assert str(exc_info.value) == expected_error_message
-
     # Attributes
 
     def test_get_attribute_int32(self):