Update Default Value of Double2dArray in SampleMeasurement,Tests and block Input Support. (#1034)

* Update Default Value for Double2DArray in SampleMeasurement and generator tests

* Update MeasUI file for SampleMeasurement adding Double2DArray Output

* Disallow DataType.Double2DArray in configuration parameters

* Disallow additional DataTypes in configuration parameters

* Fix lint errors

* Remove DoubleXYData and DoubleXYDataArray Input Configuration Parameter from measurement service tests

---------

Co-authored-by: Avi Goel <[email protected]>

Author: Blahpapto1

examples/sample_measurement/SampleAllParameters.measui

@@ -9,7 +9,9 @@
 import click
 import ni_measurement_plugin_sdk_service as nims
 from _helpers import configure_logging, verbosity_option
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types import array_pb2
+from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types import (
+    array_pb2,
+)
 
 try:
     from _stubs import color_pb2
@@ -95,7 +97,9 @@ def cancel_callback() -> None:
     enum_output = enum_input
     protobuf_enum_output = protobuf_enum_input
     string_array_output = string_array_in
-    double_2d_array_output = array_pb2.Double2DArray()
+    double_2d_array_output = array_pb2.Double2DArray(
+        rows=2, columns=3, data=[1.5, 2.5, 3.5, 4.5, 5.5, 6.5]
+    )
     logging.info("Completed measurement")
 
     return (

examples/sample_measurement/measurement.py

@@ -6,6 +6,9 @@
 from typing import Any, Generator, Tuple, Type, Union
 
 import pytest
+from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types import (
+    array_pb2,
+)
 from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
 
 from tests.conftest import CliRunnerFunction
@@ -65,7 +68,9 @@ def test___measurement_plugin_client___measure___returns_output(
         enum_out=EnumInEnum.BLUE,
         enum_array_out=[EnumInEnum.RED, EnumInEnum.GREEN],
         protobuf_enum_out=ProtobufEnumInEnum.BLACK,
-        double_2d_array_out=None,
+        double_2d_array_out=array_pb2.Double2DArray(
+            rows=2, columns=3, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
+        ),
     )
     measurement_plugin_client = test_measurement_client_type()
 
@@ -121,7 +126,9 @@ def test___measurement_plugin_client___stream_measure___returns_output(
         enum_out=EnumInEnum.BLUE,
         enum_array_out=[EnumInEnum.RED, EnumInEnum.GREEN],
         protobuf_enum_out=ProtobufEnumInEnum.BLACK,
-        double_2d_array_out=None,
+        double_2d_array_out=array_pb2.Double2DArray(
+            rows=2, columns=3, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
+        ),
     )
     measurement_plugin_client = test_measurement_client_type()
 
@@ -219,7 +226,7 @@ def _verify_output_types(outputs: Any, measurement_plugin_client_module: ModuleT
     _assert_type(outputs.enum_out, enum_type)
     _assert_collection_type(outputs.enum_array_out, Sequence, enum_type)
     _assert_type(outputs.protobuf_enum_out, protobuf_enum_type)
-    _assert_type(outputs.double_2d_array_out, type(None))
+    _assert_type(outputs.double_2d_array_out, array_pb2.Double2DArray)
 
 
 def _assert_type(value: Any, expected_type: Union[Type[Any], Tuple[Type[Any], ...]]) -> None:

packages/generator/tests/acceptance/test_non_streaming_measurement_client.py

@@ -138,7 +138,9 @@ def measure(
     enum_output = enum_input
     enum_array_output = enum_array_input
     protobuf_enum_output = protobuf_enum_input
-    double_2d_array_output = array_pb2.Double2DArray()
+    double_2d_array_output = array_pb2.Double2DArray(
+        rows=2, columns=3, data=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
+    )
 
     return (
         float_output,

packages/generator/tests/utilities/measurements/non_streaming_data_measurement/__init__.py

@@ -424,6 +424,8 @@ def configuration(
                 "DataType.PinArray1D is deprecated. Use DataType.IOResourceArray1D instead.",
                 DeprecationWarning,
             )
+        if type in [DataType.Double2DArray, DataType.DoubleXYData, DataType.DoubleXYDataArray1D]:
+            raise ValueError(f"{type} is not supported for configuration parameters.")
         data_type_info = _datatypeinfo.get_type_info(type)
         annotations = self._make_annotations_dict(
             data_type_info.type_specialization, instrument_type=instrument_type, enum_type=enum_type

packages/service/ni_measurement_plugin_sdk_service/measurement/service.py

@@ -65,9 +65,6 @@ def test___measurement_service___register_measurement_method___method_registered
         ("UInt32", DataType.UInt32, 3994),
         ("UInt64", DataType.UInt64, 3456),
         ("UInt64", DataType.UInt64, False),
-        ("DoubleXYData", DataType.DoubleXYData, None),
-        ("DoubleXYDataArray", DataType.DoubleXYDataArray1D, None),
-        ("Double2DArray", DataType.Double2DArray, None),
     ],
 )
 def test___measurement_service___add_configuration__configuration_added(
@@ -294,8 +291,6 @@ def test___measurement_service___add_non_path_configuration__path_type_annotatio
         ("IOResource1DArray", DataType.IOResourceArray1D, [1.009, -1.0009]),
         ("Path", DataType.Path, 1.0),
         ("Path1DArray", DataType.PathArray1D, [1.009, -1.0009]),
-        ("DoubleXYDataArray", DataType.DoubleXYDataArray1D, [1.009, -1.0009]),
-        ("Double2DArray", DataType.Double2DArray, 12),
     ],
 )
 @pytest.mark.filterwarnings("ignore:.*Pin.*:DeprecationWarning")