From 2f1b599fe3af5ec41033bbb8bf8efdf3fc52caf6 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Wed, 24 Jan 2024 15:47:16 +0100 Subject: [PATCH] tests: drop unit tests related to from_dbus/to_dbus function Defining the wrong from_dbus/to_dbus functions is something not probable. The unit test is just getting in the way of those who knows what they do and force contributors to change the same thing in multiple places. --- src/libnm-core-impl/tests/test-setting.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index 4b1aa2c111..1d6007518b 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -4666,8 +4666,6 @@ test_setting_metadata(void) g_assert(sip->property_type == &nm_sett_info_propert_type_direct_enum); g_assert(g_variant_type_equal(sip->property_type->dbus_type, "i")); - g_assert(sip->property_type->to_dbus_fcn - == _nm_setting_property_to_dbus_fcn_direct); g_assert(sip->param_spec); g_assert(g_type_is_a(sip->param_spec->value_type, G_TYPE_ENUM)); g_assert(sip->param_spec->value_type != G_TYPE_ENUM); @@ -4706,10 +4704,6 @@ test_setting_metadata(void) INFINIBAND_ALEN)); } else { g_assert(g_variant_type_equal(sip->property_type->dbus_type, "s")); - g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn, - _nm_setting_property_to_dbus_fcn_direct, - _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); can_have_direct_set_fcn = TRUE; } g_assert(sip->param_spec); @@ -4847,18 +4841,6 @@ check_done:; if (sip->property_type->from_dbus_fcn == _nm_setting_property_from_dbus_fcn_gprop) g_assert(sip->param_spec); - if (sip->property_type->from_dbus_fcn) { - if (sip->property_type->direct_type != NM_VALUE_TYPE_NONE) { - g_assert(NM_IN_SET(sip->property_type->from_dbus_fcn, - _nm_setting_property_from_dbus_fcn_direct_ip_config_gateway, - _nm_setting_property_from_dbus_fcn_direct_mac_address, - _nm_setting_connection_controller_from_dbus, - _nm_setting_connection_master_from_dbus, - _nm_setting_connection_slave_type_from_dbus, - _nm_setting_connection_port_type_from_dbus, - _nm_setting_property_from_dbus_fcn_direct)); - } - } g_assert(sip->property_type->from_dbus_is_full == NM_IN_SET(sip->property_type->from_dbus_fcn, @@ -4875,11 +4857,6 @@ check_done:; } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_direct) { g_assert(sip->param_spec); g_assert(sip->property_type->direct_type != NM_VALUE_TYPE_NONE); - g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn, - _nm_setting_property_to_dbus_fcn_direct, - _nm_setting_property_to_dbus_fcn_direct_mac_address, - _nm_setting_connection_controller_to_dbus, - _nm_setting_connection_port_type_to_dbus)); } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_ignore) { if (NM_IN_SET(sip->property_type, &nm_sett_info_propert_type_deprecated_ignore_i,