From 62d90eccac8b9fbcd35301ad370df8633f32f29c Mon Sep 17 00:00:00 2001
From: Gonzalo Pacheco <gonzalo.pacheco@ni.com>
Date: Thu, 29 Jun 2023 13:35:45 -0500
Subject: [PATCH] Move new test assets to own folder.

---
 .../tests/acceptance/test_generator.py        | 21 +++++++------------
 .../SampleMeasurement.serviceconfig}          |  2 +-
 .../measurement.py}                           |  4 ++--
 .../with_annotations/start.bat                |  6 ++++++
 4 files changed, 16 insertions(+), 17 deletions(-)
 rename ni_measurementlink_generator/tests/test_assets/example_renders/{SampleMeasurementWithAnnotations.serviceconfig => with_annotations/SampleMeasurement.serviceconfig} (88%)
 rename ni_measurementlink_generator/tests/test_assets/example_renders/{measurementWithAnnotations.py => with_annotations/measurement.py} (88%)
 create mode 100644 ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/start.bat

diff --git a/ni_measurementlink_generator/tests/acceptance/test_generator.py b/ni_measurementlink_generator/tests/acceptance/test_generator.py
index 65b418956..88023e005 100644
--- a/ni_measurementlink_generator/tests/acceptance/test_generator.py
+++ b/ni_measurementlink_generator/tests/acceptance/test_generator.py
@@ -45,7 +45,7 @@ def test___command_line_args___create_measurement_with_annotations___render_with
     with pytest.raises(SystemExit):
         template.create_measurement(
             [
-                "Sample Measurement With Annotations",
+                "Sample Measurement",
                 "--measurement-version",
                 "1.2.3.4",
                 "--ui-file",
@@ -69,21 +69,14 @@ def test___command_line_args___create_measurement_with_annotations___render_with
             ]
         )
 
-    golden_path = test_assets_directory / "example_renders"
+    golden_path = test_assets_directory / "example_renders" / "with_annotations"
 
-    filenames = [
-        "measurementWithAnnotations.py",
-        "SampleMeasurementWithAnnotations.serviceconfig",
-        "start.bat",
-    ]
+    filenames = ["measurement.py", "SampleMeasurement.serviceconfig", "start.bat"]
     for filename in filenames:
-        golden_file = golden_path / filename
-        # We always generate only measurement.py
-        if filename == "measurementWithAnnotations.py":
-            filename = "measurement.py"
-
-        _assert_equal(golden_file, temp_directory / filename)
-
+        _assert_equal(
+            golden_path / filename,
+            temp_directory / filename,
+        )
 
 def _assert_equal(expected_path: pathlib.Path, result_path: pathlib.Path):
     expected = expected_path.read_text()
diff --git a/ni_measurementlink_generator/tests/test_assets/example_renders/SampleMeasurementWithAnnotations.serviceconfig b/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/SampleMeasurement.serviceconfig
similarity index 88%
rename from ni_measurementlink_generator/tests/test_assets/example_renders/SampleMeasurementWithAnnotations.serviceconfig
rename to ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/SampleMeasurement.serviceconfig
index 05334261e..7045632cf 100644
--- a/ni_measurementlink_generator/tests/test_assets/example_renders/SampleMeasurementWithAnnotations.serviceconfig
+++ b/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/SampleMeasurement.serviceconfig
@@ -1,7 +1,7 @@
 {
   "services": [
     {
-      "displayName": "Sample Measurement With Annotations",
+      "displayName": "Sample Measurement",
       "serviceClass": "SampleMeasurement_Python",
       "descriptionUrl": "https://www.example.com/SampleMeasurement.html",
       "providedInterfaces": [ "ni.measurementlink.measurement.v1.MeasurementService" ],
diff --git a/ni_measurementlink_generator/tests/test_assets/example_renders/measurementWithAnnotations.py b/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/measurement.py
similarity index 88%
rename from ni_measurementlink_generator/tests/test_assets/example_renders/measurementWithAnnotations.py
rename to ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/measurement.py
index f03142dce..3839a3c63 100644
--- a/ni_measurementlink_generator/tests/test_assets/example_renders/measurementWithAnnotations.py
+++ b/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/measurement.py
@@ -7,7 +7,7 @@
 
 service_directory = pathlib.Path(__file__).resolve().parent
 measurement_service = nims.MeasurementService(
-    service_config_path=service_directory / "SampleMeasurementWithAnnotations.serviceconfig",
+    service_config_path=service_directory / "SampleMeasurement.serviceconfig",
     version="1.2.3.4",
     ui_file_paths=[service_directory / "MeasurementUI.measui"],
 )
@@ -30,7 +30,7 @@ def measure(array_input):
     help="Enable verbose logging. Repeat to increase verbosity.",
 )
 def main(verbose: int) -> None:
-    """Host the Sample Measurement With Annotations service."""
+    """Host the Sample Measurement service."""
     if verbose > 1:
         level = logging.DEBUG
     elif verbose == 1:
diff --git a/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/start.bat b/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/start.bat
new file mode 100644
index 000000000..eade78764
--- /dev/null
+++ b/ni_measurementlink_generator/tests/test_assets/example_renders/with_annotations/start.bat
@@ -0,0 +1,6 @@
+@echo off
+REM The discovery service uses this script to start the measurement service.
+REM You can customize this script for your Python setup. The -v option logs
+REM messages with level INFO and above.
+
+call python "%~dp0measurement.py" -v