test(vehicle_components): Added tests for the functionality

amilcarlucas · amilcarlucas · commit a5e477d27edb · 2026-04-15T22:18:52.000+02:00
diff --git a/tests/acceptance_template_import_from_params.py b/tests/acceptance_template_import_from_params.py
@@ -730,8 +730,8 @@ def get_inferable_fields() -> list[tuple[str, str, str]]:
             ("Battery", "Specifications", "Capacity mAh"),
             ("Battery Monitor", "FC Connection", "Type"),
             ("Battery Monitor", "FC Connection", "Protocol"),
-            ("ESC", "FC Connection", "Type"),
-            ("ESC", "FC Connection", "Protocol"),
+            ("ESC", "FC->ESC Connection", "Type"),
+            ("ESC", "FC->ESC Connection", "Protocol"),
             ("GNSS Receiver", "FC Connection", "Type"),
             ("GNSS Receiver", "FC Connection", "Protocol"),
             ("RC Receiver", "FC Connection", "Type"),
diff --git a/tests/test_data_model_vehicle_components_base.py b/tests/test_data_model_vehicle_components_base.py
@@ -606,6 +606,36 @@ def test_system_recreates_missing_battery_component(self, realistic_model) -> No
         assert "Battery" in realistic_model._data["Components"]
         assert "Specifications" in realistic_model._data["Components"]["Battery"]
 
+    def test_system_migrates_legacy_esc_fc_connection_path(self) -> None:
+        """
+        System migrates legacy ESC FC Connection to FC->ESC Connection when loading old files.
+
+        GIVEN: A model with old ESC path data
+        WHEN: update_json_structure is called
+        THEN: ESC data is moved to the new FC->ESC Connection path and old path removed
+        """
+        initial_data = {
+            "Components": {
+                "ESC": {
+                    "Product": {"Manufacturer": "Test"},
+                    "FC Connection": {"Type": "Main Out", "Protocol": "DShot600"},
+                }
+            },
+            "Format version": 1,
+        }
+
+        vehicle_components = VehicleComponents()
+        schema = VehicleComponentsJsonSchema(vehicle_components.load_schema())
+        component_datatypes = schema.get_all_value_datatypes()
+        model = ComponentDataModelBase(initial_data, component_datatypes, schema)
+
+        model.update_json_structure()
+
+        assert "FC Connection" not in model._data["Components"]["ESC"]
+        assert "FC->ESC Connection" in model._data["Components"]["ESC"]
+        assert model._data["Components"]["ESC"]["FC->ESC Connection"]["Type"] == "Main Out"
+        assert model._data["Components"]["ESC"]["FC->ESC Connection"]["Protocol"] == "DShot600"
+
     def test_system_recreates_missing_flight_controller_specifications(self, realistic_model) -> None:
         """
         System recreates missing Flight Controller Specifications sub-section.
@@ -882,7 +912,7 @@ def test_system_handles_sequential_access_to_different_components(self, basic_mo
             (("Battery", "Specifications", "Capacity mAh"), 2000),
             (("Frame", "Specifications", "Weight Kg"), 1.5),
             (("Flight Controller", "Product", "Manufacturer"), "TestCorp"),
-            (("ESC", "FC Connection", "Protocol"), "DShot600"),
+            (("ESC", "FC->ESC Connection", "Protocol"), "DShot600"),
             (("Motors", "Specifications", "Poles"), 14),
         ]
 
diff --git a/tests/test_data_model_vehicle_components_import.py b/tests/test_data_model_vehicle_components_import.py
diff --git a/tests/test_data_model_vehicle_components_validation.py b/tests/test_data_model_vehicle_components_validation.py
@@ -704,8 +704,8 @@ def test_validate_all_data_valid_entries(self, realistic_model) -> None:
             ("RC Receiver", "FC Connection", "Protocol"): "CRSF",
             ("GNSS Receiver", "FC Connection", "Type"): "SERIAL3",
             ("GNSS Receiver", "FC Connection", "Protocol"): "uBlox",
-            ("ESC", "FC Connection", "Type"): "Main Out",
-            ("ESC", "FC Connection", "Protocol"): "DShot600",
+            ("ESC", "FC->ESC Connection", "Type"): "Main Out",
+            ("ESC", "FC->ESC Connection", "Protocol"): "DShot600",
         }
 
         is_valid, errors = model.validate_all_data(valid_entries)
@@ -818,7 +818,7 @@ def test_validate_all_data_battery_esc_combinations(self, realistic_model) -> No
         allowed_entries = {
             ("Battery Monitor", "FC Connection", "Type"): "other",
             ("Battery Monitor", "FC Connection", "Protocol"): "ESC",
-            ("ESC", "FC Connection", "Type"): "Main Out",
+            ("ESC", "FC->ESC Connection", "Type"): "Main Out",
         }
 
         is_valid, errors = model.validate_all_data(allowed_entries)
@@ -1311,8 +1311,8 @@ def test_pwm_output_protocol_choices(self, realistic_model) -> None:
         model.init_possible_choices({"MOT_PWM_TYPE": {"values": {"0": "Normal", "6": "DShot600"}}})
 
         # Test ESC connection to PWM outputs (not serial or CAN)
-        model._update_possible_choices_for_path(("ESC", "FC Connection", "Type"), "Main Out")
-        protocol_choices = model._possible_choices.get(("ESC", "FC Connection", "Protocol"), ())
+        model._update_possible_choices_for_path(("ESC", "FC->ESC Connection", "Type"), "Main Out")
+        protocol_choices = model._possible_choices.get(("ESC", "FC->ESC Connection", "Protocol"), ())
 
         # Should use motor PWM types for PWM outputs
         assert len(protocol_choices) > 0
@@ -1338,8 +1338,8 @@ def test_comprehensive_connection_type_coverage(self, realistic_model) -> None:
             ("RC Receiver", "FC Connection", "Type", "I2C1", False),  # May not have protocols (not common for RC)
             ("Telemetry", "FC Connection", "Type", "None", True),  # Should have protocols
             ("Telemetry", "FC Connection", "Type", "SERIAL1", True),  # Should have protocols
-            ("ESC", "FC Connection", "Type", "None", True),  # Should have protocols
-            ("ESC", "FC Connection", "Type", "CAN1", True),  # Should have protocols
+            ("ESC", "FC->ESC Connection", "Type", "None", True),  # Should have protocols
+            ("ESC", "FC->ESC Connection", "Type", "CAN1", True),  # Should have protocols
             ("GNSS Receiver", "FC Connection", "Type", "None", True),  # Should have protocols
             ("GNSS Receiver", "FC Connection", "Type", "SERIAL3", True),  # Should have protocols
             ("Battery Monitor", "FC Connection", "Type", "None", True),  # Should have protocols
@@ -1348,7 +1348,10 @@ def test_comprehensive_connection_type_coverage(self, realistic_model) -> None:
 
         for component, section, field, value, should_have_protocols in test_cases:
             model._update_possible_choices_for_path((component, section, field), value)
-            protocol_path = (component, "FC Connection", "Protocol")
+            if component == "ESC":
+                protocol_path = (component, "FC->ESC Connection", "Protocol")
+            else:
+                protocol_path = (component, "FC Connection", "Protocol")
             protocol_choices = model._possible_choices.get(protocol_path, ())
 
             if should_have_protocols:
diff --git a/tests/test_data_model_vehicle_components_validation_bdd.py b/tests/test_data_model_vehicle_components_validation_bdd.py
@@ -133,7 +133,7 @@ def test_user_sees_validation_errors_for_invalid_combobox_selections(self, valid
         invalid_entries = {
             ("Battery", "Specifications", "Chemistry"): "UnknownChemistry",  # Chemistry has combobox choices
             ("RC Receiver", "FC Connection", "Protocol"): "InvalidProtocol",  # RC Protocol has choices
-            ("ESC", "FC Connection", "Protocol"): "NonExistentProtocol",  # ESC Protocol has choices
+            ("ESC", "FC->ESC Connection", "Protocol"): "NonExistentProtocol",  # ESC Protocol has choices
         }
 
         # Act: Validate all data
@@ -161,7 +161,7 @@ def test_user_sees_validation_errors_for_duplicate_fc_connections(self, validati
         # Arrange: Create entries with duplicate FC connections that are NOT allowed
         duplicate_entries = {
             ("GNSS Receiver", "FC Connection", "Type"): "SERIAL2",
-            ("ESC", "FC Connection", "Type"): "SERIAL2",  # Not allowed duplicate
+            ("ESC", "FC->ESC Connection", "Type"): "SERIAL2",  # Not allowed duplicate
             ("RC Receiver", "FC Connection", "Type"): "SERIAL3",
             (
                 "Battery Monitor",
@@ -358,7 +358,7 @@ def test_validation_performance_with_large_dataset(self, validation_model) -> No
         large_entries[("Battery", "Specifications", "Chemistry")] = "InvalidChem"  # Invalid combobox
         large_entries[("Battery", "Specifications", "Volt per cell max")] = "5.0"  # Invalid battery voltage for Lipo
         large_entries[("RC Receiver", "FC Connection", "Type")] = "SERIAL1"
-        large_entries[("ESC", "FC Connection", "Type")] = "SERIAL1"  # Not allowed duplicate
+        large_entries[("ESC", "FC->ESC Connection", "Type")] = "SERIAL1"  # Not allowed duplicate
 
         # Act: Validate all data
         is_valid, errors = validation_model.validate_all_data(large_entries)
diff --git a/tests/unit_data_model_vehicle_components_import.py b/tests/unit_data_model_vehicle_components_import.py
@@ -365,17 +365,17 @@ def test_set_battery_type_handles_type_error(self, realistic_model) -> None:
             realistic_model._set_battery_type_from_fc_parameters(fc_parameters)
         # pylint: enable=duplicate-code
 
-    def test_set_battery_type_handles_list_type_values(self, realistic_model) -> None:
+    def test_set_battery_type_handles_tuple_type_values(self, realistic_model) -> None:
         """
-        Internal battery type setter handles list-type configuration values.
+        Internal battery type setter handles tuple-type configuration values.
 
-        GIVEN: Battery configuration with list values for type and protocol
+        GIVEN: Battery configuration with tuple values for type and protocol
         WHEN: Setting battery type from parameters
-        THEN: First element of each list should be used
+        THEN: First element of each tuple should be used
         """
         with patch(
             "ardupilot_methodic_configurator.data_model_vehicle_components_import.BATT_MONITOR_CONNECTION",
-            {"4": {"type": ["Analog", "Digital"], "protocol": ["Voltage", "Current"]}},
+            {"4": {"type": ("Analog", "Digital"), "protocol": ("Voltage", "Current")}},
         ):
             fc_parameters = {"BATT_MONITOR": 4}
             realistic_model._set_battery_type_from_fc_parameters(fc_parameters)
diff --git a/tests/unit_data_model_vehicle_components_validation.py b/tests/unit_data_model_vehicle_components_validation.py
@@ -100,8 +100,8 @@ def test_update_possible_choices_for_esc_can(self, realistic_model) -> None:
         model = realistic_model
         model.init_possible_choices({"MOT_PWM_TYPE": {"values": {"0": "Normal", "6": "DShot600"}}})
 
-        model._update_possible_choices_for_path(("ESC", "FC Connection", "Type"), "CAN1")
-        protocol_choices = model._possible_choices.get(("ESC", "FC Connection", "Protocol"), ())
+        model._update_possible_choices_for_path(("ESC", "FC->ESC Connection", "Type"), "CAN1")
+        protocol_choices = model._possible_choices.get(("ESC", "FC->ESC Connection", "Protocol"), ())
 
         assert protocol_choices == ("DroneCAN",)
 
@@ -110,8 +110,8 @@ def test_update_possible_choices_for_esc_pwm(self, realistic_model) -> None:
         model = realistic_model
         model.init_possible_choices({"MOT_PWM_TYPE": {"values": {"0": "Normal", "6": "DShot600"}}})
 
-        model._update_possible_choices_for_path(("ESC", "FC Connection", "Type"), "Main Out")
-        protocol_choices = model._possible_choices.get(("ESC", "FC Connection", "Protocol"), ())
+        model._update_possible_choices_for_path(("ESC", "FC->ESC Connection", "Type"), "Main Out")
+        protocol_choices = model._possible_choices.get(("ESC", "FC->ESC Connection", "Protocol"), ())
 
         assert len(protocol_choices) > 0
         # pylint: enable=duplicate-code
@@ -244,7 +244,7 @@ def test_correct_display_values_preserves_key_values(self, validation_model) ->
         initial_data = {
             "Components": {
                 "RC Receiver": {"FC Connection": {"Type": "SERIAL2"}},
-                "ESC": {"FC Connection": {"Type": "CAN1"}},
+                "ESC": {"FC->ESC Connection": {"Type": "CAN1"}},
             },
             "Format version": 1,
         }
@@ -258,7 +258,7 @@ def test_correct_display_values_preserves_key_values(self, validation_model) ->
 
         # Assert
         assert model.get_component_value(("RC Receiver", "FC Connection", "Type")) == "SERIAL2"
-        assert model.get_component_value(("ESC", "FC Connection", "Type")) == "CAN1"
+        assert model.get_component_value(("ESC", "FC->ESC Connection", "Type")) == "CAN1"
 
     def test_correct_display_values_handles_nested_data(self, validation_model) -> None:
         """Test that correct_display_values_in_loaded_data() handles nested data structures."""
diff --git a/tests/unit_data_model_vehicle_components_validation_constants.py b/tests/unit_data_model_vehicle_components_validation_constants.py
