tests: Reorganize stubs and test measurements (#548)

* service: Regenerate gRPC stubs

* github: Update check_nims.yml to regenerate gRPC stubs and check for modifications

* github: Be more selective about which stubs to delete (not examples)

* tests: Move tests/assets/stubs -> tests/utilities/stubs

* tests: Update stub package names and directory hierarchy

* scripts: Update test stub path

* tests: Retrofit stub imports

* tests: Move test measurements to tests.utilities.measurements

* tests: Retrofit measurement imports

* tests: Add init for measurements dir

* tests: Add init for measurements dir

* github: Update test stubs path

* tests: Move bigmessage.proto to tests.utilities.stubs.serialization

* tests: Fix bigmessage package name

Author: bkeryan

.github/workflows/check_nims.yml

@@ -77,11 +77,11 @@ jobs:
       - name: Generate gRPC stubs
         run: |
           find ni_measurementlink_service/_internal/stubs/ -name \*_pb2.py\* -o -name \*_pb2_grpc.py\* -delete
-          find tests/assets/stubs/ -name \*_pb2.py\* -o -name \*_pb2_grpc.py\* -delete
+          find tests/utilities/stubs/ -name \*_pb2.py\* -o -name \*_pb2_grpc.py\* -delete
           poetry run python scripts/generate_grpc_stubs.py
       - name: Check for out-of-date gRPC stubs
         run:  git diff --exit-code
       - name: Revert gRPC stubs
         run: |
-          git clean -dfx ni_measurementlink_service/_internal/stubs/ tests/assets/stubs/
-          git restore ni_measurementlink_service/_internal/stubs/ tests/assets/stubs/
+          git clean -dfx ni_measurementlink_service/_internal/stubs/ tests/utilities/stubs/
+          git restore ni_measurementlink_service/_internal/stubs/ tests/utilities/stubs/

scripts/generate_grpc_stubs.py

@@ -14,7 +14,7 @@
 PROTO_PATH = STUBS_PATH / "proto"
 PROTO_FILES = list(PROTO_PATH.rglob("*.proto"))
 
-TEST_STUBS_PATH = pathlib.Path(__file__).parent.parent / "tests" / "assets"
+TEST_STUBS_PATH = pathlib.Path(__file__).parent.parent / "tests" / "utilities" / "stubs"
 TEST_PROTO_PATH = TEST_STUBS_PATH
 TEST_PROTO_FILES = list(TEST_PROTO_PATH.rglob("*.proto"))
 

tests/acceptance/test_logging.py

@@ -16,8 +16,11 @@
 from tests.acceptance.test_streaming_data_measurement import (
     _get_configuration_parameters as get_streaming_data_configuration_parameters,
 )
-from tests.utilities import loopback_measurement, streaming_data_measurement
 from tests.utilities.discovery_service_process import DiscoveryServiceProcess
+from tests.utilities.measurements import (
+    loopback_measurement,
+    streaming_data_measurement,
+)
 
 
 def test___discovery_client___call___client_call_logged(

tests/acceptance/test_measurement_service.py

@@ -18,10 +18,8 @@
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets import sample_measurement_test_pb2
-from tests.assets.sample_measurement_test_pb2 import ProtobufColor
-from tests.utilities import loopback_measurement
-
+from tests.utilities.measurements import loopback_measurement
+from tests.utilities.stubs.loopback.types_pb2 import Parameters, ProtobufColor
 
 EXPECTED_PARAMETER_COUNT = 7
 EXPECTED_UI_FILE_COUNT = 1
@@ -227,7 +225,7 @@ def _get_serialized_measurement_signature(
     protobuf_enum_in: ProtobufColor.ValueType,
     string_array_in: List[str],
 ) -> bytes:
-    config_params = sample_measurement_test_pb2.SampleMeasurementParameter()
+    config_params = Parameters()
     config_params.float_in = float_in
     config_params.double_array_in.extend(double_array_in)
     config_params.bool_in = bool_in

tests/acceptance/test_nidaqmx_measurement.py

@@ -13,12 +13,9 @@
     PinMapContext,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets.stubs.nidaqmx_measurement.types_pb2 import (
-    Configurations,
-    Outputs,
-)
-from tests.utilities import nidaqmx_measurement
+from tests.utilities.measurements import nidaqmx_measurement
 from tests.utilities.pin_map_client import PinMapClient
+from tests.utilities.stubs.nidaqmx.types_pb2 import Configurations, Outputs
 
 _SITE = 0
 

tests/acceptance/test_nidcpower_measurement.py

@@ -13,12 +13,9 @@
     PinMapContext,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets.stubs.nidcpower_measurement.types_pb2 import (
-    Configurations,
-    Outputs,
-)
-from tests.utilities import nidcpower_measurement
+from tests.utilities.measurements import nidcpower_measurement
 from tests.utilities.pin_map_client import PinMapClient
+from tests.utilities.stubs.nidcpower.types_pb2 import Configurations, Outputs
 
 _SITE = 0
 

tests/acceptance/test_nidigital_measurement.py

@@ -13,9 +13,9 @@
     PinMapContext,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets.stubs.nidigital_measurement.types_pb2 import Configurations, Outputs
-from tests.utilities import nidigital_measurement
+from tests.utilities.measurements import nidigital_measurement
 from tests.utilities.pin_map_client import PinMapClient
+from tests.utilities.stubs.nidigital.types_pb2 import Configurations, Outputs
 
 
 def test___single_session___measure___returns_measured_values(

tests/acceptance/test_nidmm_measurement.py

@@ -13,12 +13,9 @@
     PinMapContext,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets.stubs.nidmm_measurement.types_pb2 import (
-    Configurations,
-    Outputs,
-)
-from tests.utilities import nidmm_measurement
+from tests.utilities.measurements import nidmm_measurement
 from tests.utilities.pin_map_client import PinMapClient
+from tests.utilities.stubs.nidmm.types_pb2 import Configurations, Outputs
 
 _SITE = 0
 

tests/acceptance/test_nifgen_measurement.py

@@ -13,12 +13,9 @@
     PinMapContext,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets.stubs.nifgen_measurement.types_pb2 import (
-    Configurations,
-    Outputs,
-)
-from tests.utilities import nifgen_measurement
+from tests.utilities.measurements import nifgen_measurement
 from tests.utilities.pin_map_client import PinMapClient
+from tests.utilities.stubs.nifgen.types_pb2 import Configurations, Outputs
 
 _SITE = 0
 

tests/acceptance/test_niscope_measurement.py

@@ -13,12 +13,9 @@
     PinMapContext,
 )
 from ni_measurementlink_service.measurement.service import MeasurementService
-from tests.assets.stubs.niscope_measurement.types_pb2 import (
-    Configurations,
-    Outputs,
-)
-from tests.utilities import niscope_measurement
+from tests.utilities.measurements import niscope_measurement
 from tests.utilities.pin_map_client import PinMapClient
+from tests.utilities.stubs.niscope.types_pb2 import Configurations, Outputs
 
 _SITE = 0